Convert tomcat 10 tests from groovy to java (#11420)

open-telemetry · May 24, 2024 · 98d0c3d · 98d0c3d
1 parent c9cbd8a
commit 98d0c3d
Show file tree

Hide file tree

Showing 9 changed files with 376 additions and 355 deletions.
diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts
@@ -31,3 +31,11 @@ tasks {
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 }
+
+// Tomcat 10 uses deprecation annotation methods `forRemoval()` and `since()`
+// in jakarta.servlet.http.HttpServlet that don't work with Java 8
+if (findProperty("testLatestDeps") as Boolean) {
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_11)
+  }
+}
diff --git a/...c/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.groovy b/...c/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/AsyncServlet.groovy
diff --git a/...est/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.groovy b/...est/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.groovy
diff --git a/...t/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.groovy b/...t/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.groovy