From a5ae5825ca0b3778a3579235d448c809d4e4e3c4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 7 Nov 2025 09:40:32 -0800 Subject: [PATCH] Rename HttpRequestAndChannel to NettyRequest --- ...questAndChannel.java => NettyRequest.java} | 6 ++-- .../HttpClientRequestTracingHandler.java | 5 ++-- .../v3_8/client/HttpRequestHeadersSetter.java | 6 ++-- .../client/NettyClientRequestAndContexts.java | 6 ++-- .../v3_8/client/NettyClientSingletons.java | 6 ++-- .../NettyHttpClientAttributesGetter.java | 28 +++++++++--------- .../HttpServerRequestTracingHandler.java | 5 ++-- .../HttpServerResponseTracingHandler.java | 4 +-- .../netty/v3_8/server/NettyHeadersGetter.java | 10 +++---- .../NettyHttpServerAttributesGetter.java | 29 +++++++++---------- .../server/NettyServerRequestAndContext.java | 6 ++-- .../v3_8/server/NettyServerSingletons.java | 6 ++-- .../netty/v3_8/util/HttpSchemeUtil.java | 6 ++-- ...tChannelHandlerContextInstrumentation.java | 4 +-- .../HttpClientRequestTracingHandler.java | 8 ++--- .../HttpClientResponseTracingHandler.java | 6 ++-- .../v4_0/client/NettyClientSingletons.java | 8 ++--- .../HttpServerRequestTracingHandler.java | 8 ++--- .../HttpServerResponseTracingHandler.java | 4 +-- .../v4_0/server/NettyServerSingletons.java | 6 ++-- ...tChannelHandlerContextInstrumentation.java | 4 +-- .../netty/v4_1/NettyClientSingletons.java | 8 ++--- .../netty/v4_1/NettyClientTelemetry.java | 4 +-- .../v4_1/NettyClientTelemetryBuilder.java | 13 ++++----- .../netty/v4_1/NettyServerTelemetry.java | 6 ++-- .../v4_1/NettyServerTelemetryBuilder.java | 4 +-- .../netty/v4_1/internal/ServerContext.java | 10 +++---- .../HttpClientRequestTracingHandler.java | 15 +++++----- .../HttpClientResponseTracingHandler.java | 14 ++++----- .../client/HttpClientTracingHandler.java | 10 +++---- .../client/NettyClientHandlerFactory.java | 6 ++-- .../HttpServerRequestTracingHandler.java | 9 +++--- .../HttpServerResponseTracingHandler.java | 10 +++---- .../server/HttpServerTracingHandler.java | 4 +-- .../NettyServerInstrumenterBuilderUtil.java | 8 ++--- ...questAndChannel.java => NettyRequest.java} | 11 ++++--- .../common/v4_0/internal/HttpSchemeUtil.java | 6 ++-- .../client/HttpRequestHeadersSetter.java | 6 ++-- ...NettyClientInstrumenterBuilderFactory.java | 4 +-- .../NettyClientInstrumenterFactory.java | 8 ++--- .../NettyHttpClientAttributesGetter.java | 28 +++++++++--------- .../server/HttpRequestHeadersGetter.java | 10 +++---- .../NettyHttpServerAttributesGetter.java | 29 +++++++++---------- .../v1_0/ReactorNettySingletons.java | 4 +-- 44 files changed, 195 insertions(+), 203 deletions(-) rename instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/{HttpRequestAndChannel.java => NettyRequest.java} (66%) rename instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/{HttpRequestAndChannel.java => NettyRequest.java} (73%) diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/HttpRequestAndChannel.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyRequest.java similarity index 66% rename from instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/HttpRequestAndChannel.java rename to instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyRequest.java index e72a8a89b621..c0a44c569477 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/HttpRequestAndChannel.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyRequest.java @@ -10,10 +10,10 @@ import org.jboss.netty.handler.codec.http.HttpRequest; @AutoValue -public abstract class HttpRequestAndChannel { +public abstract class NettyRequest { - public static HttpRequestAndChannel create(HttpRequest request, Channel channel) { - return new AutoValue_HttpRequestAndChannel(request, channel); + public static NettyRequest create(HttpRequest request, Channel channel) { + return new AutoValue_NettyRequest(request, channel); } public abstract HttpRequest request(); diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientRequestTracingHandler.java index 4e9a68eed4db..7d5519000619 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientRequestTracingHandler.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientRequestTracingHandler.java @@ -10,8 +10,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyConnectionContext; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; @@ -42,8 +42,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws parentContext = Context.current(); } - HttpRequestAndChannel request = - HttpRequestAndChannel.create((HttpRequest) message, ctx.getChannel()); + NettyRequest request = NettyRequest.create((HttpRequest) message, ctx.getChannel()); if (!instrumenter().shouldStart(parentContext, request)) { super.writeRequested(ctx, event); return; diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpRequestHeadersSetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpRequestHeadersSetter.java index 5eb538c3231b..3b44219ccf1e 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpRequestHeadersSetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpRequestHeadersSetter.java @@ -6,14 +6,14 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.client; import io.opentelemetry.context.propagation.TextMapSetter; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import javax.annotation.Nullable; -enum HttpRequestHeadersSetter implements TextMapSetter { +enum HttpRequestHeadersSetter implements TextMapSetter { INSTANCE; @Override - public void set(@Nullable HttpRequestAndChannel carrier, String key, String value) { + public void set(@Nullable NettyRequest carrier, String key, String value) { carrier.request().headers().set(key, value); } } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientRequestAndContexts.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientRequestAndContexts.java index 41b377715d8b..fac88bcccd45 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientRequestAndContexts.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientRequestAndContexts.java @@ -7,14 +7,14 @@ import com.google.auto.value.AutoValue; import io.opentelemetry.context.Context; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import javax.annotation.Nullable; @AutoValue abstract class NettyClientRequestAndContexts { public static NettyClientRequestAndContexts create( - @Nullable Context parentContext, Context context, HttpRequestAndChannel request) { + @Nullable Context parentContext, Context context, NettyRequest request) { return new AutoValue_NettyClientRequestAndContexts(parentContext, context, request); } @@ -22,5 +22,5 @@ public static NettyClientRequestAndContexts create( abstract Context context(); - abstract HttpRequestAndChannel request(); + abstract NettyRequest request(); } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java index 3d662ca88480..9807756bd015 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import io.opentelemetry.semconv.SchemaUrls; import org.jboss.netty.channel.Channel; import org.jboss.netty.handler.codec.http.HttpResponse; @@ -23,7 +23,7 @@ public final class NettyClientSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.netty-3.8"; - private static final Instrumenter INSTRUMENTER; + private static final Instrumenter INSTRUMENTER; private static final Instrumenter CONNECTION_INSTRUMENTER; static { @@ -50,7 +50,7 @@ public final class NettyClientSingletons { .buildInstrumenter(SpanKindExtractor.alwaysClient()); } - public static Instrumenter instrumenter() { + public static Instrumenter instrumenter() { return INSTRUMENTER; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java index ff9a53e02ba8..c9d290dff1aa 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java @@ -8,7 +8,7 @@ import static io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.HttpSchemeUtil.getScheme; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.ChannelUtil; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -20,11 +20,11 @@ import org.jboss.netty.handler.codec.http.HttpVersion; final class NettyHttpClientAttributesGetter - implements HttpClientAttributesGetter { + implements HttpClientAttributesGetter { @Override @Nullable - public String getUrlFull(HttpRequestAndChannel requestAndChannel) { + public String getUrlFull(NettyRequest requestAndChannel) { try { String hostHeader = getHost(requestAndChannel); String target = requestAndChannel.request().getUri(); @@ -38,48 +38,48 @@ public String getUrlFull(HttpRequestAndChannel requestAndChannel) { } } - private String getHost(HttpRequestAndChannel requestAndChannel) { + private String getHost(NettyRequest requestAndChannel) { List values = getHttpRequestHeader(requestAndChannel, "host"); return values.isEmpty() ? null : values.get(0); } @Override - public String getHttpRequestMethod(HttpRequestAndChannel requestAndChannel) { + public String getHttpRequestMethod(NettyRequest requestAndChannel) { return requestAndChannel.request().getMethod().getName(); } @Override - public List getHttpRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getHttpRequestHeader(NettyRequest requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override public Integer getHttpResponseStatusCode( - HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { + NettyRequest requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override public List getHttpResponseHeader( - HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { + NettyRequest requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } @Override public String getNetworkTransport( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { return ChannelUtil.getNetworkTransport(requestAndChannel.channel()); } @Override public String getNetworkProtocolName( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse httpResponse) { + NettyRequest requestAndChannel, @Nullable HttpResponse httpResponse) { return requestAndChannel.request().getProtocolVersion().getProtocolName(); } @Override public String getNetworkProtocolVersion( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse httpResponse) { + NettyRequest requestAndChannel, @Nullable HttpResponse httpResponse) { HttpVersion version = requestAndChannel.request().getProtocolVersion(); if (version.getMinorVersion() == 0) { return Integer.toString(version.getMajorVersion()); @@ -89,20 +89,20 @@ public String getNetworkProtocolVersion( @Nullable @Override - public String getServerAddress(HttpRequestAndChannel requestAndChannel) { + public String getServerAddress(NettyRequest requestAndChannel) { return null; } @Nullable @Override - public Integer getServerPort(HttpRequestAndChannel requestAndChannel) { + public Integer getServerPort(NettyRequest requestAndChannel) { return null; } @Override @Nullable public InetSocketAddress getNetworkPeerInetSocketAddress( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().getRemoteAddress(); if (address instanceof InetSocketAddress) { return (InetSocketAddress) address; diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerRequestTracingHandler.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerRequestTracingHandler.java index 4f0a2b762ab6..f5d9d4fb538f 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerRequestTracingHandler.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerRequestTracingHandler.java @@ -10,7 +10,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; @@ -38,8 +38,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw } Context parentContext = Context.current(); - HttpRequestAndChannel request = - HttpRequestAndChannel.create((HttpRequest) message, ctx.getChannel()); + NettyRequest request = NettyRequest.create((HttpRequest) message, ctx.getChannel()); if (!instrumenter().shouldStart(parentContext, request)) { super.messageReceived(ctx, event); return; diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java index cf6acd70695a..3eec79b8ad5b 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.util.VirtualField; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; @@ -34,7 +34,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent msg) throws E } Context context = requestAndContext.context(); - HttpRequestAndChannel request = requestAndContext.request(); + NettyRequest request = requestAndContext.request(); HttpResponse response = (HttpResponse) msg.getMessage(); customizeResponse(context, response); diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHeadersGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHeadersGetter.java index 5d46d29295a0..559542e2bc2d 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHeadersGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHeadersGetter.java @@ -6,26 +6,26 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.server; import io.opentelemetry.context.propagation.TextMapGetter; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import java.util.Iterator; import javax.annotation.Nullable; -enum NettyHeadersGetter implements TextMapGetter { +enum NettyHeadersGetter implements TextMapGetter { INSTANCE; @Override - public Iterable keys(HttpRequestAndChannel requestAndChannel) { + public Iterable keys(NettyRequest requestAndChannel) { return requestAndChannel.request().headers().names(); } @Nullable @Override - public String get(@Nullable HttpRequestAndChannel requestAndChannel, String s) { + public String get(@Nullable NettyRequest requestAndChannel, String s) { return requestAndChannel.request().headers().get(s); } @Override - public Iterator getAll(@Nullable HttpRequestAndChannel carrier, String key) { + public Iterator getAll(@Nullable NettyRequest carrier, String key) { return carrier.request().headers().getAll(key).iterator(); } } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java index 237e83a01a53..191ce9123b67 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java @@ -6,7 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.server; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.ChannelUtil; import io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.HttpSchemeUtil; import java.net.InetSocketAddress; @@ -17,64 +17,63 @@ import org.jboss.netty.handler.codec.http.HttpVersion; final class NettyHttpServerAttributesGetter - implements HttpServerAttributesGetter { + implements HttpServerAttributesGetter { @Override - public String getHttpRequestMethod(HttpRequestAndChannel requestAndChannel) { + public String getHttpRequestMethod(NettyRequest requestAndChannel) { return requestAndChannel.request().getMethod().getName(); } @Override - public List getHttpRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getHttpRequestHeader(NettyRequest requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override public Integer getHttpResponseStatusCode( - HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { + NettyRequest requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().getCode(); } @Override public List getHttpResponseHeader( - HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { + NettyRequest requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } @Override - public String getUrlScheme(HttpRequestAndChannel requestAndChannel) { + public String getUrlScheme(NettyRequest requestAndChannel) { return HttpSchemeUtil.getScheme(requestAndChannel); } @Override - public String getUrlPath(HttpRequestAndChannel requestAndChannel) { + public String getUrlPath(NettyRequest requestAndChannel) { String fullPath = requestAndChannel.request().getUri(); int separatorPos = fullPath.indexOf('?'); return separatorPos == -1 ? fullPath : fullPath.substring(0, separatorPos); } @Override - public String getUrlQuery(HttpRequestAndChannel requestAndChannel) { + public String getUrlQuery(NettyRequest requestAndChannel) { String fullPath = requestAndChannel.request().getUri(); int separatorPos = fullPath.indexOf('?'); return separatorPos == -1 ? null : fullPath.substring(separatorPos + 1); } @Override - public String getNetworkTransport( - HttpRequestAndChannel requestAndChannel, HttpResponse response) { + public String getNetworkTransport(NettyRequest requestAndChannel, HttpResponse response) { return ChannelUtil.getNetworkTransport(requestAndChannel.channel()); } @Override public String getNetworkProtocolName( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { return requestAndChannel.request().getProtocolVersion().getProtocolName(); } @Override public String getNetworkProtocolVersion( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { HttpVersion version = requestAndChannel.request().getProtocolVersion(); if (version.getMinorVersion() == 0) { return Integer.toString(version.getMajorVersion()); @@ -85,7 +84,7 @@ public String getNetworkProtocolVersion( @Override @Nullable public InetSocketAddress getNetworkPeerInetSocketAddress( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().getRemoteAddress(); if (address instanceof InetSocketAddress) { return (InetSocketAddress) address; @@ -96,7 +95,7 @@ public InetSocketAddress getNetworkPeerInetSocketAddress( @Nullable @Override public InetSocketAddress getNetworkLocalInetSocketAddress( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().getLocalAddress(); if (address instanceof InetSocketAddress) { return (InetSocketAddress) address; diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerRequestAndContext.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerRequestAndContext.java index a70a4c1a7a3b..32d216f19913 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerRequestAndContext.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerRequestAndContext.java @@ -7,16 +7,16 @@ import com.google.auto.value.AutoValue; import io.opentelemetry.context.Context; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; @AutoValue abstract class NettyServerRequestAndContext { - static NettyServerRequestAndContext create(HttpRequestAndChannel request, Context context) { + static NettyServerRequestAndContext create(NettyRequest request, Context context) { return new AutoValue_NettyServerRequestAndContext(request, context); } - abstract HttpRequestAndChannel request(); + abstract NettyRequest request(); abstract Context context(); } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerSingletons.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerSingletons.java index ba1f1e5e4e99..84f73e420e5e 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerSingletons.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyServerSingletons.java @@ -8,12 +8,12 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import org.jboss.netty.handler.codec.http.HttpResponse; final class NettyServerSingletons { - private static final Instrumenter INSTRUMENTER; + private static final Instrumenter INSTRUMENTER; static { INSTRUMENTER = @@ -27,7 +27,7 @@ final class NettyServerSingletons { NettyErrorHolder.init(context))); } - public static Instrumenter instrumenter() { + public static Instrumenter instrumenter() { return INSTRUMENTER; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/util/HttpSchemeUtil.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/util/HttpSchemeUtil.java index b4a6fee25489..81b3ca90cef9 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/util/HttpSchemeUtil.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/util/HttpSchemeUtil.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.util; -import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel; +import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest; import org.jboss.netty.channel.ChannelHandler; public final class HttpSchemeUtil { @@ -25,11 +25,11 @@ private static Class getSslHandlerClass() { } } - public static String getScheme(HttpRequestAndChannel requestAndChannel) { + public static String getScheme(NettyRequest requestAndChannel) { return isHttps(requestAndChannel) ? "https" : "http"; } - private static boolean isHttps(HttpRequestAndChannel requestAndChannel) { + private static boolean isHttps(NettyRequest requestAndChannel) { return sslHandlerClass != null && requestAndChannel.channel().getPipeline().get(sslHandlerClass) != null; } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AbstractChannelHandlerContextInstrumentation.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AbstractChannelHandlerContextInstrumentation.java index 36f21c75fdbc..2d701a90deac 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AbstractChannelHandlerContextInstrumentation.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AbstractChannelHandlerContextInstrumentation.java @@ -16,7 +16,7 @@ import io.netty.util.Attribute; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import net.bytebuddy.asm.Advice; @@ -55,7 +55,7 @@ public static void onEnter( if (clientContext != null) { ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).remove(); contextAttr.remove(); - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndRemove(); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndRemove(); instrumenter().end(clientContext, request, null, throwable); return; } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java index b904193802ca..4367ebe52574 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientRequestTracingHandler.java @@ -15,12 +15,12 @@ import io.netty.util.AttributeKey; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.javaagent.instrumentation.netty.v4_0.AttributeKeys; public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter { - public static final AttributeKey HTTP_CLIENT_REQUEST = + public static final AttributeKey HTTP_CLIENT_REQUEST = AttributeKeys.attributeKey(AttributeKeys.class.getName() + ".http-client-request"); @Override @@ -32,7 +32,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr Context parentContext = Context.current(); - HttpRequestAndChannel request = HttpRequestAndChannel.create((HttpRequest) msg, ctx.channel()); + NettyRequest request = NettyRequest.create((HttpRequest) msg, ctx.channel()); if (!instrumenter().shouldStart(parentContext, request)) { super.write(ctx, msg, prm); return; @@ -40,7 +40,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr Attribute parentContextAttr = ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT); Attribute contextAttr = ctx.channel().attr(AttributeKeys.CLIENT_CONTEXT); - Attribute requestAttr = ctx.channel().attr(HTTP_CLIENT_REQUEST); + Attribute requestAttr = ctx.channel().attr(HTTP_CLIENT_REQUEST); Context context = instrumenter().start(parentContext, request); parentContextAttr.set(parentContext); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientResponseTracingHandler.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientResponseTracingHandler.java index 4448eddfabf4..8c6e906e079a 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientResponseTracingHandler.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/HttpClientResponseTracingHandler.java @@ -17,7 +17,7 @@ import io.netty.util.AttributeKey; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.javaagent.instrumentation.netty.v4_0.AttributeKeys; public class HttpClientResponseTracingHandler extends ChannelInboundHandlerAdapter { @@ -38,7 +38,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception Context parentContext = parentContextAttr.get(); if (msg instanceof FullHttpResponse) { - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); instrumenter().end(context, request, (HttpResponse) msg, null); contextAttr.remove(); parentContextAttr.remove(); @@ -48,7 +48,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception } else if (msg instanceof LastHttpContent) { // Not a FullHttpResponse so this is content that has been received after headers. // Finish the span using what we stored in attrs. - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); HttpResponse response = ctx.channel().attr(HTTP_CLIENT_RESPONSE).getAndRemove(); instrumenter().end(context, request, response, null); contextAttr.remove(); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java index c5854f4e7583..a296af531281 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterBuilderFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumenter; @@ -28,12 +28,12 @@ public final class NettyClientSingletons { AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.netty.ssl-telemetry.enabled", false); - private static final Instrumenter INSTRUMENTER; + private static final Instrumenter INSTRUMENTER; private static final NettyConnectionInstrumenter CONNECTION_INSTRUMENTER; private static final NettySslInstrumenter SSL_INSTRUMENTER; static { - DefaultHttpClientInstrumenterBuilder builder = + DefaultHttpClientInstrumenterBuilder builder = NettyClientInstrumenterBuilderFactory.create( "io.opentelemetry.netty-4.0", GlobalOpenTelemetry.get()) .configure(AgentCommonConfig.get()); @@ -49,7 +49,7 @@ public final class NettyClientSingletons { SSL_INSTRUMENTER = factory.createSslInstrumenter(); } - public static Instrumenter instrumenter() { + public static Instrumenter instrumenter() { return INSTRUMENTER; } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerRequestTracingHandler.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerRequestTracingHandler.java index 46d8307046f2..443bc6ffb6d5 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerRequestTracingHandler.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerRequestTracingHandler.java @@ -15,19 +15,19 @@ import io.netty.util.AttributeKey; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.javaagent.instrumentation.netty.v4_0.AttributeKeys; public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter { - static final AttributeKey HTTP_SERVER_REQUEST = + static final AttributeKey HTTP_SERVER_REQUEST = AttributeKeys.attributeKey(AttributeKeys.class.getName() + ".http-server-request"); @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { Channel channel = ctx.channel(); Attribute contextAttr = channel.attr(AttributeKeys.SERVER_CONTEXT); - Attribute requestAttr = channel.attr(HTTP_SERVER_REQUEST); + Attribute requestAttr = channel.attr(HTTP_SERVER_REQUEST); if (!(msg instanceof HttpRequest)) { Context serverContext = contextAttr.get(); @@ -45,7 +45,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception if (parentContext == null) { parentContext = Context.current(); } - HttpRequestAndChannel request = HttpRequestAndChannel.create((HttpRequest) msg, channel); + NettyRequest request = NettyRequest.create((HttpRequest) msg, channel); if (!instrumenter().shouldStart(parentContext, request)) { super.channelRead(ctx, msg); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java index 27da74f1c2ab..588c75515268 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java @@ -16,7 +16,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder; import io.opentelemetry.javaagent.instrumentation.netty.v4_0.AttributeKeys; import javax.annotation.Nullable; @@ -45,7 +45,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) { // make sure to remove the server context on end() call private static void end(Channel channel, HttpResponse response, @Nullable Throwable error) { Context context = channel.attr(AttributeKeys.SERVER_CONTEXT).getAndRemove(); - HttpRequestAndChannel request = channel.attr(HTTP_SERVER_REQUEST).getAndRemove(); + NettyRequest request = channel.attr(HTTP_SERVER_REQUEST).getAndRemove(); error = NettyErrorHolder.getOrDefault(context, error); instrumenter().end(context, request, response, error); } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyServerSingletons.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyServerSingletons.java index e213393d3614..5dab48b9a8ed 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyServerSingletons.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyServerSingletons.java @@ -8,14 +8,14 @@ import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.server.HttpRequestHeadersGetter; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.server.NettyHttpServerAttributesGetter; import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters; public final class NettyServerSingletons { - private static final Instrumenter INSTRUMENTER = + private static final Instrumenter INSTRUMENTER = JavaagentHttpServerInstrumenters.create( "io.opentelemetry.netty-4.0", new NettyHttpServerAttributesGetter(), @@ -24,7 +24,7 @@ public final class NettyServerSingletons { builder.addContextCustomizer( (context, requestAndChannel, startAttributes) -> NettyErrorHolder.init(context))); - public static Instrumenter instrumenter() { + public static Instrumenter instrumenter() { return INSTRUMENTER; } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java index d0f3e47712c6..43f34345f9a2 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java @@ -15,7 +15,7 @@ import io.netty.util.Attribute; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys; import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContext; import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContexts; @@ -57,7 +57,7 @@ public static void onEnter( if (clientContext != null) { ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).remove(); contextAttr.remove(); - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndRemove(); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndRemove(); instrumenter().end(clientContext, request, null, throwable); return; } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java index 1a568c9ef09d..9631080b63cb 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterBuilderFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumenter; @@ -29,13 +29,13 @@ public final class NettyClientSingletons { AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.netty.ssl-telemetry.enabled", false); - private static final Instrumenter INSTRUMENTER; + private static final Instrumenter INSTRUMENTER; private static final NettyConnectionInstrumenter CONNECTION_INSTRUMENTER; private static final NettySslInstrumenter SSL_INSTRUMENTER; private static final NettyClientHandlerFactory CLIENT_HANDLER_FACTORY; static { - DefaultHttpClientInstrumenterBuilder builder = + DefaultHttpClientInstrumenterBuilder builder = NettyClientInstrumenterBuilderFactory.create( "io.opentelemetry.netty-4.1", GlobalOpenTelemetry.get()) .configure(AgentCommonConfig.get()); @@ -53,7 +53,7 @@ public final class NettyClientSingletons { INSTRUMENTER, AgentCommonConfig.get().shouldEmitExperimentalHttpClientTelemetry()); } - public static Instrumenter instrumenter() { + public static Instrumenter instrumenter() { return INSTRUMENTER; } diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetry.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetry.java index f60a53e60487..255e62a634da 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetry.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetry.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys; import io.opentelemetry.instrumentation.netty.v4_1.internal.client.NettyClientHandlerFactory; @@ -23,7 +23,7 @@ public final class NettyClientTelemetry { private final NettyClientHandlerFactory handlerFactory; NettyClientTelemetry( - Instrumenter instrumenter, + Instrumenter instrumenter, boolean emitExperimentalHttpClientEvents) { this.handlerFactory = new NettyClientHandlerFactory(instrumenter, emitExperimentalHttpClientEvents); diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java index d56c4cd8f651..27b325eada28 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterBuilderFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumentationFlag; @@ -24,7 +24,7 @@ /** A builder of {@link NettyClientTelemetry}. */ public final class NettyClientTelemetryBuilder { - private final DefaultHttpClientInstrumenterBuilder builder; + private final DefaultHttpClientInstrumenterBuilder builder; private boolean emitExperimentalHttpClientEvents = false; static { @@ -70,7 +70,7 @@ public NettyClientTelemetryBuilder setCapturedResponseHeaders( */ @CanIgnoreReturnValue public NettyClientTelemetryBuilder addAttributesExtractor( - AttributesExtractor attributesExtractor) { + AttributesExtractor attributesExtractor) { builder.addAttributesExtractor(attributesExtractor); return this; } @@ -102,17 +102,16 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection knownMetho @Deprecated @CanIgnoreReturnValue public NettyClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> + Function, SpanNameExtractor> spanNameExtractorTransformer) { return setSpanNameExtractor( - (UnaryOperator>) - spanNameExtractorTransformer::apply); + (UnaryOperator>) spanNameExtractorTransformer::apply); } /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public NettyClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { + UnaryOperator> spanNameExtractorTransformer) { builder.setSpanNameExtractor(spanNameExtractorTransformer); return this; } diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetry.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetry.java index 54affdb67347..0e6a1c0181e9 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetry.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetry.java @@ -11,7 +11,7 @@ import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; import io.opentelemetry.instrumentation.netty.v4_1.internal.server.HttpServerRequestTracingHandler; import io.opentelemetry.instrumentation.netty.v4_1.internal.server.HttpServerResponseBeforeCommitHandler; @@ -21,11 +21,11 @@ /** Entrypoint for instrumenting Netty HTTP servers. */ public final class NettyServerTelemetry { - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; private final ProtocolEventHandler protocolEventHandler; NettyServerTelemetry( - Instrumenter instrumenter, + Instrumenter instrumenter, ProtocolEventHandler protocolEventHandler) { this.instrumenter = instrumenter; this.protocolEventHandler = protocolEventHandler; diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java index b9e8bf376b96..9c0ceb2302c0 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.server.HttpRequestHeadersGetter; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.server.NettyHttpServerAttributesGetter; import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental; @@ -21,7 +21,7 @@ /** A builder of {@link NettyServerTelemetry}. */ public final class NettyServerTelemetryBuilder { - private final DefaultHttpServerInstrumenterBuilder builder; + private final DefaultHttpServerInstrumenterBuilder builder; private boolean emitExperimentalHttpServerEvents = false; diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/ServerContext.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/ServerContext.java index 7856be00f2ca..37edb5a073bd 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/ServerContext.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/ServerContext.java @@ -7,10 +7,10 @@ import com.google.auto.value.AutoValue; import io.opentelemetry.context.Context; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; /** - * A tuple of an {@link Context} and a {@link HttpRequestAndChannel}. + * A tuple of an {@link Context} and a {@link NettyRequest}. * *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. @@ -19,13 +19,13 @@ public abstract class ServerContext { /** Create a new {@link ServerContext}. */ - public static ServerContext create(Context context, HttpRequestAndChannel request) { + public static ServerContext create(Context context, NettyRequest request) { return new AutoValue_ServerContext(context, request); } /** Returns the {@link Context}. */ public abstract Context context(); - /** Returns the {@link HttpRequestAndChannel}. */ - public abstract HttpRequestAndChannel request(); + /** Returns the {@link NettyRequest}. */ + public abstract NettyRequest request(); } diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientRequestTracingHandler.java index 39ce06c8ee2a..f6e730a4ddd2 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientRequestTracingHandler.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientRequestTracingHandler.java @@ -15,7 +15,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys; /** @@ -24,13 +24,12 @@ */ public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter { - public static final AttributeKey HTTP_CLIENT_REQUEST = + public static final AttributeKey HTTP_CLIENT_REQUEST = AttributeKey.valueOf(HttpClientRequestTracingHandler.class, "http-client-request"); - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; - public HttpClientRequestTracingHandler( - Instrumenter instrumenter) { + public HttpClientRequestTracingHandler(Instrumenter instrumenter) { this.instrumenter = instrumenter; } @@ -46,7 +45,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr parentContext = Context.current(); } - HttpRequestAndChannel request = HttpRequestAndChannel.create((HttpRequest) msg, ctx.channel()); + NettyRequest request = NettyRequest.create((HttpRequest) msg, ctx.channel()); if (!instrumenter.shouldStart(parentContext, request) || isAwsRequest(request)) { super.write(ctx, msg, prm); return; @@ -54,7 +53,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr Attribute parentContextAttr = ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT); Attribute contextAttr = ctx.channel().attr(AttributeKeys.CLIENT_CONTEXT); - Attribute requestAttr = ctx.channel().attr(HTTP_CLIENT_REQUEST); + Attribute requestAttr = ctx.channel().attr(HTTP_CLIENT_REQUEST); Context context = instrumenter.start(parentContext, request); parentContextAttr.set(parentContext); @@ -71,7 +70,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr // span is ended normally in HttpClientResponseTracingHandler } - private static boolean isAwsRequest(HttpRequestAndChannel request) { + private static boolean isAwsRequest(NettyRequest request) { // The AWS SDK uses Netty for asynchronous clients but constructs a request signature before // beginning transport. This means we MUST suppress Netty spans we would normally create or // they will inject their own trace header, which does not match what was present when the diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientResponseTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientResponseTracingHandler.java index ac4f49f87206..a0126510251f 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientResponseTracingHandler.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientResponseTracingHandler.java @@ -18,7 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolSpecificEvent; @@ -32,11 +32,11 @@ public class HttpClientResponseTracingHandler extends ChannelInboundHandlerAdapt static final AttributeKey HTTP_CLIENT_RESPONSE = AttributeKey.valueOf(HttpClientResponseTracingHandler.class, "http-client-response"); - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; private final ProtocolEventHandler protocolEventHandler; public HttpClientResponseTracingHandler( - Instrumenter instrumenter, + Instrumenter instrumenter, ProtocolEventHandler protocolEventHandler) { this.instrumenter = instrumenter; this.protocolEventHandler = protocolEventHandler; @@ -57,14 +57,14 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception if (msg instanceof FullHttpResponse) { FullHttpResponse response = (FullHttpResponse) msg; if (response.status().equals(HttpResponseStatus.SWITCHING_PROTOCOLS)) { - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).get(); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).get(); protocolEventHandler.handle( ProtocolSpecificEvent.SWITCHING_PROTOCOLS, context, request != null ? request.request() : null, response); } else { - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); instrumenter.end(context, request, (HttpResponse) msg, null); contextAttr.set(null); parentContextAttr.set(null); @@ -72,7 +72,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception } else if (msg instanceof HttpResponse) { HttpResponse response = (HttpResponse) msg; if (response.status().equals(HttpResponseStatus.SWITCHING_PROTOCOLS)) { - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).get(); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).get(); protocolEventHandler.handle( ProtocolSpecificEvent.SWITCHING_PROTOCOLS, context, @@ -91,7 +91,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception || !responseTest.status().equals(HttpResponseStatus.SWITCHING_PROTOCOLS)) { // Not a FullHttpResponse so this is content that has been received after headers. // Finish the span using what we stored in attrs. - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); HttpResponse response = ctx.channel().attr(HTTP_CLIENT_RESPONSE).getAndSet(null); instrumenter.end(context, request, response, null); contextAttr.set(null); diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientTracingHandler.java index 84cb8cddfb51..028229759636 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientTracingHandler.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/HttpClientTracingHandler.java @@ -15,7 +15,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; @@ -26,10 +26,10 @@ public class HttpClientTracingHandler extends CombinedChannelDuplexHandler< HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> { - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; public HttpClientTracingHandler( - Instrumenter instrumenter, + Instrumenter instrumenter, ProtocolEventHandler protocolEventHandler) { super( new HttpClientResponseTracingHandler(instrumenter, protocolEventHandler), @@ -40,7 +40,7 @@ public HttpClientTracingHandler( @Override public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception { Context context = ctx.channel().attr(AttributeKeys.CLIENT_CONTEXT).getAndSet(null); - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); HttpResponse response = ctx.channel().attr(HTTP_CLIENT_RESPONSE).getAndSet(null); Context parentContext = ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).getAndSet(null); if (context != null && request != null) { @@ -61,7 +61,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E // javaagent inserts exception handling in AbstractChannelHandlerContextInstrumentation that // runs before this code Context context = ctx.channel().attr(AttributeKeys.CLIENT_CONTEXT).getAndSet(null); - HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); + NettyRequest request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndSet(null); HttpResponse response = ctx.channel().attr(HTTP_CLIENT_RESPONSE).getAndSet(null); Context parentContext = ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).getAndSet(null); if (context != null && request != null) { diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/NettyClientHandlerFactory.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/NettyClientHandlerFactory.java index 193529aee1c9..f5aed36c448e 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/NettyClientHandlerFactory.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/client/NettyClientHandlerFactory.java @@ -10,7 +10,7 @@ import io.netty.channel.CombinedChannelDuplexHandler; import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; /** @@ -19,11 +19,11 @@ */ public class NettyClientHandlerFactory { - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; private final ProtocolEventHandler protocolEventHandler; public NettyClientHandlerFactory( - Instrumenter instrumenter, + Instrumenter instrumenter, boolean emitExperimentalHttpClientEvents) { this.instrumenter = instrumenter; this.protocolEventHandler = diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java index 0befe6d2a6f9..b61566a3349c 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java @@ -13,7 +13,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContext; import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContexts; @@ -23,10 +23,9 @@ */ public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter { - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; - public HttpServerRequestTracingHandler( - Instrumenter instrumenter) { + public HttpServerRequestTracingHandler(Instrumenter instrumenter) { this.instrumenter = instrumenter; } @@ -48,7 +47,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception } Context parentContext = Context.current(); - HttpRequestAndChannel request = HttpRequestAndChannel.create((HttpRequest) msg, channel); + NettyRequest request = NettyRequest.create((HttpRequest) msg, channel); if (!instrumenter.shouldStart(parentContext, request)) { super.channelRead(ctx, msg); return; diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerResponseTracingHandler.java index 42174e22c5ac..9d458bf13b36 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerResponseTracingHandler.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerResponseTracingHandler.java @@ -18,7 +18,7 @@ import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolSpecificEvent; import io.opentelemetry.instrumentation.netty.v4_1.internal.ServerContext; @@ -34,12 +34,12 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap private static final AttributeKey HTTP_SERVER_RESPONSE = AttributeKey.valueOf(HttpServerResponseTracingHandler.class, "http-server-response"); - private final Instrumenter instrumenter; + private final Instrumenter instrumenter; private final HttpServerResponseBeforeCommitHandler beforeCommitHandler; private final ProtocolEventHandler eventHandler; public HttpServerResponseTracingHandler( - Instrumenter instrumenter, + Instrumenter instrumenter, HttpServerResponseBeforeCommitHandler beforeCommitHandler, ProtocolEventHandler eventHandler) { this.instrumenter = instrumenter; @@ -131,14 +131,14 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr } private void end( - Context context, HttpRequestAndChannel request, HttpResponse response, ChannelFuture future) { + Context context, NettyRequest request, HttpResponse response, ChannelFuture future) { Throwable error = future.isSuccess() ? null : future.cause(); end(context, request, response, error); } private void end( Context context, - HttpRequestAndChannel request, + NettyRequest request, @Nullable HttpResponse response, @Nullable Throwable error) { error = NettyErrorHolder.getOrDefault(context, error); diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerTracingHandler.java index da3dfe76d121..584d99c48229 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerTracingHandler.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerTracingHandler.java @@ -8,7 +8,7 @@ import io.netty.channel.CombinedChannelDuplexHandler; import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; /** @@ -20,7 +20,7 @@ public class HttpServerTracingHandler HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> { public HttpServerTracingHandler( - Instrumenter instrumenter, + Instrumenter instrumenter, HttpServerResponseBeforeCommitHandler responseBeforeCommitHandler, ProtocolEventHandler protocolEventHandler) { super( diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/NettyServerInstrumenterBuilderUtil.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/NettyServerInstrumenterBuilderUtil.java index 33daf522dd63..85eaaa6ce72c 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/NettyServerInstrumenterBuilderUtil.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/NettyServerInstrumenterBuilderUtil.java @@ -7,7 +7,7 @@ import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.v4_1.NettyServerTelemetryBuilder; import java.util.function.Function; @@ -19,7 +19,7 @@ public class NettyServerInstrumenterBuilderUtil { private static Function< NettyServerTelemetryBuilder, - DefaultHttpServerInstrumenterBuilder> + DefaultHttpServerInstrumenterBuilder> builderExtractor; private NettyServerInstrumenterBuilderUtil() {} @@ -27,14 +27,14 @@ private NettyServerInstrumenterBuilderUtil() {} public static void setBuilderExtractor( Function< NettyServerTelemetryBuilder, - DefaultHttpServerInstrumenterBuilder> + DefaultHttpServerInstrumenterBuilder> builderExtractor) { NettyServerInstrumenterBuilderUtil.builderExtractor = builderExtractor; } public static Function< NettyServerTelemetryBuilder, - DefaultHttpServerInstrumenterBuilder> + DefaultHttpServerInstrumenterBuilder> getBuilderExtractor() { return builderExtractor; } diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/HttpRequestAndChannel.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/NettyRequest.java similarity index 73% rename from instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/HttpRequestAndChannel.java rename to instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/NettyRequest.java index e029c9122977..d10aaef5a61d 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/HttpRequestAndChannel.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/NettyRequest.java @@ -13,11 +13,11 @@ /** A tuple of an {@link HttpRequest} and a {@link Channel}. */ @AutoValue -public abstract class HttpRequestAndChannel { +public abstract class NettyRequest { - /** Create a new {@link HttpRequestAndChannel}. */ - public static HttpRequestAndChannel create(HttpRequest request, Channel channel) { - return new AutoValue_HttpRequestAndChannel(request, channel, channel.remoteAddress()); + /** Create a new {@link NettyRequest}. */ + public static NettyRequest create(HttpRequest request, Channel channel) { + return new AutoValue_NettyRequest(request, channel, channel.remoteAddress()); } /** Returns the {@link HttpRequest}. */ @@ -27,8 +27,7 @@ public static HttpRequestAndChannel create(HttpRequest request, Channel channel) public abstract Channel channel(); /** - * Return the {@link Channel#remoteAddress()} present when this {@link HttpRequestAndChannel} was - * created. + * Return the {@link Channel#remoteAddress()} present when this {@link NettyRequest} was created. * *

We capture the remote address early because netty may return null when calling {@link * Channel#remoteAddress()} at the end of processing in cases of timeouts or other connection diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/HttpSchemeUtil.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/HttpSchemeUtil.java index 2bb49f89eda4..7be9cb22d37b 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/HttpSchemeUtil.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/HttpSchemeUtil.java @@ -6,7 +6,7 @@ package io.opentelemetry.instrumentation.netty.common.v4_0.internal; import io.netty.channel.ChannelHandler; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at @@ -27,11 +27,11 @@ private static Class getSslHandlerClass() { } } - public static String getScheme(HttpRequestAndChannel requestAndChannel) { + public static String getScheme(NettyRequest requestAndChannel) { return isHttps(requestAndChannel) ? "https" : "http"; } - private static boolean isHttps(HttpRequestAndChannel requestAndChannel) { + private static boolean isHttps(NettyRequest requestAndChannel) { return sslHandlerClass != null && requestAndChannel.channel().pipeline().get(sslHandlerClass) != null; } diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/HttpRequestHeadersSetter.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/HttpRequestHeadersSetter.java index 9737f629f4ae..16df3a65c85b 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/HttpRequestHeadersSetter.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/HttpRequestHeadersSetter.java @@ -6,13 +6,13 @@ package io.opentelemetry.instrumentation.netty.common.v4_0.internal.client; import io.opentelemetry.context.propagation.TextMapSetter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; -enum HttpRequestHeadersSetter implements TextMapSetter { +enum HttpRequestHeadersSetter implements TextMapSetter { INSTANCE; @Override - public void set(HttpRequestAndChannel requestAndChannel, String key, String value) { + public void set(NettyRequest requestAndChannel, String key, String value) { requestAndChannel.request().headers().set(key, value); } } diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterBuilderFactory.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterBuilderFactory.java index 9f3e74a11d12..3f08456f8666 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterBuilderFactory.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterBuilderFactory.java @@ -8,7 +8,7 @@ import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at @@ -17,7 +17,7 @@ public final class NettyClientInstrumenterBuilderFactory { private NettyClientInstrumenterBuilderFactory() {} - public static DefaultHttpClientInstrumenterBuilder create( + public static DefaultHttpClientInstrumenterBuilder create( String instrumentationName, OpenTelemetry openTelemetry) { return DefaultHttpClientInstrumenterBuilder.create( diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterFactory.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterFactory.java index c02d376ba8fd..28c570999edf 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterFactory.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyClientInstrumenterFactory.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.netty.common.internal.NettyConnectionRequest; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import javax.annotation.Nullable; /** @@ -26,12 +26,12 @@ */ public final class NettyClientInstrumenterFactory { - private final DefaultHttpClientInstrumenterBuilder builder; + private final DefaultHttpClientInstrumenterBuilder builder; private final NettyConnectionInstrumentationFlag connectionTelemetryState; private final NettyConnectionInstrumentationFlag sslTelemetryState; public NettyClientInstrumenterFactory( - DefaultHttpClientInstrumenterBuilder builder, + DefaultHttpClientInstrumenterBuilder builder, NettyConnectionInstrumentationFlag connectionTelemetryState, NettyConnectionInstrumentationFlag sslTelemetryState) { this.builder = builder; @@ -39,7 +39,7 @@ public NettyClientInstrumenterFactory( this.sslTelemetryState = sslTelemetryState; } - public Instrumenter instrumenter() { + public Instrumenter instrumenter() { return builder.build(); } diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyHttpClientAttributesGetter.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyHttpClientAttributesGetter.java index 9eeb62b2032b..f21a27fc7060 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyHttpClientAttributesGetter.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyHttpClientAttributesGetter.java @@ -10,7 +10,7 @@ import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.HttpVersion; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.ChannelUtil; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -20,11 +20,11 @@ import javax.annotation.Nullable; final class NettyHttpClientAttributesGetter - implements HttpClientAttributesGetter { + implements HttpClientAttributesGetter { @Override @Nullable - public String getUrlFull(HttpRequestAndChannel requestAndChannel) { + public String getUrlFull(NettyRequest requestAndChannel) { try { String hostHeader = getHost(requestAndChannel); String target = requestAndChannel.request().getUri(); @@ -38,48 +38,48 @@ public String getUrlFull(HttpRequestAndChannel requestAndChannel) { } } - private String getHost(HttpRequestAndChannel requestAndChannel) { + private String getHost(NettyRequest requestAndChannel) { List values = getHttpRequestHeader(requestAndChannel, "host"); return values.isEmpty() ? null : values.get(0); } @Override - public String getHttpRequestMethod(HttpRequestAndChannel requestAndChannel) { + public String getHttpRequestMethod(NettyRequest requestAndChannel) { return requestAndChannel.request().getMethod().name(); } @Override - public List getHttpRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getHttpRequestHeader(NettyRequest requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override public Integer getHttpResponseStatusCode( - HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { + NettyRequest requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().code(); } @Override public List getHttpResponseHeader( - HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { + NettyRequest requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } @Override public String getNetworkTransport( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { return ChannelUtil.getNetworkTransport(requestAndChannel.channel()); } @Override public String getNetworkProtocolName( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { return requestAndChannel.request().getProtocolVersion().protocolName(); } @Override public String getNetworkProtocolVersion( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { HttpVersion version = requestAndChannel.request().getProtocolVersion(); if (version.minorVersion() == 0) { return Integer.toString(version.majorVersion()); @@ -89,20 +89,20 @@ public String getNetworkProtocolVersion( @Nullable @Override - public String getServerAddress(HttpRequestAndChannel requestAndChannel) { + public String getServerAddress(NettyRequest requestAndChannel) { return null; } @Nullable @Override - public Integer getServerPort(HttpRequestAndChannel requestAndChannel) { + public Integer getServerPort(NettyRequest requestAndChannel) { return null; } @Override @Nullable public InetSocketAddress getNetworkPeerInetSocketAddress( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.remoteAddress(); if (address instanceof InetSocketAddress) { return (InetSocketAddress) address; diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/HttpRequestHeadersGetter.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/HttpRequestHeadersGetter.java index 8045ac1f56ee..116708199f04 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/HttpRequestHeadersGetter.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/HttpRequestHeadersGetter.java @@ -6,7 +6,7 @@ package io.opentelemetry.instrumentation.netty.common.v4_0.internal.server; import io.opentelemetry.context.propagation.TextMapGetter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -16,22 +16,22 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -public enum HttpRequestHeadersGetter implements TextMapGetter { +public enum HttpRequestHeadersGetter implements TextMapGetter { INSTANCE; @Override - public Iterable keys(HttpRequestAndChannel carrier) { + public Iterable keys(NettyRequest carrier) { return carrier.request().headers().names(); } @Nullable @Override - public String get(@Nullable HttpRequestAndChannel carrier, String key) { + public String get(@Nullable NettyRequest carrier, String key) { return carrier.request().headers().get(key); } @Override - public Iterator getAll(@Nullable HttpRequestAndChannel carrier, String key) { + public Iterator getAll(@Nullable NettyRequest carrier, String key) { List list = carrier.request().headers().getAll(key); return list != null ? list.iterator() : Collections.emptyIterator(); } diff --git a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/NettyHttpServerAttributesGetter.java b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/NettyHttpServerAttributesGetter.java index 994e89f7aa73..2e47e5e44728 100644 --- a/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/NettyHttpServerAttributesGetter.java +++ b/instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/server/NettyHttpServerAttributesGetter.java @@ -8,7 +8,7 @@ import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.HttpVersion; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.ChannelUtil; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.HttpSchemeUtil; import java.net.InetSocketAddress; @@ -21,64 +21,63 @@ * any time. */ public final class NettyHttpServerAttributesGetter - implements HttpServerAttributesGetter { + implements HttpServerAttributesGetter { @Override - public String getHttpRequestMethod(HttpRequestAndChannel requestAndChannel) { + public String getHttpRequestMethod(NettyRequest requestAndChannel) { return requestAndChannel.request().getMethod().name(); } @Override - public List getHttpRequestHeader(HttpRequestAndChannel requestAndChannel, String name) { + public List getHttpRequestHeader(NettyRequest requestAndChannel, String name) { return requestAndChannel.request().headers().getAll(name); } @Override public Integer getHttpResponseStatusCode( - HttpRequestAndChannel requestAndChannel, HttpResponse response, @Nullable Throwable error) { + NettyRequest requestAndChannel, HttpResponse response, @Nullable Throwable error) { return response.getStatus().code(); } @Override public List getHttpResponseHeader( - HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { + NettyRequest requestAndChannel, HttpResponse response, String name) { return response.headers().getAll(name); } @Override - public String getUrlScheme(HttpRequestAndChannel requestAndChannel) { + public String getUrlScheme(NettyRequest requestAndChannel) { return HttpSchemeUtil.getScheme(requestAndChannel); } @Override - public String getUrlPath(HttpRequestAndChannel requestAndChannel) { + public String getUrlPath(NettyRequest requestAndChannel) { String fullPath = requestAndChannel.request().getUri(); int separatorPos = fullPath.indexOf('?'); return separatorPos == -1 ? fullPath : fullPath.substring(0, separatorPos); } @Override - public String getUrlQuery(HttpRequestAndChannel requestAndChannel) { + public String getUrlQuery(NettyRequest requestAndChannel) { String fullPath = requestAndChannel.request().getUri(); int separatorPos = fullPath.indexOf('?'); return separatorPos == -1 ? null : fullPath.substring(separatorPos + 1); } @Override - public String getNetworkTransport( - HttpRequestAndChannel requestAndChannel, HttpResponse response) { + public String getNetworkTransport(NettyRequest requestAndChannel, HttpResponse response) { return ChannelUtil.getNetworkTransport(requestAndChannel.channel()); } @Override public String getNetworkProtocolName( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { return requestAndChannel.request().getProtocolVersion().protocolName(); } @Override public String getNetworkProtocolVersion( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { HttpVersion version = requestAndChannel.request().getProtocolVersion(); if (version.minorVersion() == 0) { return Integer.toString(version.majorVersion()); @@ -89,7 +88,7 @@ public String getNetworkProtocolVersion( @Override @Nullable public InetSocketAddress getNetworkPeerInetSocketAddress( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.remoteAddress(); if (address instanceof InetSocketAddress) { return (InetSocketAddress) address; @@ -100,7 +99,7 @@ public InetSocketAddress getNetworkPeerInetSocketAddress( @Nullable @Override public InetSocketAddress getNetworkLocalInetSocketAddress( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { + NettyRequest requestAndChannel, @Nullable HttpResponse response) { SocketAddress address = requestAndChannel.channel().localAddress(); if (address instanceof InetSocketAddress) { return (InetSocketAddress) address; diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java index c8283e86c062..5bb4297c2a35 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java @@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel; +import io.opentelemetry.instrumentation.netty.common.v4_0.NettyRequest; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterBuilderFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterFactory; import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumentationFlag; @@ -44,7 +44,7 @@ public final class ReactorNettySingletons { new ReactorNettyHttpClientAttributesGetter(), HttpClientRequestHeadersSetter.INSTANCE); - DefaultHttpClientInstrumenterBuilder builder = + DefaultHttpClientInstrumenterBuilder builder = NettyClientInstrumenterBuilderFactory.create( INSTRUMENTATION_NAME, GlobalOpenTelemetry.get()) .configure(AgentCommonConfig.get());