Cherry pick #10254 for 1.32 patch release (#10274)

Co-authored-by: Roman Kvasnytskyi <roman@kvasnytskyi.net>
open-telemetry · Jan 23, 2024 · 9d246ad · 9d246ad
1 parent c30f9d8
commit 9d246ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/netty/v4/common/FutureListenerWrappers.java b/...va/io/opentelemetry/javaagent/instrumentation/netty/v4/common/FutureListenerWrappers.java
@@ -43,7 +43,7 @@ protected Boolean computeValue(Class<?> type) {
       };
 
   public static boolean shouldWrap(GenericFutureListener<? extends Future<?>> listener) {
-    return shouldWrap.get(listener.getClass());
+    return listener != null && shouldWrap.get(listener.getClass());
   }
 
   @SuppressWarnings("unchecked")

diff --git a/...o/opentelemetry/javaagent/instrumentation/netty/v4/common/NettyFutureInstrumentation.java b/...o/opentelemetry/javaagent/instrumentation/netty/v4/common/NettyFutureInstrumentation.java
@@ -82,6 +82,8 @@ public static void wrapListener(
       for (int i = 0; i < listeners.length; ++i) {
         if (FutureListenerWrappers.shouldWrap(listeners[i])) {
           wrappedListeners[i] = FutureListenerWrappers.wrap(context, listeners[i]);
+        } else {
+          wrappedListeners[i] = listeners[i];
         }
       }
       listeners = wrappedListeners;