separate tests that need java 11 in latestDep

open-telemetry · Aug 23, 2024 · 25a4d89 · 25a4d89
1 parent 1d68048
commit 25a4d89
Show file tree

Hide file tree

Showing 35 changed files with 54 additions and 8 deletions.
diff --git a/instrumentation/servlet/servlet-3.0/javaagent-tests/build.gradle.kts b/instrumentation/servlet/servlet-3.0/javaagent-tests/build.gradle.kts
@@ -0,0 +1,53 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+muzzle {
+  pass {
+    group.set("javax.servlet")
+    module.set("javax.servlet-api")
+    versions.set("[3.0,)")
+    assertInverse.set(true)
+  }
+  fail {
+    group.set("javax.servlet")
+    module.set("servlet-api")
+    versions.set("(,)")
+  }
+}
+
+dependencies {
+  testImplementation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
+
+  compileOnly("javax.servlet:javax.servlet-api:3.0.1")
+
+  testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
+  testImplementation(project(":instrumentation:servlet:servlet-common:bootstrap"))
+
+  testLibrary("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
+  testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
+  testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")
+  testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
+
+  latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see servlet-5.0 module
+  latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see servlet-5.0 module
+
+  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:9.+") // see servlet-5.0 module
+  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:9.+") // see servlet-5.0 module
+}
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
+    // required on jdk17
+    jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
+    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  }
+}
+
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
+if (latestDepTest) {
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_11)
+  }
+}
diff --git a/...on/servlet/v3_0/AbstractServlet3Test.java → ...on/servlet/v3_0/AbstractServlet3Test.java b/...on/servlet/v3_0/AbstractServlet3Test.java → ...on/servlet/v3_0/AbstractServlet3Test.java
diff --git a/...servlet/v3_0/HttpServletResponseTest.java → ...servlet/v3_0/HttpServletResponseTest.java b/...servlet/v3_0/HttpServletResponseTest.java → ...servlet/v3_0/HttpServletResponseTest.java
diff --git a/...et/v3_0/jetty/JettyServlet3AsyncTest.java → ...et/v3_0/jetty/JettyServlet3AsyncTest.java b/...et/v3_0/jetty/JettyServlet3AsyncTest.java → ...et/v3_0/jetty/JettyServlet3AsyncTest.java
diff --git a/...3_0/jetty/JettyServlet3FakeAsyncTest.java → ...3_0/jetty/JettyServlet3FakeAsyncTest.java b/...3_0/jetty/JettyServlet3FakeAsyncTest.java → ...3_0/jetty/JettyServlet3FakeAsyncTest.java
diff --git a/...let/v3_0/jetty/JettyServlet3SyncTest.java → ...let/v3_0/jetty/JettyServlet3SyncTest.java b/...let/v3_0/jetty/JettyServlet3SyncTest.java → ...let/v3_0/jetty/JettyServlet3SyncTest.java
diff --git a/...servlet/v3_0/jetty/JettyServlet3Test.java → ...servlet/v3_0/jetty/JettyServlet3Test.java b/...servlet/v3_0/jetty/JettyServlet3Test.java → ...servlet/v3_0/jetty/JettyServlet3Test.java
diff --git a/...t/v3_0/jetty/JettyServletHandlerTest.java → ...t/v3_0/jetty/JettyServletHandlerTest.java b/...t/v3_0/jetty/JettyServletHandlerTest.java → ...t/v3_0/jetty/JettyServletHandlerTest.java
diff --git a/...3_0/jetty/dispatch/JettyDispatchTest.java → ...3_0/jetty/dispatch/JettyDispatchTest.java b/...3_0/jetty/dispatch/JettyDispatchTest.java → ...3_0/jetty/dispatch/JettyDispatchTest.java
diff --git a/...patch/JettyServlet3DispatchAsyncTest.java → ...patch/JettyServlet3DispatchAsyncTest.java b/...patch/JettyServlet3DispatchAsyncTest.java → ...patch/JettyServlet3DispatchAsyncTest.java
diff --git a/...h/JettyServlet3DispatchImmediateTest.java → ...h/JettyServlet3DispatchImmediateTest.java b/...h/JettyServlet3DispatchImmediateTest.java → ...h/JettyServlet3DispatchImmediateTest.java
diff --git a/...ty/dispatch/JettyServlet3ForwardTest.java → ...ty/dispatch/JettyServlet3ForwardTest.java b/...ty/dispatch/JettyServlet3ForwardTest.java → ...ty/dispatch/JettyServlet3ForwardTest.java
diff --git a/...ty/dispatch/JettyServlet3IncludeTest.java → ...ty/dispatch/JettyServlet3IncludeTest.java b/...ty/dispatch/JettyServlet3IncludeTest.java → ...ty/dispatch/JettyServlet3IncludeTest.java
diff --git a/.../mapping/AbstractServlet3MappingTest.java → .../mapping/AbstractServlet3MappingTest.java b/.../mapping/AbstractServlet3MappingTest.java → .../mapping/AbstractServlet3MappingTest.java
diff --git a/...3_0/mapping/JettyServlet3MappingTest.java → ...3_0/mapping/JettyServlet3MappingTest.java b/...3_0/mapping/JettyServlet3MappingTest.java → ...3_0/mapping/JettyServlet3MappingTest.java
diff --git a/...ping/TomcatServlet3FilterMappingTest.java → ...ping/TomcatServlet3FilterMappingTest.java b/...ping/TomcatServlet3FilterMappingTest.java → ...ping/TomcatServlet3FilterMappingTest.java
diff --git a/...Servlet3FilterServletNameMappingTest.java → ...Servlet3FilterServletNameMappingTest.java b/...Servlet3FilterServletNameMappingTest.java → ...Servlet3FilterServletNameMappingTest.java
diff --git a/...tServlet3FilterUrlPatternMappingTest.java → ...tServlet3FilterUrlPatternMappingTest.java b/...tServlet3FilterUrlPatternMappingTest.java → ...tServlet3FilterUrlPatternMappingTest.java
diff --git a/..._0/mapping/TomcatServlet3MappingTest.java → ..._0/mapping/TomcatServlet3MappingTest.java b/..._0/mapping/TomcatServlet3MappingTest.java → ..._0/mapping/TomcatServlet3MappingTest.java
diff --git a/...ervlet/v3_0/tomcat/ErrorHandlerValve.java → ...ervlet/v3_0/tomcat/ErrorHandlerValve.java b/...ervlet/v3_0/tomcat/ErrorHandlerValve.java → ...ervlet/v3_0/tomcat/ErrorHandlerValve.java
diff --git a/...v3_0/tomcat/RequestDispatcherServlet.java → ...v3_0/tomcat/RequestDispatcherServlet.java b/...v3_0/tomcat/RequestDispatcherServlet.java → ...v3_0/tomcat/RequestDispatcherServlet.java
diff --git a/...rvlet/v3_0/tomcat/TestAccessLogValve.java → ...rvlet/v3_0/tomcat/TestAccessLogValve.java b/...rvlet/v3_0/tomcat/TestAccessLogValve.java → ...rvlet/v3_0/tomcat/TestAccessLogValve.java
diff --git a/...ion/servlet/v3_0/tomcat/TestServlet3.java → ...ion/servlet/v3_0/tomcat/TestServlet3.java b/...ion/servlet/v3_0/tomcat/TestServlet3.java → ...ion/servlet/v3_0/tomcat/TestServlet3.java
diff --git a/.../v3_0/tomcat/TomcatServlet3AsyncTest.java → .../v3_0/tomcat/TomcatServlet3AsyncTest.java b/.../v3_0/tomcat/TomcatServlet3AsyncTest.java → .../v3_0/tomcat/TomcatServlet3AsyncTest.java
diff --git a/...0/tomcat/TomcatServlet3FakeAsyncTest.java → ...0/tomcat/TomcatServlet3FakeAsyncTest.java b/...0/tomcat/TomcatServlet3FakeAsyncTest.java → ...0/tomcat/TomcatServlet3FakeAsyncTest.java
diff --git a/...t/v3_0/tomcat/TomcatServlet3SyncTest.java → ...t/v3_0/tomcat/TomcatServlet3SyncTest.java b/...t/v3_0/tomcat/TomcatServlet3SyncTest.java → ...t/v3_0/tomcat/TomcatServlet3SyncTest.java
diff --git a/...rvlet/v3_0/tomcat/TomcatServlet3Test.java → ...rvlet/v3_0/tomcat/TomcatServlet3Test.java b/...rvlet/v3_0/tomcat/TomcatServlet3Test.java → ...rvlet/v3_0/tomcat/TomcatServlet3Test.java
diff --git a/...0/tomcat/dispatch/TomcatDispatchTest.java → ...0/tomcat/dispatch/TomcatDispatchTest.java b/...0/tomcat/dispatch/TomcatDispatchTest.java → ...0/tomcat/dispatch/TomcatDispatchTest.java
diff --git a/...atch/TomcatServlet3DispatchAsyncTest.java → ...atch/TomcatServlet3DispatchAsyncTest.java b/...atch/TomcatServlet3DispatchAsyncTest.java → ...atch/TomcatServlet3DispatchAsyncTest.java
diff --git a/.../TomcatServlet3DispatchImmediateTest.java → .../TomcatServlet3DispatchImmediateTest.java b/.../TomcatServlet3DispatchImmediateTest.java → .../TomcatServlet3DispatchImmediateTest.java
diff --git a/...t/dispatch/TomcatServlet3ForwardTest.java → ...t/dispatch/TomcatServlet3ForwardTest.java b/...t/dispatch/TomcatServlet3ForwardTest.java → ...t/dispatch/TomcatServlet3ForwardTest.java
diff --git a/...t/dispatch/TomcatServlet3IncludeTest.java → ...t/dispatch/TomcatServlet3IncludeTest.java b/...t/dispatch/TomcatServlet3IncludeTest.java → ...t/dispatch/TomcatServlet3IncludeTest.java
diff --git a/...agent/src/test/resources/realm.properties → ...tests/src/test/resources/realm.properties b/...agent/src/test/resources/realm.properties → ...tests/src/test/resources/realm.properties
diff --git a/instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts b/instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts
@@ -45,11 +45,3 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
 }
-
-val latestDepTest = findProperty("testLatestDeps") as Boolean
-
-if (latestDepTest) {
-  otelJava {
-    minJavaVersionSupported.set(JavaVersion.VERSION_11)
-  }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -540,6 +540,7 @@ include(":instrumentation:rxjava:rxjava-3-common:testing")
 include(":instrumentation:scala-fork-join-2.8:javaagent")
 include(":instrumentation:servlet:servlet-2.2:javaagent")
 include(":instrumentation:servlet:servlet-3.0:javaagent")
+include(":instrumentation:servlet:servlet-3.0:javaagent-tests")
 include(":instrumentation:servlet:servlet-3.0:javaagent-unit-tests")
 include(":instrumentation:servlet:servlet-5.0:javaagent")
 include(":instrumentation:servlet:servlet-5.0:javaagent-unit-tests")