clean

amarziali · amarziali · commit 4a44ebe3a8db · 2026-01-27T13:02:23.000+01:00
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureModule.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureModule.java
@@ -83,7 +83,7 @@ public Map<String, String> contextStore() {
               );
       excludedRunnableClasses.addAll(unicompletionClasses);
       excludedExecutorClasses.addAll(unicompletionClasses);
-      excludedForkJoinClass.addAll(excludedRunnableClasses);
+      excludedForkJoinClass.addAll(unicompletionClasses);
     }
 
     excluded.put(RUNNABLE, excludedRunnableClasses);
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java
@@ -9,17 +9,13 @@
 import java.util.concurrent.Executor;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public abstract class AbstractExecutorInstrumentation
     implements Instrumenter.ForBootstrap,
         Instrumenter.CanShortcutTypeMatching,
         Instrumenter.ForConfiguredTypes,
         Instrumenter.HasMethodAdvice {
 
-  private static final Logger log = LoggerFactory.getLogger(AbstractExecutorInstrumentation.class);
-
   /** To apply to all executors, use override setting below. */
   private final boolean TRACE_ALL_EXECUTORS = InstrumenterConfig.get().isTraceExecutorsAll();
 
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/ForkJoinModule.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/ForkJoinModule.java
@@ -42,7 +42,6 @@ public Map<String, String> contextStore() {
 
   @Override
   public List<Instrumenter> typeInstrumentations() {
-    return asList(
-        new JavaForkJoinWorkQueueInstrumentation(), new JavaForkJoinTaskInstrumentation());
+    return asList(new JavaForkJoinPoolInstrumentation(), new JavaForkJoinTaskInstrumentation());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public Map<String, String> contextStore() {`
`83`	`83`	`);`
`84`	`84`	`excludedRunnableClasses.addAll(unicompletionClasses);`
`85`	`85`	`excludedExecutorClasses.addAll(unicompletionClasses);`
`86`		`- excludedForkJoinClass.addAll(excludedRunnableClasses);`
	`86`	`+ excludedForkJoinClass.addAll(unicompletionClasses);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`excluded.put(RUNNABLE, excludedRunnableClasses);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ public Map<String, String> contextStore() {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`public List<Instrumenter> typeInstrumentations() {`
`45`		`- return asList(`
`46`		`- new JavaForkJoinWorkQueueInstrumentation(), new JavaForkJoinTaskInstrumentation());`
	`45`	`+ return asList(new JavaForkJoinPoolInstrumentation(), new JavaForkJoinTaskInstrumentation());`
`47`	`46`	`}`
`48`	`47`	`}`