no longer need actiondata

Author: jaydeluca

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/ActionData.java

@@ -12,10 +12,8 @@
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import io.opentelemetry.context.Context;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import java.lang.reflect.Method;
 import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -49,14 +47,8 @@ public void transform(TypeTransformer transformer) {
   public static class ApplyAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AdviceScope onEnter(
-        @Advice.This Object target,
-        @Advice.Origin Method method,
-        @Advice.Argument(0) Request<?> req) {
-      Context parentContext = currentContext();
-
-      ActionData actionData = new ActionData(target.getClass(), method);
-      return AdviceScope.start(parentContext, actionData);
+    public static AdviceScope onEnter(@Advice.Argument(0) Request<?> req) {
+      return AdviceScope.start(currentContext());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/ActionInstrumentation.java

@@ -19,24 +19,22 @@
 /** Container used to carry state between enter and exit advices */
 public final class AdviceScope {
 
-  private final ActionData actionData;
   private final Context context;
   private final Scope scope;
 
-  public AdviceScope(Context context, Scope scope, ActionData actionData) {
-    this.actionData = actionData;
+  public AdviceScope(Context context, Scope scope) {
     this.context = context;
     this.scope = scope;
   }
 
   @Nullable
-  public static AdviceScope start(Context parentContext, ActionData actionData) {
-    if (!instrumenter().shouldStart(parentContext, actionData)) {
+  public static AdviceScope start(Context parentContext) {
+    if (!instrumenter().shouldStart(parentContext, null)) {
       return null;
     }
 
-    Context context = instrumenter().start(parentContext, actionData);
-    return new AdviceScope(context, context.makeCurrent(), actionData);
+    Context context = instrumenter().start(parentContext, null);
+    return new AdviceScope(context, context.makeCurrent());
   }
 
   public void closeScope() {
@@ -55,7 +53,7 @@ public void end(
       responseFuture.onComplete(
           new RequestCompleteCallback(context), thisAction.executionContext());
     } else {
-      instrumenter().end(context, actionData, null, throwable);
+      instrumenter().end(context, null, null, throwable);
     }
   }
 }

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/AdviceScope.java

@@ -17,17 +17,17 @@
 
 public final class Play24Singletons {
   private static final String SPAN_NAME = "play.request";
-  private static final Instrumenter<ActionData, Void> INSTRUMENTER;
+  private static final Instrumenter<Void, Void> INSTRUMENTER;
 
   static {
     INSTRUMENTER =
-        Instrumenter.<ActionData, Void>builder(
+        Instrumenter.<Void, Void>builder(
                 GlobalOpenTelemetry.get(), "io.opentelemetry.play-mvc-2.4", s -> SPAN_NAME)
             .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
             .buildInstrumenter();
   }
 
-  public static Instrumenter<ActionData, Void> instrumenter() {
+  public static Instrumenter<Void, Void> instrumenter() {
     return INSTRUMENTER;
   }
 

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/Play24Singletons.java

@@ -115,7 +115,6 @@ protected void configure(HttpServerTestOptions options) {
   public SpanDataAssert assertHandlerSpan(
       SpanDataAssert span, String method, ServerEndpoint endpoint) {
     span.hasName("play.request").hasKind(INTERNAL);
-
     if (endpoint == EXCEPTION) {
       span.hasStatus(StatusData.error());
       span.hasException(new IllegalArgumentException(EXCEPTION.getBody()));