From ac65f0b7f4471f6985c1de2c012958c679e7d25d Mon Sep 17 00:00:00 2001 From: Emily Jiang Date: Thu, 10 Aug 2023 15:47:50 +0100 Subject: [PATCH] Remove the dependency on servlet and other tidyup (#116) * remove the unused variables and dependencies --- tracing/tck/pom.xml | 7 +------ .../telemetry/tracing/tck/async/JaxRsServerAsyncTest.java | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tracing/tck/pom.xml b/tracing/tck/pom.xml index c146df7..b90d6a4 100644 --- a/tracing/tck/pom.xml +++ b/tracing/tck/pom.xml @@ -96,12 +96,7 @@ awaitility ${version.awaitility} - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - provided - + diff --git a/tracing/tck/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/async/JaxRsServerAsyncTest.java b/tracing/tck/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/async/JaxRsServerAsyncTest.java index 34a1d57..5f950c7 100644 --- a/tracing/tck/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/async/JaxRsServerAsyncTest.java +++ b/tracing/tck/src/main/java/org/eclipse/microprofile/telemetry/tracing/tck/async/JaxRsServerAsyncTest.java @@ -45,12 +45,10 @@ import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider; import io.opentelemetry.sdk.trace.data.SpanData; import jakarta.inject.Inject; -import jakarta.servlet.http.HttpServletRequest; class JaxRsServerAsyncTest extends Arquillian { @@ -63,7 +61,7 @@ public static WebArchive createDeployment() { .add("otel.traces.exporter", "in-memory"); return ShrinkWrap.create(WebArchive.class) - .addClasses(InMemorySpanExporter.class, InMemorySpanExporterProvider.class, HttpServletRequest.class, + .addClasses(InMemorySpanExporter.class, InMemorySpanExporterProvider.class, JaxRsServerAsyncTestEndpointClient.class, JaxRsServerAsyncTestEndpoint.class) .addAsLibrary(TestLibraries.AWAITILITY_LIB) .addAsServiceProvider(ConfigurableSpanExporterProvider.class, InMemorySpanExporterProvider.class) @@ -73,9 +71,6 @@ public static WebArchive createDeployment() { private static final String TEST_VALUE = "test.value"; - @Inject - private Tracer tracer; - @Inject private InMemorySpanExporter spanExporter;