Fix NPE in netty 3.8 instrumentation (#13801)

laurit · web-flow · commit 419eb50129ad · 2025-04-30T12:35:36.000+03:00
diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/ChannelFutureListenerInstrumentation.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/ChannelFutureListenerInstrumentation.java
@@ -54,7 +54,7 @@ public static Scope activateScope(@Advice.Argument(0) ChannelFuture future) {
        - To capture scope only in case of error.
        */
       Throwable cause = future.getCause();
-      if (cause == null) {
+      if (cause == null || future.getChannel() == null) {
         return null;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static Scope activateScope(@Advice.Argument(0) ChannelFuture future) {`
`54`	`54`	`- To capture scope only in case of error.`
`55`	`55`	`*/`
`56`	`56`	`Throwable cause = future.getCause();`
`57`		`- if (cause == null) {`
	`57`	`+ if (cause == null \|\| future.getChannel() == null) {`
`58`	`58`	`return null;`
`59`	`59`	`}`
`60`	`60`