avoid ThreadPoolExecutor duplicate enhancement (#582)

Co-authored-by: xiaqi <[email protected]>
apache · Jul 25, 2023 · fbabc3d · fbabc3d
1 parent d5ec438
commit fbabc3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -147,6 +147,7 @@ Callable {
 * Support to trace redisson lock
 * Upgrade netty-codec-http2 to 4.1.94.Final
 * Upgrade guava to 32.0.1
+* Fix issue with duplicate enhancement by ThreadPoolExecutor
 
 #### Documentation
 

diff --git a/...ugin/src/main/java/org/apache/skywalking/apm/plugin/AbstractThreadingPoolInterceptor.java b/...ugin/src/main/java/org/apache/skywalking/apm/plugin/AbstractThreadingPoolInterceptor.java
@@ -19,6 +19,7 @@
 package org.apache.skywalking.apm.plugin;
 
 import org.apache.skywalking.apm.agent.core.context.ContextManager;
+import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
@@ -37,6 +38,11 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
 
         Object argument = allArguments[0];
 
+        // Avoid duplicate enhancement, such as the case where it has already been enhanced by RunnableWrapper or CallableWrapper with toolkit.
+        if (argument instanceof EnhancedInstance && ((EnhancedInstance) argument).getSkyWalkingDynamicField() instanceof ContextSnapshot) {
+            return;
+        }
+
         Object wrappedObject = wrap(argument);
         if (wrappedObject != null) {
             allArguments[0] = wrappedObject;