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 2174e09. * spring-mvc names
open-telemetry · Jun 2, 2022 · ee90c7c · ee90c7c
1 parent 30710ba
commit ee90c7c
Show file tree

Hide file tree

Showing 48 changed files with 17 additions and 17 deletions.
diff --git a/instrumentation/play/play-2.4/.gitignore → ...ion/play/play-mvc/play-mvc-2.4/.gitignore b/instrumentation/play/play-2.4/.gitignore → ...ion/play/play-mvc/play-mvc-2.4/.gitignore
diff --git a/.../play/play-2.4/javaagent/build.gradle.kts → ...c/play-mvc-2.4/javaagent/build.gradle.kts b/.../play/play-2.4/javaagent/build.gradle.kts → ...c/play-mvc-2.4/javaagent/build.gradle.kts
diff --git a/...tion/play/v2_4/ActionInstrumentation.java → ...tion/play/v2_4/ActionInstrumentation.java b/...tion/play/v2_4/ActionInstrumentation.java → ...tion/play/v2_4/ActionInstrumentation.java
diff --git a/...mentation/play/v2_4/Play24Singletons.java → ...mentation/play/v2_4/Play24Singletons.java b/...mentation/play/v2_4/Play24Singletons.java → ...mentation/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() {

diff --git a/.../play/v2_4/PlayInstrumentationModule.java → .../play/v2_4/PlayInstrumentationModule.java b/.../play/v2_4/PlayInstrumentationModule.java → .../play/v2_4/PlayInstrumentationModule.java
@@ -18,7 +18,7 @@
 public class PlayInstrumentationModule extends InstrumentationModule {
 
   public PlayInstrumentationModule() {
-    super("play", "play-2.4");
+    super("play", "play-mvc-2.4");
   }
 
   @Override

diff --git a/...on/play/v2_4/RequestCompleteCallback.java → ...on/play/v2_4/RequestCompleteCallback.java b/...on/play/v2_4/RequestCompleteCallback.java → ...on/play/v2_4/RequestCompleteCallback.java
diff --git a/...est/groovy/client/PlayWsClientTest.groovy → ...est/groovy/client/PlayWsClientTest.groovy b/...est/groovy/client/PlayWsClientTest.groovy → ...est/groovy/client/PlayWsClientTest.groovy
diff --git a/.../groovy/server/PlayAsyncServerTest.groovy → .../groovy/server/PlayAsyncServerTest.groovy b/.../groovy/server/PlayAsyncServerTest.groovy → .../groovy/server/PlayAsyncServerTest.groovy
diff --git a/.../test/groovy/server/PlayServerTest.groovy → .../test/groovy/server/PlayServerTest.groovy b/.../test/groovy/server/PlayServerTest.groovy → .../test/groovy/server/PlayServerTest.groovy
diff --git a/instrumentation/play/play-2.6/.gitignore → ...ion/play/play-mvc/play-mvc-2.6/.gitignore b/instrumentation/play/play-2.6/.gitignore → ...ion/play/play-mvc/play-mvc-2.6/.gitignore
diff --git a/.../play/play-2.6/javaagent/build.gradle.kts → ...c/play-mvc-2.6/javaagent/build.gradle.kts b/.../play/play-2.6/javaagent/build.gradle.kts → ...c/play-mvc-2.6/javaagent/build.gradle.kts
diff --git a/...tion/play/v2_6/ActionInstrumentation.java → ...tion/play/v2_6/ActionInstrumentation.java b/...tion/play/v2_6/ActionInstrumentation.java → ...tion/play/v2_6/ActionInstrumentation.java
diff --git a/...mentation/play/v2_6/Play26Singletons.java → ...mentation/play/v2_6/Play26Singletons.java b/...mentation/play/v2_6/Play26Singletons.java → ...mentation/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;

diff --git a/.../play/v2_6/PlayInstrumentationModule.java → .../play/v2_6/PlayInstrumentationModule.java b/.../play/v2_6/PlayInstrumentationModule.java → .../play/v2_6/PlayInstrumentationModule.java
@@ -16,7 +16,7 @@
 public class PlayInstrumentationModule extends InstrumentationModule {
 
   public PlayInstrumentationModule() {
-    super("play", "play-2.6");
+    super("play", "play-mvc-2.6");
   }
 
   @Override

diff --git a/...tion/play/v2_6/ResponseFutureWrapper.java → ...tion/play/v2_6/ResponseFutureWrapper.java b/...tion/play/v2_6/ResponseFutureWrapper.java → ...tion/play/v2_6/ResponseFutureWrapper.java
diff --git a/.../groovy/server/PlayAsyncServerTest.groovy → .../groovy/server/PlayAsyncServerTest.groovy b/.../groovy/server/PlayAsyncServerTest.groovy → .../groovy/server/PlayAsyncServerTest.groovy
diff --git a/.../test/groovy/server/PlayServerTest.groovy → .../test/groovy/server/PlayServerTest.groovy b/.../test/groovy/server/PlayServerTest.groovy → .../test/groovy/server/PlayServerTest.groovy
diff --git a/...ws/play-ws-1.0/javaagent/build.gradle.kts → ...ws/play-ws-1.0/javaagent/build.gradle.kts b/...ws/play-ws-1.0/javaagent/build.gradle.kts → ...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"))

diff --git a/...tion/playws/v1_0/AsyncHandlerWrapper.java → ...tion/playws/v1_0/AsyncHandlerWrapper.java b/...tion/playws/v1_0/AsyncHandlerWrapper.java → ...tion/playws/v1_0/AsyncHandlerWrapper.java
diff --git a/...ation/playws/v1_0/PlayWs10Singletons.java → ...ation/playws/v1_0/PlayWs10Singletons.java b/...ation/playws/v1_0/PlayWs10Singletons.java → ...ation/playws/v1_0/PlayWs10Singletons.java
diff --git a/...yws/v1_0/PlayWsInstrumentationModule.java → ...yws/v1_0/PlayWsInstrumentationModule.java b/...yws/v1_0/PlayWsInstrumentationModule.java → ...yws/v1_0/PlayWsInstrumentationModule.java
diff --git a/...yws/v1_0/StreamedAsyncHandlerWrapper.java → ...yws/v1_0/StreamedAsyncHandlerWrapper.java b/...yws/v1_0/StreamedAsyncHandlerWrapper.java → ...yws/v1_0/StreamedAsyncHandlerWrapper.java
diff --git a/...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy b/...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy
diff --git a/...ws/play-ws-2.0/javaagent/build.gradle.kts → ...ws/play-ws-2.0/javaagent/build.gradle.kts b/...ws/play-ws-2.0/javaagent/build.gradle.kts → ...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"))

diff --git a/...tion/playws/v2_0/AsyncHandlerWrapper.java → ...tion/playws/v2_0/AsyncHandlerWrapper.java b/...tion/playws/v2_0/AsyncHandlerWrapper.java → ...tion/playws/v2_0/AsyncHandlerWrapper.java
diff --git a/...ation/playws/v2_0/PlayWs20Singletons.java → ...ation/playws/v2_0/PlayWs20Singletons.java b/...ation/playws/v2_0/PlayWs20Singletons.java → ...ation/playws/v2_0/PlayWs20Singletons.java
diff --git a/...yws/v2_0/PlayWsInstrumentationModule.java → ...yws/v2_0/PlayWsInstrumentationModule.java b/...yws/v2_0/PlayWsInstrumentationModule.java → ...yws/v2_0/PlayWsInstrumentationModule.java
diff --git a/...yws/v2_0/StreamedAsyncHandlerWrapper.java → ...yws/v2_0/StreamedAsyncHandlerWrapper.java b/...yws/v2_0/StreamedAsyncHandlerWrapper.java → ...yws/v2_0/StreamedAsyncHandlerWrapper.java
diff --git a/...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy b/...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy
diff --git a/...ws/play-ws-2.1/javaagent/build.gradle.kts → ...ws/play-ws-2.1/javaagent/build.gradle.kts b/...ws/play-ws-2.1/javaagent/build.gradle.kts → ...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"))

diff --git a/...tion/playws/v2_1/AsyncHandlerWrapper.java → ...tion/playws/v2_1/AsyncHandlerWrapper.java b/...tion/playws/v2_1/AsyncHandlerWrapper.java → ...tion/playws/v2_1/AsyncHandlerWrapper.java
diff --git a/...ation/playws/v2_1/PlayWs21Singletons.java → ...ation/playws/v2_1/PlayWs21Singletons.java b/...ation/playws/v2_1/PlayWs21Singletons.java → ...ation/playws/v2_1/PlayWs21Singletons.java
diff --git a/...yws/v2_1/PlayWsInstrumentationModule.java → ...yws/v2_1/PlayWsInstrumentationModule.java b/...yws/v2_1/PlayWsInstrumentationModule.java → ...yws/v2_1/PlayWsInstrumentationModule.java
diff --git a/...yws/v2_1/StreamedAsyncHandlerWrapper.java → ...yws/v2_1/StreamedAsyncHandlerWrapper.java b/...yws/v2_1/StreamedAsyncHandlerWrapper.java → ...yws/v2_1/StreamedAsyncHandlerWrapper.java
diff --git a/...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy b/...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy
diff --git a/...play-ws-common/javaagent/build.gradle.kts → ...play-ws-common/javaagent/build.gradle.kts b/...play-ws-common/javaagent/build.gradle.kts → ...play-ws-common/javaagent/build.gradle.kts
diff --git a/...yws/AbstractBootstrapInstrumentation.java → ...yws/AbstractBootstrapInstrumentation.java b/...yws/AbstractBootstrapInstrumentation.java → ...yws/AbstractBootstrapInstrumentation.java
diff --git a/...layws/AsyncHttpClientInstrumentation.java → ...layws/AsyncHttpClientInstrumentation.java b/...layws/AsyncHttpClientInstrumentation.java → ...layws/AsyncHttpClientInstrumentation.java
diff --git a/...ayws/HandlerPublisherInstrumentation.java → ...ayws/HandlerPublisherInstrumentation.java b/...ayws/HandlerPublisherInstrumentation.java → ...ayws/HandlerPublisherInstrumentation.java
diff --git a/...trumentation/playws/HttpHeaderSetter.java → ...trumentation/playws/HttpHeaderSetter.java b/...trumentation/playws/HttpHeaderSetter.java → ...trumentation/playws/HttpHeaderSetter.java
diff --git a/...yws/PlayWsClientHttpAttributesGetter.java → ...yws/PlayWsClientHttpAttributesGetter.java b/...yws/PlayWsClientHttpAttributesGetter.java → ...yws/PlayWsClientHttpAttributesGetter.java
diff --git a/...ayws/PlayWsClientInstrumenterFactory.java → ...ayws/PlayWsClientInstrumenterFactory.java b/...ayws/PlayWsClientInstrumenterFactory.java → ...ayws/PlayWsClientInstrumenterFactory.java
diff --git a/...ayws/PlayWsClientNetAttributesGetter.java → ...ayws/PlayWsClientNetAttributesGetter.java b/...ayws/PlayWsClientNetAttributesGetter.java → ...ayws/PlayWsClientNetAttributesGetter.java
diff --git a/...rumentation/playws/SubscriberWrapper.java → ...rumentation/playws/SubscriberWrapper.java b/...rumentation/playws/SubscriberWrapper.java → ...rumentation/playws/SubscriberWrapper.java
diff --git a/...s/play-ws-common/testing/build.gradle.kts → ...s/play-ws-common/testing/build.gradle.kts b/...s/play-ws-common/testing/build.gradle.kts → ...s/play-ws-common/testing/build.gradle.kts
diff --git a/...c/main/groovy/PlayWsClientTestBase.groovy → ...c/main/groovy/PlayWsClientTestBase.groovy b/...c/main/groovy/PlayWsClientTestBase.groovy → ...c/main/groovy/PlayWsClientTestBase.groovy
diff --git a/...in/groovy/PlayWsClientTestBaseBase.groovy → ...in/groovy/PlayWsClientTestBaseBase.groovy b/...in/groovy/PlayWsClientTestBaseBase.groovy → ...in/groovy/PlayWsClientTestBaseBase.groovy
diff --git a/settings.gradle.kts b/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")