From b381d0529242fb7ea5c3b9b5818915676b6f8f0b Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 8 Jun 2021 15:31:31 +0300 Subject: [PATCH] Netty connection failure span only when first operation fails --- .../netty/v4_0/ChannelFutureListenerInstrumentation.java | 8 ++++---- .../netty/v4_1/ChannelFutureListenerInstrumentation.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java index aafe13ece1e9..58b15bb82970 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java @@ -50,14 +50,14 @@ public static Scope activateScope(@Advice.Argument(0) ChannelFuture future) { - To return scope only if we have captured it. - To capture scope only in case of error. */ - Throwable cause = future.cause(); - if (cause == null) { - return null; - } Context parentContext = future.channel().attr(AttributeKeys.CONNECT_CONTEXT).getAndRemove(); if (parentContext == null) { return null; } + Throwable cause = future.cause(); + if (cause == null) { + return null; + } Scope parentScope = parentContext.makeCurrent(); if (tracer().shouldStartSpan(parentContext)) { diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java index f2451e152125..4e8b56fc7e60 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java @@ -52,14 +52,14 @@ public static Scope activateScope(@Advice.Argument(0) ChannelFuture future) { - To return scope only if we have captured it. - To capture scope only in case of error. */ - Throwable cause = future.cause(); - if (cause == null) { - return null; - } Context parentContext = future.channel().attr(AttributeKeys.CONNECT_CONTEXT).getAndRemove(); if (parentContext == null) { return null; } + Throwable cause = future.cause(); + if (cause == null) { + return null; + } Scope parentScope = parentContext.makeCurrent(); if (tracer().shouldStartSpan(parentContext, SpanKind.CLIENT)) {