Skip to content

Commit 66d8189

Browse files
committed
fix: Servlet 3.x leaking to jetty 9.0.4 instrumentation tests (simplified)
1 parent 6aef1f4 commit 66d8189

File tree

1 file changed

+6
-13
lines changed
  • dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4

1 file changed

+6
-13
lines changed

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ apply from: "$rootDir/gradle/java.gradle"
1212
addTestSuiteForDir("latestDepTest", "test")
1313
addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
1414

15-
// Exclude servlet 3.x API from test runtime to ensure servlet 2.x instrumentation applies.
16-
// Only exclude from testRuntimeClasspath (not testImplementation) to avoid propagating to latestDep* configs
17-
// which need servlet 3.1 API for Jetty 9.2.x.
15+
// Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies.
16+
// Using testRuntimeClasspath instead of testImplementation because exclusions on testImplementation
17+
// propagate to latestDep* configurations, which need servlet 3.1 API for Jetty 9.2.x.
1818
configurations.testRuntimeClasspath {
1919
exclude group: 'javax.servlet', module: 'javax.servlet-api'
2020
}
@@ -29,16 +29,9 @@ dependencies {
2929
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.0.4.v20130625'
3030
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.0.4.v20130625'
3131
testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.0.4.v20130625'
32-
// Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies
33-
testImplementation(project(':dd-java-agent:appsec:appsec-test-fixtures')) {
34-
exclude group: 'javax.servlet', module: 'javax.servlet-api'
35-
}
36-
testImplementation(testFixtures(project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0"))) {
37-
exclude group: 'javax.servlet', module: 'javax.servlet-api'
38-
}
39-
testImplementation(testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))) {
40-
exclude group: 'javax.servlet', module: 'javax.servlet-api'
41-
}
32+
testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
33+
testImplementation testFixtures(project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0"))
34+
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
4235

4336
// Include all jetty-server instrumentation modules for testing. Only the version-compatible module will apply at runtime.
4437
testRuntimeOnly project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0")

0 commit comments

Comments
 (0)