Skip to content

Commit 5294ebe

Browse files
zeitlingerzeitlinger
committed
extra module for java 11
1 parent 01f487c commit 5294ebe

File tree

19 files changed

+36
-86
lines changed

19 files changed

+36
-86
lines changed

‎instrumentation/servlet/servlet-5.0/jetty11-testing/build.gradle.kts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
plugins {
2+
id("otel.javaagent-testing")
3+
}
4+
5+
dependencies {
6+
testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
7+
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
8+
testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
9+
testImplementation(project(":instrumentation:servlet:servlet-5.0:testing"))
10+
11+
// Jetty 11 requires Java 11
12+
testLibrary("org.eclipse.jetty:jetty-server:11.0.0")
13+
testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
14+
15+
latestDepTestLibrary("org.eclipse.jetty:jetty-server:11.+")
16+
}
17+
18+
otelJava {
19+
minJavaVersionSupported.set(JavaVersion.VERSION_11)
20+
}
21+
22+
tasks {
23+
withType<Test>().configureEach {
24+
jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
25+
}
26+
}

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5AsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5AsyncTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77

88
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
99
import jakarta.servlet.Servlet;
10-
import org.junit.jupiter.api.condition.EnabledForJreRange;
11-
import org.junit.jupiter.api.condition.JRE;
1210

13-
@EnabledForJreRange(min = JRE.JAVA_11)
1411
public class JettyServlet5AsyncTest extends JettyServlet5Test {
1512

1613
@Override

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5FakeAsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5FakeAsyncTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77

88
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
99
import jakarta.servlet.Servlet;
10-
import org.junit.jupiter.api.condition.EnabledForJreRange;
11-
import org.junit.jupiter.api.condition.JRE;
1210

13-
@EnabledForJreRange(min = JRE.JAVA_11)
1411
public class JettyServlet5FakeAsyncTest extends JettyServlet5Test {
1512
@Override
1613
public Class<? extends Servlet> servlet() {

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/mapping/JettyServlet5MappingTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5MappingTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.mapping;
6+
package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty;
77

8+
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.AbstractServlet5MappingTest;
89
import jakarta.servlet.Servlet;
910
import jakarta.servlet.http.HttpServlet;
1011
import jakarta.servlet.http.HttpServletRequest;

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5SyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5SyncTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77

88
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
99
import jakarta.servlet.Servlet;
10-
import org.junit.jupiter.api.condition.EnabledForJreRange;
11-
import org.junit.jupiter.api.condition.JRE;
1210

13-
@EnabledForJreRange(min = JRE.JAVA_11)
1411
public class JettyServlet5SyncTest extends JettyServlet5Test {
1512
@Override
1613
public Class<? extends Servlet> servlet() {

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5Test.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServlet5Test.java‎

File renamed without changes.

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import org.eclipse.jetty.server.Server;
2424
import org.eclipse.jetty.server.handler.ErrorHandler;
2525
import org.eclipse.jetty.servlet.ServletHandler;
26-
import org.junit.jupiter.api.condition.EnabledForJreRange;
27-
import org.junit.jupiter.api.condition.JRE;
2826
import org.junit.jupiter.api.extension.RegisterExtension;
2927

30-
@EnabledForJreRange(min = JRE.JAVA_11)
3128
public class JettyServletHandlerTest extends AbstractServlet5Test<Server, ServletHandler> {
3229

3330
@RegisterExtension

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyDispatchTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyDispatchTest.java‎

File renamed without changes.

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5DispatchAsyncTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5DispatchAsyncTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
1919
import jakarta.servlet.Servlet;
2020
import org.eclipse.jetty.servlet.ServletContextHandler;
21-
import org.junit.jupiter.api.condition.EnabledForJreRange;
22-
import org.junit.jupiter.api.condition.JRE;
2321

24-
@EnabledForJreRange(min = JRE.JAVA_11)
2522
public class JettyServlet5DispatchAsyncTest extends JettyDispatchTest {
2623
@Override
2724
public Class<? extends Servlet> servlet() {

‎instrumentation/servlet/servlet-5.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5DispatchImmediateTest.java‎ renamed to ‎instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/dispatch/JettyServlet5DispatchImmediateTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.TestServlet5;
1919
import jakarta.servlet.Servlet;
2020
import org.eclipse.jetty.servlet.ServletContextHandler;
21-
import org.junit.jupiter.api.condition.EnabledForJreRange;
22-
import org.junit.jupiter.api.condition.JRE;
2321

24-
@EnabledForJreRange(min = JRE.JAVA_11)
2522
public class JettyServlet5DispatchImmediateTest extends JettyDispatchTest {
2623
@Override
2724
public Class<? extends Servlet> servlet() {

0 commit comments

Comments
 (0)