netty client: don't finish parent span (#7126)

DataDog · Jun 4, 2024 · 244260b · 244260b
1 parent 9f6d75c
commit 244260b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...n/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java b/...n/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java
@@ -71,7 +71,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     parentAttr.setIfAbsent(noopSpan());
     final AgentSpan parent = parentAttr.get();
     final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndSet(parent);
-    if (span != null) {
+    if (span != null && span != parent) {
       try (final AgentScope scope = activateSpan(span)) {
         DECORATE.beforeFinish(span);
         span.finish();

diff --git a/...n/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/...n/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java
@@ -80,7 +80,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     parentAttr.setIfAbsent(noopSpan());
     final AgentSpan parent = parentAttr.get();
     final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndSet(parent);
-    if (span != null) {
+    if (span != null && span != parent) {
       try (final AgentScope scope = activateSpan(span)) {
         DECORATE.beforeFinish(span);
         span.finish();