Skip to content

Commit 059a4ca

Browse files
authored
Convert jaxrs-1.0 tests to java (#12745)
1 parent 5b21872 commit 059a4ca

File tree

8 files changed

+316
-285
lines changed

8 files changed

+316
-285
lines changed

instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts

+11-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,19 @@ dependencies {
2020

2121
compileOnly("javax.ws.rs:jsr311-api:1.1.1")
2222

23-
// Jackson, used by the test, dropped support for jax 1.x in 2.13+
24-
testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.12.6"))
25-
testImplementation("io.dropwizard:dropwizard-testing:0.7.1")
26-
testImplementation("javax.xml.bind:jaxb-api:2.2.3")
23+
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
24+
25+
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
26+
testImplementation("com.sun.jersey:jersey-servlet:1.19.4")
27+
testImplementation("javax.xml.bind:jaxb-api:2.2.11")
28+
testImplementation("com.sun.xml.bind:jaxb-core:2.2.11")
29+
testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
30+
testImplementation("javax.activation:activation:1.1.1")
2731
}
2832

2933
tasks.withType<Test>().configureEach {
3034
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
35+
// required on jdk17
36+
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
37+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
3138
}

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsSingletons.java

-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313

1414
public final class JaxrsSingletons {
1515

16-
public static final String ABORT_FILTER_CLASS =
17-
"io.opentelemetry.javaagent.instrumentation.jaxrs2.filter.abort.class";
18-
public static final String ABORT_HANDLED =
19-
"io.opentelemetry.javaagent.instrumentation.jaxrs2.filter.abort.handled";
20-
2116
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxrs-1.0";
2217

2318
private static final Instrumenter<HandlerData, Void> INSTRUMENTER;

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy

-168
This file was deleted.

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy

-107
This file was deleted.

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/JavaInterfaces.java instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JavaInterfaces.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.jaxrs.v1_0;
7+
68
import javax.ws.rs.GET;
79
import javax.ws.rs.Path;
810

0 commit comments

Comments
 (0)