Skip to content

Commit 98d0c3d

Browse files
authored
Convert tomcat 10 tests from groovy to java (#11420)
1 parent c9cbd8a commit 98d0c3d

File tree

9 files changed

+376
-355
lines changed

9 files changed

+376
-355
lines changed

instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts

+8
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,11 @@ tasks {
3131
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
3232
}
3333
}
34+
35+
// Tomcat 10 uses deprecation annotation methods `forRemoval()` and `since()`
36+
// in jakarta.servlet.http.HttpServlet that don't work with Java 8
37+
if (findProperty("testLatestDeps") as Boolean) {
38+
otelJava {
39+
minJavaVersionSupported.set(JavaVersion.VERSION_11)
40+
}
41+
}

instrumentation/tomcat/tomcat-10.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.groovy

-83
This file was deleted.

instrumentation/tomcat/tomcat-10.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.groovy

-143
This file was deleted.

instrumentation/tomcat/tomcat-10.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.groovy

-128
This file was deleted.

0 commit comments

Comments
 (0)