From 7be766a78bfa448170d766f2b91a90677eb42b8e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 6 Feb 2023 09:34:12 -0800 Subject: [PATCH] Remove write context (#7735) ~(currently built on top of #7732)~ --- .../javaagent/instrumentation/netty/v4_0/AttributeKeys.java | 3 --- .../netty/v4_0/client/HttpClientRequestTracingHandler.java | 5 +---- .../instrumentation/netty/v4_1/NettyClientTelemetry.java | 3 ++- .../instrumentation/netty/v4_1/internal/AttributeKeys.java | 3 --- .../internal/client/HttpClientRequestTracingHandler.java | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AttributeKeys.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AttributeKeys.java index d598dfd405..0ec8f83337 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AttributeKeys.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/AttributeKeys.java @@ -22,9 +22,6 @@ public class AttributeKeys { } }; - public static final AttributeKey WRITE_CONTEXT = - attributeKey(AttributeKeys.class.getName() + ".write-context"); - // this is the context that has the server span public static final AttributeKey SERVER_CONTEXT = attributeKey(AttributeKeys.class.getName() + ".server-context"); 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 d6d8eb2980..af651fac6c 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 @@ -26,10 +26,7 @@ public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapt return; } - Context parentContext = ctx.channel().attr(AttributeKeys.WRITE_CONTEXT).getAndRemove(); - if (parentContext == null) { - parentContext = Context.current(); - } + Context parentContext = Context.current(); HttpRequestAndChannel request = HttpRequestAndChannel.create((HttpRequest) msg, ctx.channel()); if (!instrumenter().shouldStart(parentContext, request)) { 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 fcdda75106..fcd8abc958 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 @@ -71,7 +71,8 @@ public final class NettyClientTelemetry { * Propagate the {@link Context} to the {@link Channel}. This MUST be called before each HTTP * request executed on a {@link Channel}. */ + // TODO (trask) rename to setParentContext()? public static void setChannelContext(Channel channel, Context context) { - channel.attr(AttributeKeys.WRITE_CONTEXT).set(context); + channel.attr(AttributeKeys.CLIENT_PARENT_CONTEXT).set(context); } } diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/AttributeKeys.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/AttributeKeys.java index b06edb0582..8fa5568acb 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/AttributeKeys.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/AttributeKeys.java @@ -14,9 +14,6 @@ import io.opentelemetry.context.Context; */ public final class AttributeKeys { - public static final AttributeKey WRITE_CONTEXT = - AttributeKey.valueOf(AttributeKeys.class, "passed-context"); - // this is the context that has the server span // // note: this attribute key is also used by ratpack instrumentation 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 b8e42284a3..c2f76944ba 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 @@ -41,7 +41,7 @@ public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapt return; } - Context parentContext = ctx.channel().attr(AttributeKeys.WRITE_CONTEXT).getAndSet(null); + Context parentContext = ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).get(); if (parentContext == null) { parentContext = Context.current(); }