Netty connection failure span only when first operation fails (open-t…

…elemetry#3228)
robododge · Jun 17, 2021 · 2c0e587 · 2c0e587
1 parent e0e61cc
commit 2c0e587
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ntelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java b/...ntelemetry/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/...ntelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java b/...ntelemetry/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)) {