Skip to content

Commit bc3dea7

Browse files
committed
chore: Remove useless play 25 directive, proper project naming, drop empty play-2.5
1 parent dc4ef08 commit bc3dea7

File tree

48 files changed

+3
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3
-98
lines changed

dd-java-agent/instrumentation/play/play-2.4/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@ muzzle {
22
extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
33

44
pass {
5-
name = "play24and25"
65
group = 'com.typesafe.play'
76
module = 'play_2.11'
87
versions = '[2.4.0,2.6)'
98
assertInverse = true
109
}
1110
fail {
12-
name = "play24and25"
1311
group = 'com.typesafe.play'
1412
module = 'play_2.12'
1513
versions = '[,]'
1614
}
1715
fail {
18-
name = "play24and25"
1916
group = 'com.typesafe.play'
2017
module = 'play_2.13'
2118
versions = '[,]'

dd-java-agent/instrumentation/play/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayInstrumentation.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ public PlayInstrumentation() {
1919
super("play");
2020
}
2121

22-
@Override
23-
public String muzzleDirective() {
24-
return "play24and25";
25-
}
26-
2722
@Override
2823
public String hierarchyMarkerType() {
2924
return "play.api.mvc.Action";

dd-java-agent/instrumentation/play/play-2.5/build.gradle

Lines changed: 0 additions & 30 deletions
This file was deleted.

dd-java-agent/instrumentation/play/play-2.5-appsec/.gitignore renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/.gitignore

File renamed without changes.

dd-java-agent/instrumentation/play/play-2.5-appsec/build.gradle renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ muzzle {
22
extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
33

44
pass {
5-
name = "play25only"
65
group = 'com.typesafe.play'
76
module = 'play_2.11'
87
versions = '[2.5.0,2.6)'
@@ -34,7 +33,7 @@ tasks.withType(ScalaCompile).configureEach {
3433
addTestSuiteForDir('latestDepTest', 'test')
3534

3635
dependencies {
37-
implementation project(':dd-java-agent:instrumentation:play:play-2.5')
36+
implementation project(':dd-java-agent:instrumentation:play:play-2.4')
3837

3938
compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.5.0'
4039

@@ -47,7 +46,7 @@ dependencies {
4746
testRuntimeOnly project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
4847

4948
// All play modules for testing
50-
testImplementation project(':dd-java-agent:instrumentation:play:play-2.4')
49+
testRuntimeOnly project(':dd-java-agent:instrumentation:play:play-2.4')
5150

5251
testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
5352
testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'

dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ArgumentCaptureWrappers.java

File renamed without changes.

dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserDelegatingBodyParserApplyAdvice.java

File renamed without changes.

dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserFormUrlEncodedParseAdvice.java

File renamed without changes.

dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java

File renamed without changes.

dd-java-agent/instrumentation/play/play-2.5-appsec/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java renamed to dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/BodyParserTolerantJsonParseAdvice.java

File renamed without changes.

0 commit comments

Comments
 (0)