Skip to content

Commit 468aa9e

Browse files
authored
Convert Jetty 8.0 groovy to java (#7975)
related to #7195
1 parent 995baa8 commit 468aa9e

File tree

7 files changed

+291
-242
lines changed

7 files changed

+291
-242
lines changed

instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts

+8
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,11 @@ dependencies {
2929
latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see jetty-11.0 module
3030
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see jetty-11.0 module
3131
}
32+
33+
// jetty-server 10+ requires Java 11
34+
val latestDepTest = findProperty("testLatestDeps") as Boolean
35+
if (latestDepTest) {
36+
otelJava {
37+
minJavaVersionSupported.set(JavaVersion.VERSION_11)
38+
}
39+
}

instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy

-144
This file was deleted.

instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/QueuedThreadPoolTest.groovy

-98
This file was deleted.

instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/JavaAsyncChild.java instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JavaAsyncChild.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.jetty.v8_0;
7+
68
import io.opentelemetry.api.GlobalOpenTelemetry;
79
import io.opentelemetry.api.trace.Tracer;
810
import java.util.concurrent.Callable;

instrumentation/jetty/jetty-8.0/javaagent/src/test/java/JavaLambdaMaker.java instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JavaLambdaMaker.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.jetty.v8_0;
7+
68
public class JavaLambdaMaker {
79

810
@SuppressWarnings("FunctionalExpressionCanBeFolded")

0 commit comments

Comments
 (0)