Group play and play-ws modules

dd-java-agent/instrumentation/play-ws-1/build.gradle → dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle

@@ -27,8 +27,8 @@ def scalaVersion = '2.12'
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
 
-  implementation project(':dd-java-agent:instrumentation:play-ws')
-  testImplementation project(path: ':dd-java-agent:instrumentation:play-ws', configuration: 'testArtifacts')
+  implementation project(':dd-java-agent:instrumentation:play-ws:play-ws-common')
+  testImplementation project(path: ':dd-java-agent:instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
 
   // These are to ensure cross compatibility
   testImplementation project(':dd-java-agent:instrumentation:netty-4.0')

dd-java-agent/instrumentation/play-ws-2/build.gradle → dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle

@@ -32,8 +32,8 @@ def scalaVersion = '2.12'
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
 
-  implementation project(':dd-java-agent:instrumentation:play-ws')
-  testImplementation project(path: ':dd-java-agent:instrumentation:play-ws', configuration: 'testArtifacts')
+  implementation project(':dd-java-agent:instrumentation:play-ws:play-ws-common')
+  testImplementation project(path: ':dd-java-agent:instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
 
   // These are to ensure cross compatibility
   testImplementation project(':dd-java-agent:instrumentation:netty-4.0')

dd-java-agent/instrumentation/play-ws-2.1/build.gradle → dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle

@@ -33,8 +33,8 @@ def scalaVersion = '2.12'
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
 
-  implementation project(':dd-java-agent:instrumentation:play-ws')
-  testImplementation project(path: ':dd-java-agent:instrumentation:play-ws', configuration: 'testArtifacts')
+  implementation project(':dd-java-agent:instrumentation:play-ws:play-ws-common')
+  testImplementation project(path: ':dd-java-agent:instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
 
   // These are to ensure cross compatibility
   testImplementation project(':dd-java-agent:instrumentation:netty-4.0')

docs/how_instrumentations_work.md

@@ -681,7 +681,7 @@ When writing an instrumentation it is much faster to test just the instrumentati
 for example:
 
 ```shell
-./gradlew :dd-java-agent:instrumentation:play-ws-2.1:test
+./gradlew :dd-java-agent:instrumentation:play-ws:play-ws-2.1:test
 ```
 
 Sometimes it is necessary to force Gradle to discard cached test results
@@ -715,7 +715,7 @@ latestDepTestCompile(group: 'com.typesafe.play', name: 'play-test_2.11', version
 Dependency tests can be run like:
 
 ```shell
-./gradlew :dd-java-agent:instrumentation:play-ws-2.1:latestDepTest
+./gradlew :dd-java-agent:instrumentation:play-ws:play-ws-2.1:latestDepTest
 ```
 
 ### Additional Test Suites

settings.gradle.kts

@@ -488,13 +488,13 @@ include(
   ":dd-java-agent:instrumentation:owasp-esapi-2",
   ":dd-java-agent:instrumentation:pekko-concurrent",
   ":dd-java-agent:instrumentation:pekko-http-1.0",
-  ":dd-java-agent:instrumentation:play-2.3",
-  ":dd-java-agent:instrumentation:play-2.4",
-  ":dd-java-agent:instrumentation:play-2.6",
-  ":dd-java-agent:instrumentation:play-ws",
-  ":dd-java-agent:instrumentation:play-ws-1",
-  ":dd-java-agent:instrumentation:play-ws-2",
-  ":dd-java-agent:instrumentation:play-ws-2.1",
+  ":dd-java-agent:instrumentation:play:play-2.3",
+  ":dd-java-agent:instrumentation:play:play-2.4",
+  ":dd-java-agent:instrumentation:play:play-2.6",
+  ":dd-java-agent:instrumentation:play-ws:play-ws-common",
+  ":dd-java-agent:instrumentation:play-ws:play-ws-1.0",
+  ":dd-java-agent:instrumentation:play-ws:play-ws-2.0",
+  ":dd-java-agent:instrumentation:play-ws:play-ws-2.1",
   ":dd-java-agent:instrumentation:protobuf",
   ":dd-java-agent:instrumentation:quartz-2",
   ":dd-java-agent:instrumentation:rabbitmq-amqp-2.7",