Track server context in netty4 instrumentation

mcculls · mcculls · commit 6ccc620cd3ee · 2026-02-09T12:36:11.000Z
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java
@@ -28,11 +28,10 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
     Channel channel = ctx.channel();
     if (!(msg instanceof HttpRequest)) {
       final Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();
-      final AgentSpan span = spanFromContext(storedContext);
-      if (span == null) {
+      if (storedContext == null) {
         ctx.fireChannelRead(msg); // superclass does not throw
       } else {
-        try (final ContextScope scope = span.attach()) {
+        try (final ContextScope scope = storedContext.attach()) {
           ctx.fireChannelRead(msg); // superclass does not throw
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,10 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {`
`28`	`28`	`Channel channel = ctx.channel();`
`29`	`29`	`if (!(msg instanceof HttpRequest)) {`
`30`	`30`	`final Context storedContext = channel.attr(CONTEXT_ATTRIBUTE_KEY).get();`
`31`		`- final AgentSpan span = spanFromContext(storedContext);`
`32`		`- if (span == null) {`
	`31`	`+ if (storedContext == null) {`
`33`	`32`	`ctx.fireChannelRead(msg); // superclass does not throw`
`34`	`33`	`} else {`
`35`		`- try (final ContextScope scope = span.attach()) {`
	`34`	`+ try (final ContextScope scope = storedContext.attach()) {`
`36`	`35`	`ctx.fireChannelRead(msg); // superclass does not throw`
`37`	`36`	`}`
`38`	`37`	`}`