feat(asm): Clean up blocker helper

Author: PerfectSlayer

dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java

@@ -1,26 +1,13 @@
 package datadog.trace.instrumentation.jetty10;
 
-import datadog.trace.api.gateway.Flow;
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import datadog.context.Context;
 import datadog.trace.instrumentation.jetty.JettyBlockingHelper;
 import net.bytebuddy.asm.Advice;
 import org.eclipse.jetty.server.HttpChannel;
 
 public class DispatchableAdvice {
   @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class)
   public static boolean /* skip */ before(@Advice.FieldValue("this$0") HttpChannel channel) {
-    AgentSpan span = AgentTracer.activeSpan();
-    if (span == null) {
-      return false;
-    }
-    Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
-    if (rba == null) {
-      return false;
-    }
-
-    boolean blocked =
-        JettyBlockingHelper.block(channel.getRequest(), channel.getResponse(), rba, span);
-    return blocked;
+    return JettyBlockingHelper.block(channel.getRequest(), channel.getResponse(), Context.current());
   }
 }

dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java

@@ -233,11 +233,6 @@ public static boolean block(Request request, Response response, Context context)
     if (span == null || (rba = span.getRequestBlockingAction()) == null) {
       return false;
     }
-    return block(request, response, rba, span);
-  }
-
-  public static boolean block(
-      Request request, Response response, Flow.Action.RequestBlockingAction rba, AgentSpan span) {
     return block(
         span.getRequestContext().getTraceSegment(),
         request,
@@ -247,9 +242,8 @@ public static boolean block(
         rba.getExtraHeaders());
   }
 
-  public static void blockAndThrowOnFailure(
-      Request request, Response response, Flow.Action.RequestBlockingAction rba, AgentSpan span) {
-    if (!block(request, response, rba, span)) {
+  public static void blockAndThrowOnFailure(Request request, Response response, Context context) {
+    if (!block(request, response, context)) {
       throw new BlockingException("Throwing after being unable to commit blocking response");
     }
   }