Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Jun 2, 2022
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7f94e5
restructure play instrumentation dirs
breedx-splk May 27, 2022
2174e09
change instrumentation name from play -> play-mvc
breedx-splk May 27, 2022
db7b984
Revert "change instrumentation name from play -> play-mvc"
breedx-splk May 27, 2022
9bd1bc5
spring-mvc names
breedx-splk May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 instrumentation/play/play-2.4/.gitignore → ...ion/play/play-mvc/play-mvc-2.4/.gitignore
View file
Open in desktop
File renamed without changes.
0 .../play/play-2.4/javaagent/build.gradle.kts → ...c/play-mvc-2.4/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...tion/play/v2_4/ActionInstrumentation.java → ...tion/play/v2_4/ActionInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/play/v2_4/Play24Singletons.java → ...mentation/play/v2_4/Play24Singletons.java
View file
Open in desktop
File renamed without changes.
0 .../play/v2_4/PlayInstrumentationModule.java → .../play/v2_4/PlayInstrumentationModule.java
View file
Open in desktop
File renamed without changes.
0 ...on/play/v2_4/RequestCompleteCallback.java → ...on/play/v2_4/RequestCompleteCallback.java
View file
Open in desktop
File renamed without changes.
0 ...est/groovy/client/PlayWsClientTest.groovy → ...est/groovy/client/PlayWsClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../groovy/server/PlayAsyncServerTest.groovy → .../groovy/server/PlayAsyncServerTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/server/PlayServerTest.groovy → .../test/groovy/server/PlayServerTest.groovy
View file
Open in desktop
File renamed without changes.
0 instrumentation/play/play-2.6/.gitignore → ...ion/play/play-mvc/play-mvc-2.6/.gitignore
View file
Open in desktop
File renamed without changes.
0 .../play/play-2.6/javaagent/build.gradle.kts → ...c/play-mvc-2.6/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...tion/play/v2_6/ActionInstrumentation.java → ...tion/play/v2_6/ActionInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/play/v2_6/Play26Singletons.java → ...mentation/play/v2_6/Play26Singletons.java
View file
Open in desktop
File renamed without changes.
0 .../play/v2_6/PlayInstrumentationModule.java → .../play/v2_6/PlayInstrumentationModule.java
View file
Open in desktop
File renamed without changes.
0 ...tion/play/v2_6/ResponseFutureWrapper.java → ...tion/play/v2_6/ResponseFutureWrapper.java
View file
Open in desktop
File renamed without changes.
0 .../groovy/server/PlayAsyncServerTest.groovy → .../groovy/server/PlayAsyncServerTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/server/PlayServerTest.groovy → .../test/groovy/server/PlayServerTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ws/play-ws-1.0/javaagent/build.gradle.kts → ...ws/play-ws-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
0 ...tion/playws/v1_0/AsyncHandlerWrapper.java → ...tion/playws/v1_0/AsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...ation/playws/v1_0/PlayWs10Singletons.java → ...ation/playws/v1_0/PlayWs10Singletons.java
View file
Open in desktop
File renamed without changes.
0 ...yws/v1_0/PlayWsInstrumentationModule.java → ...yws/v1_0/PlayWsInstrumentationModule.java
View file
Open in desktop
File renamed without changes.
0 ...yws/v1_0/StreamedAsyncHandlerWrapper.java → ...yws/v1_0/StreamedAsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ws/play-ws-2.0/javaagent/build.gradle.kts → ...ws/play-ws-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
0 ...tion/playws/v2_0/AsyncHandlerWrapper.java → ...tion/playws/v2_0/AsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...ation/playws/v2_0/PlayWs20Singletons.java → ...ation/playws/v2_0/PlayWs20Singletons.java
View file
Open in desktop
File renamed without changes.
0 ...yws/v2_0/PlayWsInstrumentationModule.java → ...yws/v2_0/PlayWsInstrumentationModule.java
View file
Open in desktop
File renamed without changes.
0 ...yws/v2_0/StreamedAsyncHandlerWrapper.java → ...yws/v2_0/StreamedAsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ws/play-ws-2.1/javaagent/build.gradle.kts → ...ws/play-ws-2.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
0 ...tion/playws/v2_1/AsyncHandlerWrapper.java → ...tion/playws/v2_1/AsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...ation/playws/v2_1/PlayWs21Singletons.java → ...ation/playws/v2_1/PlayWs21Singletons.java
View file
Open in desktop
File renamed without changes.
0 ...yws/v2_1/PlayWsInstrumentationModule.java → ...yws/v2_1/PlayWsInstrumentationModule.java
View file
Open in desktop
File renamed without changes.
0 ...yws/v2_1/StreamedAsyncHandlerWrapper.java → ...yws/v2_1/StreamedAsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...t/src/test/groovy/PlayWsClientTest.groovy → ...t/src/test/groovy/PlayWsClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...play-ws-common/javaagent/build.gradle.kts → ...play-ws-common/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...yws/AbstractBootstrapInstrumentation.java → ...yws/AbstractBootstrapInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...layws/AsyncHttpClientInstrumentation.java → ...layws/AsyncHttpClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ayws/HandlerPublisherInstrumentation.java → ...ayws/HandlerPublisherInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...trumentation/playws/HttpHeaderSetter.java → ...trumentation/playws/HttpHeaderSetter.java
View file
Open in desktop
File renamed without changes.
0 ...yws/PlayWsClientHttpAttributesGetter.java → ...yws/PlayWsClientHttpAttributesGetter.java
View file
Open in desktop
File renamed without changes.
0 ...ayws/PlayWsClientInstrumenterFactory.java → ...ayws/PlayWsClientInstrumenterFactory.java
View file
Open in desktop
File renamed without changes.
0 ...ayws/PlayWsClientNetAttributesGetter.java → ...ayws/PlayWsClientNetAttributesGetter.java
View file
Open in desktop
File renamed without changes.
0 ...rumentation/playws/SubscriberWrapper.java → ...rumentation/playws/SubscriberWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...s/play-ws-common/testing/build.gradle.kts → ...s/play-ws-common/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...c/main/groovy/PlayWsClientTestBase.groovy → ...c/main/groovy/PlayWsClientTestBase.groovy
View file
Open in desktop
File renamed without changes.
0 ...in/groovy/PlayWsClientTestBaseBase.groovy → ...in/groovy/PlayWsClientTestBaseBase.groovy
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down