Fix jetty context leak (#1966)

open-telemetry · Jan 5, 2021 · 1671951 · 1671951
1 parent d9dc07c
commit 1671951
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.../opentelemetry/javaagent/instrumentation/api/concurrent/ExecutorInstrumentationUtils.java b/.../opentelemetry/javaagent/instrumentation/api/concurrent/ExecutorInstrumentationUtils.java
@@ -34,7 +34,11 @@ public static boolean shouldAttachStateToTask(Object task) {
         // TODO Workaround for
         // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/787
         && !taskClass.getName().equals("org.apache.tomcat.util.net.NioEndpoint$SocketProcessor")
-        // Don't instrument the executor's own runnables.  These runnables may never return until
+        // Avoid context leak on jetty. Runnable submitted from SelectChannelEndPoint is used to
+        // process a new request which should not have context from them current request.
+        && (enclosingClass == null
+            || !enclosingClass.getName().equals("org.eclipse.jetty.io.nio.SelectChannelEndPoint"))
+        // Don't instrument the executor's own runnables. These runnables may never return until
         // netty shuts down.
         && (enclosingClass == null
             || !enclosingClass