From dddbcc961a470000cc79b745597fe98fe77e7f51 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Wed, 31 Dec 2025 12:15:37 +0100 Subject: [PATCH 1/3] chore: Split play-2.4 into play-2.4, play-2.5, and play-2.5-appsec modules - play-2.4: Base module with Play 2.4 core instrumentation only - play-2.5: Intermediate module for Play 2.5 (depends on play-2.4) - play-2.5-appsec: AppSec instrumentation for Play 2.5+ (depends on play-2.5) Co-Authored-By: Claude Sonnet 4.5 --- .../play/play-2.4/build.gradle | 156 --------------- .../play/play-2.5-appsec/.gitignore | 1 + .../play/play-2.5-appsec/build.gradle | 184 ++++++++++++++++++ .../DelegatingBodyParserInstrumentation.java | 0 .../appsec/FormUrlEncodedInstrumentation.java | 0 .../HttpErrorHandlerInstrumentation.java | 0 .../play25/appsec/MuzzleReferences.java | 0 .../appsec/PathPatternInstrumentation.java | 0 .../PlayBodyParsersInstrumentation.java | 0 .../appsec/ResultsStatusInstrumentation.java | 0 .../appsec/RoutingDslInstrumentation.java | 0 .../SirdPathExtractorInstrumentation.java | 0 .../appsec/StatusHeaderInstrumentation.java | 0 .../appsec/TolerantJsonInstrumentation.java | 0 .../appsec/TolerantTextInstrumentation.java | 0 .../appsec/ArgumentCaptureWrappers.java | 0 ...ParserDelegatingBodyParserApplyAdvice.java | 0 .../BodyParserFormUrlEncodedParseAdvice.java | 0 .../play25/appsec/BodyParserHelpers.java | 0 .../BodyParserTolerantJsonParseAdvice.java | 0 .../BodyParserTolerantTextParseAdvice.java | 0 .../JavaMultipartFormDataRegisterExcF.java | 0 .../play25/appsec/PathExtractionHelpers.java | 0 .../play25/appsec/PathPatternApplyAdvice.java | 0 ...layBodyParsersMultipartFormDataAdvice.java | 0 ...dyParsersTolerantFormUrlEncodedAdvice.java | 0 .../PlayBodyParsersTolerantJsonAdvice.java | 0 .../PlayBodyParsersTolerantTextAdvice.java | 0 .../appsec/ResultsStatusApplyAdvice.java | 0 .../RoutingDslRouteConstructorAdvice.java | 0 .../SirdPathExtractorExtractAdvice.java | 0 .../appsec/StatusHeaderSendJsonAdvice.java | 0 .../scala/generator/CompileRoutes.scala | 0 .../play25/client/PlayWSClientTest.groovy | 0 .../play25/server/PlayAsyncServerTest.groovy | 0 .../play25/server/PlayHttpServer.groovy | 0 .../play25/server/PlayRouters.groovy | 0 .../server/PlayScalaAsyncServerTest.groovy | 0 .../server/PlayScalaRoutesServerTest.groovy | 0 .../play25/server/PlayServerTest.groovy | 0 .../play25/server/TestHttpErrorHandler.groovy | 0 .../src/test/routes/conf/routes | 0 .../play25/PlayController.scala | 0 .../play25/PlayRoutersScala.scala | 0 .../trace/instrumentation/play25/Util.scala | 0 .../play/play-2.5/build.gradle | 30 +++ settings.gradle.kts | 2 + 47 files changed, 217 insertions(+), 156 deletions(-) create mode 100644 dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore create mode 100644 dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/routeGenerator/scala/generator/CompileRoutes.scala (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/routes/conf/routes (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala (100%) rename dd-java-agent/instrumentation/play/{play-2.4 => play-2.5-appsec}/src/test/scala/datadog/trace/instrumentation/play25/Util.scala (100%) create mode 100644 dd-java-agent/instrumentation/play/play-2.5/build.gradle diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle index b67968733ed..e3feedbb3f4 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle @@ -8,13 +8,6 @@ muzzle { versions = '[2.4.0,2.6)' assertInverse = true } - pass { - name = "play25only" - group = 'com.typesafe.play' - module = 'play_2.11' - versions = '[2.5.0,2.6)' - assertInverse = true - } fail { name = "play24and25" group = 'com.typesafe.play' @@ -30,7 +23,6 @@ muzzle { } apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' testJvmConstraints { // Play doesn't work with Java 9+ until 2.6.12 @@ -46,154 +38,6 @@ repositories { } } -tasks.withType(ScalaCompile).configureEach { - configureCompiler(it, 8) -} - -addTestSuiteForDir('latestDepTest', 'test') - -sourceSets { - main_play25 { - java.srcDirs "${project.projectDir}/src/main/java_play25" - } -} - -tasks.named("jar", Jar) { - from sourceSets.main_play25.output -} - -project.afterEvaluate { - tasks.named('instrumentJava') { dependsOn 'compileMain_play25Java' } - tasks.named('forbiddenApisMain_play25') { dependsOn 'instrumentMain_play25Java' } -} - -instrument { - additionalClasspath = [ - instrumentJava: compileMain_play25Java.destinationDirectory - ] -} - dependencies { compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0' - main_play25CompileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' - main_play25CompileOnly project(':internal-api') - main_play25CompileOnly project(':dd-java-agent:agent-tooling') - main_play25CompileOnly project(':dd-java-agent:agent-bootstrap') - - testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1') - testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') - testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') - testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8') - testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10') - testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13') - - // Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5 - testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0' - testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0' - testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') { - exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' - } - testRuntimeOnly sourceSets.main_play25.output - - latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+' - latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+' - latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') { - exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' - } -} - -tasks.named("compileTestGroovy", GroovyCompile) { - classpath = classpath + files(tasks.named('compileTestScala').map { it.destinationDirectory }) -} - -tasks.named("compileLatestDepTestGroovy", GroovyCompile) { - classpath = classpath + files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }) -} - -sourceSets { - routeGenerator { - scala { - srcDir "${project.projectDir}/src/routeGenerator/scala" - } - } - testGenerated { - scala { - srcDir layout.buildDirectory.dir('generated/sources/testRoutes/scala') - } - } - latestDepTestGenerated { - scala { - srcDir layout.buildDirectory.dir('generated/sources/latestDepTestRoutes/scala') - } - } -} - -dependencies { - routeGeneratorImplementation libs.scala211 - routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0' -} - -configurations { - testGeneratedCompileClasspath.extendsFrom testCompileClasspath - latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath -} - -['buildTestRoutes', 'buildLatestDepTestRoutes'].each { taskName -> - tasks.register(taskName, JavaExec) { - String routesFile = "${project.projectDir}/src/test/routes/conf/routes" - def subdir = taskName == 'buildTestRoutes' ? 'testRoutes' : 'latestDepTestRoutes' - def outputDir = - layout.buildDirectory.dir("generated/sources/$subdir/scala") - - it.inputs.file routesFile - it.outputs.dir outputDir - - it.mainClass.set 'generator.CompileRoutes' - it.args routesFile, outputDir.get().asFile.absolutePath - - it.classpath configurations.named('routeGeneratorRuntimeClasspath') - it.classpath tasks.named('compileRouteGeneratorScala').map { it.destinationDirectory } - - if (taskName == 'buildTestRoutes') { - it.classpath tasks.named('compileTestScala').map { it.destinationDirectory } - } else { - it.classpath tasks.named('compileLatestDepTestScala').map { it.destinationDirectory } - } - } -} - -tasks.named("compileTestGeneratedScala", ScalaCompile) { - classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory }) - dependsOn 'buildTestRoutes', 'compileLatestDepTestScala' -} - -tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) { - classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }) - dependsOn 'buildLatestDepTestRoutes' -} - -tasks.named("compileTestGroovy", GroovyCompile) { - classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory }) -} - -tasks.named("compileLatestDepTestGroovy", GroovyCompile) { - classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory }) -} -// do it this way rather than through dependencies {} because -// latestDepTestImplementation extends testImplementation -tasks.named("test", Test) { - classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory }) -} - -tasks.named("latestDepTest", Test) { - classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory }) -} - -tasks.named("forbiddenApisTestGenerated") { - enabled = false -} - -tasks.named("forbiddenApisLatestDepTestGenerated") { - enabled = false } diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore b/dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore new file mode 100644 index 00000000000..5292519a25e --- /dev/null +++ b/dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore @@ -0,0 +1 @@ +logs/ \ No newline at end of file diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle b/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle new file mode 100644 index 00000000000..9ca39328180 --- /dev/null +++ b/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle @@ -0,0 +1,184 @@ +muzzle { + extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") + + pass { + name = "play25only" + group = 'com.typesafe.play' + module = 'play_2.11' + versions = '[2.5.0,2.6)' + assertInverse = true + } +} + +apply from: "$rootDir/gradle/java.gradle" +apply plugin: 'scala' + +testJvmConstraints { + // Play doesn't work with Java 9+ until 2.6.12 + maxJavaVersion = JavaVersion.VERSION_1_8 +} + +repositories { + maven { + // for muzzle because of play-2.3 + // only place that has 'com.typesafe.netty:netty-http-pipelining:1.1.2' publicly accessible + name = 'typesafe' + url = 'https://repo.typesafe.com/typesafe/maven-releases/' + } +} + +tasks.withType(ScalaCompile).configureEach { + configureCompiler(it, 8) +} + +addTestSuiteForDir('latestDepTest', 'test') + +sourceSets { + main_play25 { + java.srcDirs "${project.projectDir}/src/main/java_play25" + } +} + +tasks.named("jar", Jar) { + from sourceSets.main_play25.output +} + +project.afterEvaluate { + tasks.named('instrumentJava') { dependsOn 'compileMain_play25Java' } + tasks.named('forbiddenApisMain_play25') { dependsOn 'instrumentMain_play25Java' } +} + +instrument { + additionalClasspath = [ + instrumentJava: compileMain_play25Java.destinationDirectory + ] +} + +dependencies { + implementation project(':dd-java-agent:instrumentation:play:play-2.5') + + compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' + main_play25CompileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' + main_play25CompileOnly project(':internal-api') + main_play25CompileOnly project(':dd-java-agent:agent-tooling') + main_play25CompileOnly project(':dd-java-agent:agent-bootstrap') + + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1') + testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') + testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10') + testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13') + + // All play modules for testing + testImplementation project(':dd-java-agent:instrumentation:play:play-2.4') + + testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0' + testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0' + testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') { + exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' + } + testRuntimeOnly sourceSets.main_play25.output + + latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+' + latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+' + latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') { + exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' + } +} + +tasks.named("compileTestGroovy", GroovyCompile) { + classpath = classpath + files(tasks.named('compileTestScala').map { it.destinationDirectory }) +} + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { + classpath = classpath + files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }) +} + +sourceSets { + routeGenerator { + scala { + srcDir "${project.projectDir}/src/routeGenerator/scala" + } + } + testGenerated { + scala { + srcDir layout.buildDirectory.dir('generated/sources/testRoutes/scala') + } + } + latestDepTestGenerated { + scala { + srcDir layout.buildDirectory.dir('generated/sources/latestDepTestRoutes/scala') + } + } +} + +dependencies { + routeGeneratorImplementation libs.scala211 + routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0' +} + +configurations { + testGeneratedCompileClasspath.extendsFrom testCompileClasspath + latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath +} + +['buildTestRoutes', 'buildLatestDepTestRoutes'].each { taskName -> + tasks.register(taskName, JavaExec) { + String routesFile = "${project.projectDir}/src/test/routes/conf/routes" + def subdir = taskName == 'buildTestRoutes' ? 'testRoutes' : 'latestDepTestRoutes' + def outputDir = + layout.buildDirectory.dir("generated/sources/$subdir/scala") + + it.inputs.file routesFile + it.outputs.dir outputDir + + it.mainClass.set 'generator.CompileRoutes' + it.args routesFile, outputDir.get().asFile.absolutePath + + it.classpath configurations.named('routeGeneratorRuntimeClasspath') + it.classpath tasks.named('compileRouteGeneratorScala').map { it.destinationDirectory } + + if (taskName == 'buildTestRoutes') { + it.classpath tasks.named('compileTestScala').map { it.destinationDirectory } + } else { + it.classpath tasks.named('compileLatestDepTestScala').map { it.destinationDirectory } + } + } +} + +tasks.named("compileTestGeneratedScala", ScalaCompile) { + classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory }) + dependsOn 'buildTestRoutes', 'compileLatestDepTestScala' +} + +tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) { + classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }) + dependsOn 'buildLatestDepTestRoutes' +} + +tasks.named("compileTestGroovy", GroovyCompile) { + classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory }) +} + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { + classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory }) +} +// do it this way rather than through dependencies {} because +// latestDepTestImplementation extends testImplementation +tasks.named("test", Test) { + classpath += files(tasks.named('compileTestGeneratedScala').map { it.destinationDirectory }) +} + +tasks.named("latestDepTest", Test) { + classpath += files(tasks.named('compileLatestDepTestGeneratedScala').map { it.destinationDirectory }) +} + +tasks.named("forbiddenApisTestGenerated") { + enabled = false +} + +tasks.named("forbiddenApisLatestDepTestGenerated") { + enabled = false +} diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/routeGenerator/scala/generator/CompileRoutes.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/routeGenerator/scala/generator/CompileRoutes.scala rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/routeGenerator/scala/generator/CompileRoutes.scala diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/routes/conf/routes b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/routes/conf/routes similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/routes/conf/routes rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/routes/conf/routes diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/Util.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.4/src/test/scala/datadog/trace/instrumentation/play25/Util.scala rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/Util.scala diff --git a/dd-java-agent/instrumentation/play/play-2.5/build.gradle b/dd-java-agent/instrumentation/play/play-2.5/build.gradle new file mode 100644 index 00000000000..4ed9937011e --- /dev/null +++ b/dd-java-agent/instrumentation/play/play-2.5/build.gradle @@ -0,0 +1,30 @@ +muzzle { + extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") + + pass { + name = "play25" + group = 'com.typesafe.play' + module = 'play_2.11' + versions = '[2.5.0,2.6)' + assertInverse = true + } +} + +apply from: "$rootDir/gradle/java.gradle" + +testJvmConstraints { + // Play doesn't work with Java 9+ until 2.6.12 + maxJavaVersion = JavaVersion.VERSION_1_8 +} + +repositories { + maven { + name = 'typesafe' + url = 'https://repo.typesafe.com/typesafe/maven-releases/' + } +} + +dependencies { + implementation project(':dd-java-agent:instrumentation:play:play-2.4') + compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ce925c46a0..ec98c2b13b9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -498,6 +498,8 @@ include( ":dd-java-agent:instrumentation:play-ws:play-ws-common", ":dd-java-agent:instrumentation:play:play-2.3", ":dd-java-agent:instrumentation:play:play-2.4", + ":dd-java-agent:instrumentation:play:play-2.5", + ":dd-java-agent:instrumentation:play:play-2.5-appsec", ":dd-java-agent:instrumentation:play:play-2.6", ":dd-java-agent:instrumentation:protobuf-3.0", ":dd-java-agent:instrumentation:quartz-2.0", From dc4ef08d449af5822387c453c3211d248b054d3f Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Wed, 31 Dec 2025 12:25:51 +0100 Subject: [PATCH 2/3] chore: Remove unnecessary `main_play25` source set There's no need for a separate source set now that play 2.5 is in extracted. Co-Authored-By: Claude Sonnet 4.5 --- .../play/play-2.5-appsec/build.gradle | 26 ------------------- .../appsec/ArgumentCaptureWrappers.java | 0 ...ParserDelegatingBodyParserApplyAdvice.java | 0 .../BodyParserFormUrlEncodedParseAdvice.java | 0 .../play25/appsec/BodyParserHelpers.java | 0 .../BodyParserTolerantJsonParseAdvice.java | 0 .../BodyParserTolerantTextParseAdvice.java | 0 .../JavaMultipartFormDataRegisterExcF.java | 0 .../play25/appsec/PathExtractionHelpers.java | 0 .../play25/appsec/PathPatternApplyAdvice.java | 0 ...layBodyParsersMultipartFormDataAdvice.java | 0 ...dyParsersTolerantFormUrlEncodedAdvice.java | 0 .../PlayBodyParsersTolerantJsonAdvice.java | 0 .../PlayBodyParsersTolerantTextAdvice.java | 0 .../appsec/ResultsStatusApplyAdvice.java | 0 .../RoutingDslRouteConstructorAdvice.java | 0 .../SirdPathExtractorExtractAdvice.java | 0 .../appsec/StatusHeaderSendJsonAdvice.java | 0 18 files changed, 26 deletions(-) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java (100%) rename dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/{java_play25 => java}/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java (100%) diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle b/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle index 9ca39328180..2d1d4681b85 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle @@ -33,35 +33,10 @@ tasks.withType(ScalaCompile).configureEach { addTestSuiteForDir('latestDepTest', 'test') -sourceSets { - main_play25 { - java.srcDirs "${project.projectDir}/src/main/java_play25" - } -} - -tasks.named("jar", Jar) { - from sourceSets.main_play25.output -} - -project.afterEvaluate { - tasks.named('instrumentJava') { dependsOn 'compileMain_play25Java' } - tasks.named('forbiddenApisMain_play25') { dependsOn 'instrumentMain_play25Java' } -} - -instrument { - additionalClasspath = [ - instrumentJava: compileMain_play25Java.destinationDirectory - ] -} - dependencies { implementation project(':dd-java-agent:instrumentation:play:play-2.5') compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' - main_play25CompileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' - main_play25CompileOnly project(':internal-api') - main_play25CompileOnly project(':dd-java-agent:agent-tooling') - main_play25CompileOnly project(':dd-java-agent:agent-bootstrap') testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0') testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1') @@ -79,7 +54,6 @@ dependencies { testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') { exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' } - testRuntimeOnly sourceSets.main_play25.output latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+' latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+' diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java b/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java rename to dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java From 7022fc2bf1dc39f2165349657967fc77a77f6ce6 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Wed, 31 Dec 2025 14:46:00 +0100 Subject: [PATCH 3/3] chore: Remove useless play 25 directive, proper project naming, drop empty play-2.5 --- .../play/play-2.4/build.gradle | 3 -- .../play24/PlayInstrumentation.java | 5 ---- .../play/play-2.5/build.gradle | 30 ------------------- .../.gitignore | 0 .../build.gradle | 3 -- .../appsec/ArgumentCaptureWrappers.java | 0 ...ParserDelegatingBodyParserApplyAdvice.java | 0 .../BodyParserFormUrlEncodedParseAdvice.java | 0 .../play25/appsec/BodyParserHelpers.java | 0 .../BodyParserTolerantJsonParseAdvice.java | 0 .../BodyParserTolerantTextParseAdvice.java | 0 .../DelegatingBodyParserInstrumentation.java | 5 ---- .../appsec/FormUrlEncodedInstrumentation.java | 5 ---- .../HttpErrorHandlerInstrumentation.java | 5 ---- .../JavaMultipartFormDataRegisterExcF.java | 0 .../play25/appsec/MuzzleReferences.java | 0 .../play25/appsec/PathExtractionHelpers.java | 0 .../play25/appsec/PathPatternApplyAdvice.java | 0 .../appsec/PathPatternInstrumentation.java | 5 ---- .../PlayBodyParsersInstrumentation.java | 5 ---- ...layBodyParsersMultipartFormDataAdvice.java | 0 ...dyParsersTolerantFormUrlEncodedAdvice.java | 0 .../PlayBodyParsersTolerantJsonAdvice.java | 0 .../PlayBodyParsersTolerantTextAdvice.java | 0 .../appsec/ResultsStatusApplyAdvice.java | 0 .../appsec/ResultsStatusInstrumentation.java | 5 ---- .../appsec/RoutingDslInstrumentation.java | 5 ---- .../RoutingDslRouteConstructorAdvice.java | 0 .../SirdPathExtractorExtractAdvice.java | 0 .../SirdPathExtractorInstrumentation.java | 5 ---- .../appsec/StatusHeaderInstrumentation.java | 5 ---- .../appsec/StatusHeaderSendJsonAdvice.java | 0 .../appsec/TolerantJsonInstrumentation.java | 5 ---- .../appsec/TolerantTextInstrumentation.java | 5 ---- .../scala/generator/CompileRoutes.scala | 0 .../play25/client/PlayWSClientTest.groovy | 0 .../play25/server/PlayAsyncServerTest.groovy | 0 .../play25/server/PlayHttpServer.groovy | 0 .../play25/server/PlayRouters.groovy | 0 .../server/PlayScalaAsyncServerTest.groovy | 0 .../server/PlayScalaRoutesServerTest.groovy | 0 .../play25/server/PlayServerTest.groovy | 0 .../play25/server/TestHttpErrorHandler.groovy | 0 .../src/test/routes/conf/routes | 0 .../play25/PlayController.scala | 0 .../play25/PlayRoutersScala.scala | 0 .../trace/instrumentation/play25/Util.scala | 0 settings.gradle.kts | 3 +- 48 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 dd-java-agent/instrumentation/play/play-2.5/build.gradle rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/.gitignore (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/build.gradle (98%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java (97%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java (97%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java (93%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java (93%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java (95%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/routeGenerator/scala/generator/CompileRoutes.scala (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/routes/conf/routes (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala (100%) rename dd-java-agent/instrumentation/play/{play-2.5-appsec => play-appsec-2.5}/src/test/scala/datadog/trace/instrumentation/play25/Util.scala (100%) diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle index e3feedbb3f4..7fef065ac1a 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle @@ -2,20 +2,17 @@ muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") pass { - name = "play24and25" group = 'com.typesafe.play' module = 'play_2.11' versions = '[2.4.0,2.6)' assertInverse = true } fail { - name = "play24and25" group = 'com.typesafe.play' module = 'play_2.12' versions = '[,]' } fail { - name = "play24and25" group = 'com.typesafe.play' module = 'play_2.13' versions = '[,]' diff --git a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java index 0a3515ed3bd..7b44d63a795 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java @@ -19,11 +19,6 @@ public PlayInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play24and25"; - } - @Override public String hierarchyMarkerType() { return "play.api.mvc.Action"; diff --git a/dd-java-agent/instrumentation/play/play-2.5/build.gradle b/dd-java-agent/instrumentation/play/play-2.5/build.gradle deleted file mode 100644 index 4ed9937011e..00000000000 --- a/dd-java-agent/instrumentation/play/play-2.5/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -muzzle { - extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") - - pass { - name = "play25" - group = 'com.typesafe.play' - module = 'play_2.11' - versions = '[2.5.0,2.6)' - assertInverse = true - } -} - -apply from: "$rootDir/gradle/java.gradle" - -testJvmConstraints { - // Play doesn't work with Java 9+ until 2.6.12 - maxJavaVersion = JavaVersion.VERSION_1_8 -} - -repositories { - maven { - name = 'typesafe' - url = 'https://repo.typesafe.com/typesafe/maven-releases/' - } -} - -dependencies { - implementation project(':dd-java-agent:instrumentation:play:play-2.4') - compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' -} diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore b/dd-java-agent/instrumentation/play/play-appsec-2.5/.gitignore similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore rename to dd-java-agent/instrumentation/play/play-appsec-2.5/.gitignore diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle b/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle similarity index 98% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle rename to dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle index 2d1d4681b85..6f10dfeebdd 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle @@ -2,7 +2,6 @@ muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") pass { - name = "play25only" group = 'com.typesafe.play' module = 'play_2.11' versions = '[2.5.0,2.6)' @@ -34,8 +33,6 @@ tasks.withType(ScalaCompile).configureEach { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:play:play-2.5') - compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0' testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0') diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantTextParseAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java index 850d38b12da..27ec208ced6 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java @@ -22,11 +22,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$DelegatingBodyParser"; } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java index cb4bd2b8e9c..a241d8adf13 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java @@ -18,11 +18,6 @@ public FormUrlEncodedInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java similarity index 97% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java index 64e9cbc216f..3cf041207fb 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/HttpErrorHandlerInstrumentation.java @@ -31,11 +31,6 @@ public HttpErrorHandlerInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/JavaMultipartFormDataRegisterExcF.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/MuzzleReferences.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java index 3392458cd70..ba78f5d5472 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PathPatternInstrumentation.java @@ -22,11 +22,6 @@ public PathPatternInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java similarity index 97% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java index 73789c747c5..9cb53468cbd 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java @@ -23,11 +23,6 @@ public PlayBodyParsersInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersMultipartFormDataAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantFormUrlEncodedAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantJsonAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersTolerantTextAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java similarity index 93% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java index a9dce06f944..b48aa3f18a1 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java @@ -15,11 +15,6 @@ public ResultsStatusInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java index 9d5b074e9c6..a548b58fb52 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslInstrumentation.java @@ -19,11 +19,6 @@ public RoutingDslInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/RoutingDslRouteConstructorAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorExtractAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java index 75a10e1c9e4..3be2f0295be 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/SirdPathExtractorInstrumentation.java @@ -21,11 +21,6 @@ public SirdPathExtractorInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java similarity index 93% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java index 31c71c3a1d0..c3362e119a9 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderInstrumentation.java @@ -16,11 +16,6 @@ public StatusHeaderInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java index 2b29fce0459..57009e0e7f4 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java @@ -22,11 +22,6 @@ public TolerantJsonInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java index d4589b28e67..dbc99ee28c1 100644 --- a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java @@ -17,11 +17,6 @@ public TolerantTextInstrumentation() { super("play"); } - @Override - public String muzzleDirective() { - return "play25only"; - } - @Override public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/routeGenerator/scala/generator/CompileRoutes.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/routeGenerator/scala/generator/CompileRoutes.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/routeGenerator/scala/generator/CompileRoutes.scala rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/routeGenerator/scala/generator/CompileRoutes.scala diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/client/PlayWSClientTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayAsyncServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayHttpServer.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayRouters.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaAsyncServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayScalaRoutesServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/PlayServerTest.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/groovy/datadog/trace/instrumentation/play25/server/TestHttpErrorHandler.groovy diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/routes/conf/routes b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/routes/conf/routes similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/routes/conf/routes rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/routes/conf/routes diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayController.scala diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/PlayRoutersScala.scala diff --git a/dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/Util.scala b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/Util.scala similarity index 100% rename from dd-java-agent/instrumentation/play/play-2.5-appsec/src/test/scala/datadog/trace/instrumentation/play25/Util.scala rename to dd-java-agent/instrumentation/play/play-appsec-2.5/src/test/scala/datadog/trace/instrumentation/play25/Util.scala diff --git a/settings.gradle.kts b/settings.gradle.kts index ec98c2b13b9..de8b539d9c0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -498,8 +498,7 @@ include( ":dd-java-agent:instrumentation:play-ws:play-ws-common", ":dd-java-agent:instrumentation:play:play-2.3", ":dd-java-agent:instrumentation:play:play-2.4", - ":dd-java-agent:instrumentation:play:play-2.5", - ":dd-java-agent:instrumentation:play:play-2.5-appsec", + ":dd-java-agent:instrumentation:play:play-appsec-2.5", ":dd-java-agent:instrumentation:play:play-2.6", ":dd-java-agent:instrumentation:protobuf-3.0", ":dd-java-agent:instrumentation:quartz-2.0",