Skip to content

Commit 244260b

Browse files
authored
netty client: don't finish parent span (#7126)
1 parent 9f6d75c commit 244260b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
7171
parentAttr.setIfAbsent(noopSpan());
7272
final AgentSpan parent = parentAttr.get();
7373
final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndSet(parent);
74-
if (span != null) {
74+
if (span != null && span != parent) {
7575
try (final AgentScope scope = activateSpan(span)) {
7676
DECORATE.beforeFinish(span);
7777
span.finish();

dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
8080
parentAttr.setIfAbsent(noopSpan());
8181
final AgentSpan parent = parentAttr.get();
8282
final AgentSpan span = ctx.channel().attr(SPAN_ATTRIBUTE_KEY).getAndSet(parent);
83-
if (span != null) {
83+
if (span != null && span != parent) {
8484
try (final AgentScope scope = activateSpan(span)) {
8585
DECORATE.beforeFinish(span);
8686
span.finish();

0 commit comments

Comments
 (0)