Convert Jetty 8.0 groovy to java (#7975)

related to #7195
open-telemetry · Mar 11, 2023 · 468aa9e · 468aa9e
1 parent 995baa8
commit 468aa9e
Show file tree

Hide file tree

Showing 7 changed files with 291 additions and 242 deletions.
diff --git a/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts
@@ -29,3 +29,11 @@ dependencies {
   latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see jetty-11.0 module
   latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see jetty-11.0 module
 }
+
+// jetty-server 10+ requires Java 11
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+if (latestDepTest) {
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_11)
+  }
+}
diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy b/instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy
diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/QueuedThreadPoolTest.groovy b/instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/QueuedThreadPoolTest.groovy
diff --git a/...agent/src/test/groovy/JavaAsyncChild.java → ...umentation/jetty/v8_0/JavaAsyncChild.java b/...agent/src/test/groovy/JavaAsyncChild.java → ...umentation/jetty/v8_0/JavaAsyncChild.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.jetty.v8_0;
+
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
 import java.util.concurrent.Callable;

diff --git a/...aagent/src/test/java/JavaLambdaMaker.java → ...mentation/jetty/v8_0/JavaLambdaMaker.java b/...aagent/src/test/java/JavaLambdaMaker.java → ...mentation/jetty/v8_0/JavaLambdaMaker.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.jetty.v8_0;
+
 public class JavaLambdaMaker {
 
   @SuppressWarnings("FunctionalExpressionCanBeFolded")