Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert jaxrs-1.0 tests to java #12745

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Convert jaxrs-1.0 tests to java #12745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,19 @@ dependencies {

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

// Jackson, used by the test, dropped support for jax 1.x in 2.13+
testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.12.6"))
testImplementation("io.dropwizard:dropwizard-testing:0.7.1")
testImplementation("javax.xml.bind:jaxb-api:2.2.3")
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))

testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
testImplementation("com.sun.jersey:jersey-servlet:1.19.4")
testImplementation("javax.xml.bind:jaxb-api:2.2.11")
testImplementation("com.sun.xml.bind:jaxb-core:2.2.11")
testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
testImplementation("javax.activation:activation:1.1.1")
}

tasks.withType<Test>().configureEach {
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
// required on jdk17
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
}
5 changes: 0 additions & 5 deletions .../src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@

public final class JaxrsSingletons {

public static final String ABORT_FILTER_CLASS =
"io.opentelemetry.javaagent.instrumentation.jaxrs2.filter.abort.class";
public static final String ABORT_HANDLED =
"io.opentelemetry.javaagent.instrumentation.jaxrs2.filter.abort.handled";

private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxrs-1.0";

private static final Instrumenter<HandlerData, Void> INSTRUMENTER;
Expand Down
168 changes: 0 additions & 168 deletions ...ion/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy
View file
Open in desktop

This file was deleted.

107 changes: 0 additions & 107 deletions instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions ...vaagent/src/test/java/JavaInterfaces.java → ...umentation/jaxrs/v1_0/JavaInterfaces.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jaxrs.v1_0;

import javax.ws.rs.GET;
import javax.ws.rs.Path;

Expand Down
Loading
Loading