Propagate channelInactive to next handler

DataDog · Nov 7, 2024 · 8da33a7 · 8da33a7
1 parent e91eeda
commit 8da33a7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/...in/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java b/...in/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java
@@ -79,10 +79,17 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
   @Override
   public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-    final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndRemove();
-    if (span != null && span.phasedFinish()) {
-      // at this point we can just publish this span to avoid loosing the rest of the trace
-      span.publish();
+    try {
+      super.channelInactive(ctx);
+    } finally {
+      try {
+        final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndRemove();
+        if (span != null && span.phasedFinish()) {
+          // at this point we can just publish this span to avoid loosing the rest of the trace
+          span.publish();
+        }
+      } catch (final Throwable ignored) {
+      }
     }
   }
 }
diff --git a/...in/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java b/...in/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java
@@ -84,10 +84,17 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
   @Override
   public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-    final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndRemove();
-    if (span != null && span.phasedFinish()) {
-      // at this point we can just publish this span to avoid loosing the rest of the trace
-      span.publish();
+    try {
+      super.channelInactive(ctx);
+    } finally {
+      try {
+        final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndRemove();
+        if (span != null && span.phasedFinish()) {
+          // at this point we can just publish this span to avoid loosing the rest of the trace
+          span.publish();
+        }
+      } catch (final Throwable ignored) {
+      }
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/SpringWebfluxTest.groovy b/dd-java-agent/instrumentation/spring-webflux-6/src/bootTest/groovy/SpringWebfluxTest.groovy
@@ -675,7 +675,7 @@ class SpringWebfluxHttp11Test extends AgentTestRunner {
           [ "message":"The subscription was cancelled", "event":"cancelled"])
         traceParent = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), null)
       }
-      trace(1) {
+      trace(2) {
         span {
           resourceName "GET /very-delayed"
           operationName "netty.request"
@@ -695,6 +695,18 @@ class SpringWebfluxHttp11Test extends AgentTestRunner {
             defaultTags(true)
           }
         }
+        span {
+          resourceName "TestController.getVeryDelayedMono"
+          operationName "TestController.getVeryDelayedMono"
+          spanType DDSpanTypes.HTTP_SERVER
+          childOfPrevious()
+          tags {
+            "$Tags.COMPONENT" "spring-webflux-controller"
+            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
+            "handler.type" TestController.getName()
+            defaultTags()
+          }
+        }
       }
     }
   }