make AdviceScope class consistent, update test and remove deprecated semconv

Author: jaydeluca

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/build.gradle.kts

@@ -85,6 +85,8 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
     }
   }
 }
+
 tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  jvmArgs("-Dotel.semconv-stability.opt-in=code")
 }

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

@@ -49,14 +49,14 @@ public void transform(TypeTransformer transformer) {
   public static class ApplyAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static ActionScope onEnter(
+    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 ActionScope.start(parentContext, actionData);
+      return AdviceScope.start(parentContext, actionData);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
@@ -65,7 +65,7 @@ public static void stopTraceOnResponse(
         @Advice.Thrown Throwable throwable,
         @Advice.Argument(0) Request<?> req,
         @Advice.Return(readOnly = false) Future<Result> responseFuture,
-        @Advice.Enter ActionScope actionScope) {
+        @Advice.Enter AdviceScope actionScope) {
       if (actionScope == null || actionScope.getScope() == null) {
         return;
       }

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

@@ -11,13 +11,13 @@
 import io.opentelemetry.context.Scope;
 
 /** Container used to carry state between enter and exit advices */
-public final class ActionScope {
+public final class AdviceScope {
 
   private final ActionData actionData;
   private final Context context;
   private final Scope scope;
 
-  public ActionScope(Context context, Scope scope, ActionData actionData) {
+  public AdviceScope(Context context, Scope scope, ActionData actionData) {
     this.actionData = actionData;
     this.context = context;
     this.scope = scope;
@@ -31,13 +31,13 @@ public Scope getScope() {
     return scope;
   }
 
-  public static ActionScope start(Context parentContext, ActionData actionData) {
+  public static AdviceScope start(Context parentContext, ActionData actionData) {
     if (!instrumenter().shouldStart(parentContext, actionData)) {
       return null;
     }
 
     Context context = instrumenter().start(parentContext, actionData);
-    return new ActionScope(context, context.makeCurrent(), actionData);
+    return new AdviceScope(context, context.makeCurrent(), actionData);
   }
 
   public void closeScope() {

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/server/PlayServerTest.java

@@ -15,8 +15,6 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE;
-import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
-import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -26,6 +24,7 @@
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
 import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
 import io.opentelemetry.sdk.trace.data.StatusData;
+import io.opentelemetry.semconv.CodeAttributes;
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -115,14 +114,12 @@ protected void configure(HttpServerTestOptions options) {
   }
 
   @Override
-  @SuppressWarnings("deprecation") // uses deprecated semconv
   public SpanDataAssert assertHandlerSpan(
       SpanDataAssert span, String method, ServerEndpoint endpoint) {
     span.hasName("play.request")
         .hasKind(INTERNAL)
         .hasAttributesSatisfyingExactly(
-            equalTo(CODE_NAMESPACE, "play.api.mvc.ActionBuilder$$anon$2"),
-            equalTo(CODE_FUNCTION, "apply"));
+            equalTo(CodeAttributes.CODE_FUNCTION_NAME, "play.api.mvc.ActionBuilder$$anon$2.apply"));
 
     if (endpoint == EXCEPTION) {
       span.hasStatus(StatusData.error());