Skip to content

Commit 3cc7e09

Browse files
committed
convert servlet 5 tests to java
1 parent 00317ab commit 3cc7e09

33 files changed

+22
-2
lines changed
Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
plugins {
2-
id("otel.java-conventions")
2+
id("otel.javaagent-testing")
33
}
44

55
dependencies {
6-
api(project(":testing-common"))
6+
api(project(":instrumentation:servlet:servlet-common:javaagent"))
77
api(project(":instrumentation:servlet:servlet-common:bootstrap"))
88

99
compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
10+
11+
testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
12+
13+
testImplementation(project(":instrumentation:servlet:servlet-5.0:testing"))
14+
15+
testLibrary("org.eclipse.jetty:jetty-server:11.0.0")
16+
testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
17+
testLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.0")
18+
testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:10.0.0")
19+
20+
// Tomcat 10.1 requires Java 11
21+
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.+")
22+
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:10.0.+")
23+
latestDepTestLibrary("org.eclipse.jetty:jetty-server:11.+")
24+
}
25+
26+
tasks {
27+
withType<Test>().configureEach {
28+
jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
29+
}
1030
}

0 commit comments

Comments
 (0)