Remove unused arguments and methods from async AdviceUtils (#7397)

mcculls · web-flow · commit 22e9fef1088a · 2024-08-13T14:49:05.000+01:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java
@@ -4,7 +4,6 @@
 
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 /** Helper utils for Runnable/Callable instrumentation */
 public class AdviceUtils {
@@ -19,10 +18,10 @@ public class AdviceUtils {
    */
   public static <T> AgentScope startTaskScope(
       final ContextStore<T, State> contextStore, final T task) {
-    return startTaskScope(contextStore.get(task), false);
+    return startTaskScope(contextStore.get(task));
   }
 
-  public static AgentScope startTaskScope(State state, boolean migrated) {
+  public static AgentScope startTaskScope(State state) {
     if (state != null) {
       final AgentScope.Continuation continuation = state.getAndResetContinuation();
       if (continuation != null) {
@@ -50,16 +49,7 @@ public static <T> void cancelTask(ContextStore<T, State> contextStore, final T t
     }
   }
 
-  public static <T> AgentSpan getCapturedSpan(ContextStore<T, State> contextStore, final T task) {
-    State state = contextStore.get(task);
-    if (null != state) {
-      return state.getSpan();
-    }
-    return null;
-  }
-
-  public static <T> void capture(
-      ContextStore<T, State> contextStore, T task, boolean startThreadMigration) {
+  public static <T> void capture(ContextStore<T, State> contextStore, T task) {
     AgentScope activeScope = activeScope();
     if (null != activeScope && activeScope.isAsyncPropagating()) {
       State state = contextStore.get(task);
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
@@ -74,7 +74,7 @@ public static boolean shouldPropagate(
 
   public static void capture(ContextStore<Runnable, State> contextStore, Runnable task) {
     if (task != null && !exclude(RUNNABLE, task)) {
-      AdviceUtils.capture(contextStore, task, true);
+      AdviceUtils.capture(contextStore, task);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java
@@ -39,7 +39,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class ConstructAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void afterInit(@Advice.This Envelope zis) {
-      capture(InstrumentationContext.get(Envelope.class, State.class), zis, true);
+      capture(InstrumentationContext.get(Envelope.class, State.class), zis);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java
@@ -51,7 +51,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Construct {
     @Advice.OnMethodExit
     public static void construct(@Advice.Argument(0) Runnable wrapped) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), wrapped, true);
+      capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java
@@ -46,7 +46,7 @@ public static final class ExternalPush {
     @Advice.OnMethodEnter
     public static <T> void externalPush(@Advice.Argument(0) ForkJoinTask<T> task) {
       if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);
+        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
       }
     }
 
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java
@@ -103,7 +103,7 @@ public static void after(@Advice.Enter AgentScope scope) {
   public static final class Fork {
     @Advice.OnMethodEnter
     public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
-      capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);
+      capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/elasticsearch/transport/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/transport/src/main/java/datadog/trace/instrumentation/elasticsearch/ThreadedActionListenerInstrumentation.java
@@ -54,8 +54,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Construct {
     @Advice.OnMethodExit
     public static void after(@Advice.This ThreadedActionListener listener) {
-      capture(
-          InstrumentationContext.get(ThreadedActionListener.class, State.class), listener, true);
+      capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/QueuedCommandInstrumentation.java
@@ -65,7 +65,7 @@ public static final class Construct {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void after(@Advice.This Object command) {
       ContextStore<Object, State> contextStore = InstrumentationContext.get(QUEUED_COMMAND, STATE);
-      capture(contextStore, command, false);
+      capture(contextStore, command);
       QueueTimerHelper.startQueuingTimer(contextStore, Channel.class, command);
     }
   }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java
@@ -60,7 +60,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Capture {
     @Advice.OnMethodExit
     public static void capture(@Advice.This Runnable task) {
-      AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), task, true);
+      AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), task);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java
@@ -72,7 +72,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class Construct {
     @Advice.OnMethodExit
     public static void construct(@Advice.This ForkJoinTask<?> task) {
-      capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);
+      capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency/StructuredTaskScopeInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency/StructuredTaskScopeInstrumentation.java
@@ -71,7 +71,7 @@ public static <T> void captureScope(
           InstrumentationContext.get(
               "java.util.concurrent.StructuredTaskScope.SubtaskImpl",
               "datadog.trace.bootstrap.instrumentation.java.concurrent.State");
-      capture(contextStore, task, true);
+      capture(contextStore, task);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java
@@ -53,7 +53,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Construct {
     @Advice.OnMethodExit
     public static void captureScope(@Advice.This Runnable task) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), task, true);
+      capture(InstrumentationContext.get(Runnable.class, State.class), task);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java
@@ -58,7 +58,7 @@ public static <T> void externalPush(
       if (!exclude(FORK_JOIN_TASK, task)) {
         ContextStore<ForkJoinTask, State> contextStore =
             InstrumentationContext.get(ForkJoinTask.class, State.class);
-        capture(contextStore, task, true);
+        capture(contextStore, task);
         QueueTimerHelper.startQueuingTimer(contextStore, pool.getClass(), task);
       }
     }
@@ -79,7 +79,7 @@ public static <T> void poolSubmit(
       if (!exclude(FORK_JOIN_TASK, task)) {
         ContextStore<ForkJoinTask, State> contextStore =
             InstrumentationContext.get(ForkJoinTask.class, State.class);
-        capture(contextStore, task, true);
+        capture(contextStore, task);
         QueueTimerHelper.startQueuingTimer(contextStore, pool.getClass(), task);
       }
     }
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java
@@ -100,7 +100,7 @@ public static final class Fork {
     @Advice.OnMethodEnter
     public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
       if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);
+        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java
@@ -137,7 +137,7 @@ public static final class Construct {
 
     @Advice.OnMethodExit
     public static <T> void captureScope(@Advice.This RunnableFuture<T> task) {
-      capture(InstrumentationContext.get(RunnableFuture.class, State.class), task, true);
+      capture(InstrumentationContext.get(RunnableFuture.class, State.class), task);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java
@@ -66,7 +66,7 @@ public static void before(@Advice.Argument(0) TimerTask task, @Advice.Argument(2
       if (!exclude(RUNNABLE, task)) {
         ContextStore<Runnable, State> contextStore =
             InstrumentationContext.get(Runnable.class, State.class);
-        capture(contextStore, task, true);
+        capture(contextStore, task);
         startQueuingTimer(contextStore, Timer.class, task);
       }
     }
diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/AsyncCommandInstrumentation.java
@@ -65,7 +65,7 @@ public static final class Capture {
     @SuppressWarnings("rawtypes")
     @Advice.OnMethodExit
     public static void after(@Advice.This AsyncCommand asyncCommand) {
-      capture(InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand, false);
+      capture(InstrumentationContext.get(AsyncCommand.class, State.class), asyncCommand);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/ThreadedActionListenerInstrumentation.java
@@ -54,8 +54,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Construct {
     @Advice.OnMethodExit
     public static void after(@Advice.This ThreadedActionListener listener) {
-      capture(
-          InstrumentationContext.get(ThreadedActionListener.class, State.class), listener, true);
+      capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoEnvelopeInstrumentation.java
@@ -39,7 +39,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class ConstructAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void afterInit(@Advice.This Envelope zis) {
-      capture(InstrumentationContext.get(Envelope.class, State.class), zis, true);
+      capture(InstrumentationContext.get(Envelope.class, State.class), zis);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoForkJoinExecutorTaskInstrumentation.java
@@ -51,7 +51,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Construct {
     @Advice.OnMethodExit
     public static void construct(@Advice.Argument(0) Runnable wrapped) {
-      capture(InstrumentationContext.get(Runnable.class, State.class), wrapped, true);
+      capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);
     }
   }
 
diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinPoolInstrumentation.java
@@ -50,7 +50,7 @@ public static final class StartTask {
     @Advice.OnMethodEnter
     public static <T> void before(@Advice.Argument(0) ForkJoinTask<T> task) {
       if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);
+        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
       }
     }
 
diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/scala-concurrent/src/main/java/datadog/trace/instrumentation/scala/concurrent/ScalaForkJoinTaskInstrumentation.java
@@ -98,7 +98,7 @@ public static final class Fork {
     @Advice.OnMethodEnter
     public static <T> void fork(@Advice.This ForkJoinTask<T> task) {
       if (!exclude(FORK_JOIN_TASK, task)) {
-        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);
+        capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/src/main/java/datadog/trace/instrumentation/scala210/concurrent/CallbackRunnableInstrumentation.java
@@ -75,7 +75,7 @@ public String[] helperClassNames() {
   public static final class Construct {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static <T> void onConstruct(@Advice.This CallbackRunnable<T> task) {
-      capture(InstrumentationContext.get(CallbackRunnable.class, State.class), task, true);
+      capture(InstrumentationContext.get(CallbackRunnable.class, State.class), task);
     }
   }
 
@@ -111,7 +111,7 @@ public static <T> void beforeExecute(
       }
       // If nothing else has been picked up, then try to pick up the current Scope
       if (null == state) {
-        capture(contextStore, task, true);
+        capture(contextStore, task);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/src/main/java/datadog/trace/instrumentation/scala213/concurrent/PromiseTransformationInstrumentation.java
@@ -82,7 +82,7 @@ public static <F, T> void onConstruct(
       if (xform == 0) {
         return;
       }
-      capture(InstrumentationContext.get(Transformation.class, State.class), task, true);
+      capture(InstrumentationContext.get(Transformation.class, State.class), task);
     }
   }
 
@@ -128,7 +128,7 @@ public static <F, T> void beforeExecute(
       }
       // If nothing else has been picked up, then try to pick up the current Scope
       if (null == state) {
-        capture(contextStore, task, true);
+        capture(contextStore, task);
       }
     }
   }
diff --git a/dd-java-agent/instrumentation/scala-promise/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java b/dd-java-agent/instrumentation/scala-promise/src/main/java/datadog/trace/instrumentation/scala/PromiseHelper.java
@@ -77,7 +77,7 @@ public static AgentScope runActivateSpan(State state) {
     if (capturedSpan != null) {
       AgentSpan activeSpan = activeSpan();
       if (capturedSpan != activeSpan) {
-        return AdviceUtils.startTaskScope(state, true);
+        return AdviceUtils.startTaskScope(state);
       } else {
         state.closeContinuation();
       }
diff --git a/dd-java-agent/instrumentation/slick/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java b/dd-java-agent/instrumentation/slick/src/main/java/datadog/trace/instrumentation/slick/SlickRunnableInstrumentation.java
@@ -52,7 +52,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static final class Construct {
     @Advice.OnMethodExit
     public static void capture(@Advice.This Runnable zis) {
-      AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), zis, true);
+      AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), zis);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static boolean shouldPropagate(`
`74`	`74`
`75`	`75`	`public static void capture(ContextStore<Runnable, State> contextStore, Runnable task) {`
`76`	`76`	`if (task != null && !exclude(RUNNABLE, task)) {`
`77`		`- AdviceUtils.capture(contextStore, task, true);`
	`77`	`+ AdviceUtils.capture(contextStore, task);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void methodAdvice(MethodTransformer transformer) {`
`39`	`39`	`public static class ConstructAdvice {`
`40`	`40`	`@Advice.OnMethodExit(suppress = Throwable.class)`
`41`	`41`	`public static void afterInit(@Advice.This Envelope zis) {`
`42`		`- capture(InstrumentationContext.get(Envelope.class, State.class), zis, true);`
	`42`	`+ capture(InstrumentationContext.get(Envelope.class, State.class), zis);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void methodAdvice(MethodTransformer transformer) {`
`51`	`51`	`public static final class Construct {`
`52`	`52`	`@Advice.OnMethodExit`
`53`	`53`	`public static void construct(@Advice.Argument(0) Runnable wrapped) {`
`54`		`- capture(InstrumentationContext.get(Runnable.class, State.class), wrapped, true);`
	`54`	`+ capture(InstrumentationContext.get(Runnable.class, State.class), wrapped);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public static final class ExternalPush {`
`46`	`46`	`@Advice.OnMethodEnter`
`47`	`47`	`public static <T> void externalPush(@Advice.Argument(0) ForkJoinTask<T> task) {`
`48`	`48`	`if (!exclude(FORK_JOIN_TASK, task)) {`
`49`		`- capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);`
	`49`	`+ capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public static void after(@Advice.Enter AgentScope scope) {`
`103`	`103`	`public static final class Fork {`
`104`	`104`	`@Advice.OnMethodEnter`
`105`	`105`	`public static <T> void fork(@Advice.This ForkJoinTask<T> task) {`
`106`		`- capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);`
	`106`	`+ capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ public void methodAdvice(MethodTransformer transformer) {`
`54`	`54`	`public static final class Construct {`
`55`	`55`	`@Advice.OnMethodExit`
`56`	`56`	`public static void after(@Advice.This ThreadedActionListener listener) {`
`57`		`- capture(`
`58`		`- InstrumentationContext.get(ThreadedActionListener.class, State.class), listener, true);`
	`57`	`+ capture(InstrumentationContext.get(ThreadedActionListener.class, State.class), listener);`
`59`	`58`	`}`
`60`	`59`	`}`
`61`	`60`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static final class Construct {`
`65`	`65`	`@Advice.OnMethodExit(suppress = Throwable.class)`
`66`	`66`	`public static void after(@Advice.This Object command) {`
`67`	`67`	`ContextStore<Object, State> contextStore = InstrumentationContext.get(QUEUED_COMMAND, STATE);`
`68`		`- capture(contextStore, command, false);`
	`68`	`+ capture(contextStore, command);`
`69`	`69`	`QueueTimerHelper.startQueuingTimer(contextStore, Channel.class, command);`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void methodAdvice(MethodTransformer transformer) {`
`60`	`60`	`public static final class Capture {`
`61`	`61`	`@Advice.OnMethodExit`
`62`	`62`	`public static void capture(@Advice.This Runnable task) {`
`63`		`- AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), task, true);`
	`63`	`+ AdviceUtils.capture(InstrumentationContext.get(Runnable.class, State.class), task);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void methodAdvice(MethodTransformer transformer) {`
`72`	`72`	`public static class Construct {`
`73`	`73`	`@Advice.OnMethodExit`
`74`	`74`	`public static void construct(@Advice.This ForkJoinTask<?> task) {`
`75`		`- capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task, true);`
	`75`	`+ capture(InstrumentationContext.get(ForkJoinTask.class, State.class), task);`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`