Change play instrumentation name to play-mvc and restructure dirs (#6106)

* restructure play instrumentation dirs

* change instrumentation name from play -> play-mvc

* Revert "change instrumentation name from play -> play-mvc"

This reverts commit 2174e0935f84450300cdc141a5e9786fd125a639.

* spring-mvc names

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

@@ -18,7 +18,7 @@ public final class Play24Singletons {
   private static final String SPAN_NAME = "play.request";
   private static final Instrumenter<Void, Void> INSTRUMENTER =
       Instrumenter.<Void, Void>builder(
-              GlobalOpenTelemetry.get(), "io.opentelemetry.play-2.4", s -> SPAN_NAME)
+              GlobalOpenTelemetry.get(), "io.opentelemetry.play-mvc-2.4", s -> SPAN_NAME)
           .newInstrumenter();
 
   public static Instrumenter<Void, Void> instrumenter() {

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

@@ -18,7 +18,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 public class PlayInstrumentationModule extends InstrumentationModule {
 
   public PlayInstrumentationModule() {
-    super("play", "play-2.4");
+    super("play", "play-mvc-2.4");
   }
 
   @Override

instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/Play26Singletons.java → instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/Play26Singletons.java

@@ -24,7 +24,7 @@ public final class Play26Singletons {
   private static final String SPAN_NAME = "play.request";
   private static final Instrumenter<Void, Void> INSTRUMENTER =
       Instrumenter.<Void, Void>builder(
-              GlobalOpenTelemetry.get(), "io.opentelemetry.play-2.6", s -> SPAN_NAME)
+              GlobalOpenTelemetry.get(), "io.opentelemetry.play-mvc-2.6", s -> SPAN_NAME)
           .newInstrumenter();
 
   @Nullable private static final Method typedKeyGetUnderlying;

instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java → instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java

@@ -16,7 +16,7 @@ import java.util.List;
 public class PlayInstrumentationModule extends InstrumentationModule {
 
   public PlayInstrumentationModule() {
-    super("play", "play-2.6");
+    super("play", "play-mvc-2.6");
   }
 
   @Override

instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts → instrumentation/play/play-ws/play-ws-1.0/javaagent/build.gradle.kts

@@ -27,9 +27,9 @@ val scalaVersion = "2.12"
 dependencies {
   library("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:1.0.2")
 
-  implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
+  implementation(project(":instrumentation:play:play-ws:play-ws-common:javaagent"))
 
-  testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
+  testImplementation(project(":instrumentation:play:play-ws:play-ws-common:testing"))
 
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts → instrumentation/play/play-ws/play-ws-2.0/javaagent/build.gradle.kts

@@ -33,9 +33,9 @@ val scalaVersion = "2.12"
 dependencies {
   library("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:2.0.0")
 
-  implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
+  implementation(project(":instrumentation:play:play-ws:play-ws-common:javaagent"))
 
-  testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
+  testImplementation(project(":instrumentation:play:play-ws:play-ws-common:testing"))
 
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts → instrumentation/play/play-ws/play-ws-2.1/javaagent/build.gradle.kts

@@ -32,9 +32,9 @@ val scalaVersion = "2.12"
 dependencies {
   library("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:2.1.0")
 
-  implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
+  implementation(project(":instrumentation:play:play-ws:play-ws-common:javaagent"))
 
-  testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
+  testImplementation(project(":instrumentation:play:play-ws:play-ws-common:testing"))
 
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

settings.gradle.kts

@@ -345,13 +345,13 @@ include(":instrumentation:opentelemetry-instrumentation-api:testing")
 include(":instrumentation:oshi:javaagent")
 include(":instrumentation:oshi:library")
 include(":instrumentation:oshi:testing")
-include(":instrumentation:play:play-2.4:javaagent")
-include(":instrumentation:play:play-2.6:javaagent")
-include(":instrumentation:play-ws:play-ws-1.0:javaagent")
-include(":instrumentation:play-ws:play-ws-2.0:javaagent")
-include(":instrumentation:play-ws:play-ws-2.1:javaagent")
-include(":instrumentation:play-ws:play-ws-common:javaagent")
-include(":instrumentation:play-ws:play-ws-common:testing")
+include(":instrumentation:play:play-mvc:play-mvc-2.4:javaagent")
+include(":instrumentation:play:play-mvc:play-mvc-2.6:javaagent")
+include(":instrumentation:play:play-ws:play-ws-1.0:javaagent")
+include(":instrumentation:play:play-ws:play-ws-2.0:javaagent")
+include(":instrumentation:play:play-ws:play-ws-2.1:javaagent")
+include(":instrumentation:play:play-ws:play-ws-common:javaagent")
+include(":instrumentation:play:play-ws:play-ws-common:testing")
 include(":instrumentation:quartz-2.0:javaagent")
 include(":instrumentation:quartz-2.0:library")
 include(":instrumentation:quartz-2.0:testing")