File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed
apm-sniffer/bootstrap-plugins/jdk-threadpool-plugin/src/main/java/org/apache/skywalking/apm/plugin Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ Release Notes.
66------------------
77
88* Add the virtual thread executor plugin
9-
9+ * Fix Conflicts apm-jdk-threadpool-plugin conflicts with apm-jdk-forkjoinpool-plugin
1010
1111All issues and pull requests are [ here] ( https://github.com/apache/skywalking/milestone/236?closed=1 )
1212
Original file line number Diff line number Diff line change 2424import org .apache .skywalking .apm .agent .core .plugin .interceptor .enhance .InstanceMethodsAroundInterceptor ;
2525import org .apache .skywalking .apm .agent .core .plugin .interceptor .enhance .MethodInterceptResult ;
2626import java .lang .reflect .Method ;
27+ import java .util .concurrent .ForkJoinTask ;
2728
2829public abstract class AbstractThreadingPoolInterceptor implements InstanceMethodsAroundInterceptor {
2930 @ Override
@@ -71,6 +72,8 @@ private boolean notToEnhance(Object[] allArguments) {
7172 Object argument = allArguments [0 ];
7273
7374 // Avoid duplicate enhancement, such as the case where it has already been enhanced by RunnableWrapper or CallableWrapper with toolkit.
74- return argument instanceof EnhancedInstance && ((EnhancedInstance ) argument ).getSkyWalkingDynamicField () instanceof ContextSnapshot ;
75+ return argument instanceof EnhancedInstance
76+ && ((EnhancedInstance ) argument ).getSkyWalkingDynamicField () instanceof ContextSnapshot
77+ && !(argument instanceof ForkJoinTask );
7578 }
7679}
You can’t perform that action at this time.
0 commit comments