From 83580ebed97a80e97ef1d7bf476cdf72f5c55809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sautter?= Date: Tue, 6 Jun 2023 22:54:12 +0200 Subject: [PATCH] Limit usage of io.opentelemetry dependencies --- .../org/openqa/selenium/grid/sessionmap/config/BUILD.bazel | 1 - .../org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel | 1 - java/src/org/openqa/selenium/remote/tracing/BUILD.bazel | 2 -- java/src/org/openqa/selenium/remote/tracing/Tracer.java | 4 ---- java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel | 1 - .../org/openqa/selenium/remote/tracing/empty/NullTracer.java | 4 ---- .../remote/tracing/opentelemetry/OpenTelemetryTracer.java | 1 - .../selenium/remote/tracing/opentelemetry/TracerTest.java | 4 ++-- 8 files changed, 2 insertions(+), 16 deletions(-) diff --git a/java/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel index 1686e54577d1d..9ed88ffc805ad 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel @@ -12,6 +12,5 @@ java_library( "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/sessionmap", artifact("com.beust:jcommander"), - artifact("io.opentelemetry:opentelemetry-api"), ], ) diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel index d43cd08710b16..db10f5fb227fc 100644 --- a/java/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel @@ -14,6 +14,5 @@ java_library( "//java/src/org/openqa/selenium/grid/jmx", "//java/src/org/openqa/selenium/grid/sessionqueue", artifact("com.beust:jcommander"), - artifact("io.opentelemetry:opentelemetry-api"), ], ) diff --git a/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel b/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel index 6bbf693622039..e223737074430 100644 --- a/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel @@ -28,8 +28,6 @@ java_library( "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/remote/http", artifact("com.google.guava:guava"), - artifact("io.opentelemetry:opentelemetry-api"), - artifact("io.opentelemetry:opentelemetry-context"), artifact("io.opentelemetry:opentelemetry-semconv"), ], ) diff --git a/java/src/org/openqa/selenium/remote/tracing/Tracer.java b/java/src/org/openqa/selenium/remote/tracing/Tracer.java index 130f1664575fe..74df63ba1b3ed 100644 --- a/java/src/org/openqa/selenium/remote/tracing/Tracer.java +++ b/java/src/org/openqa/selenium/remote/tracing/Tracer.java @@ -17,13 +17,9 @@ package org.openqa.selenium.remote.tracing; -import io.opentelemetry.context.Context; - public interface Tracer { TraceContext getCurrentContext(); Propagator getPropagator(); - - void setOpenTelemetryContext(Context context); } diff --git a/java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel b/java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel index 95a32a663ff8b..31a7df1c1eee8 100644 --- a/java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel @@ -10,6 +10,5 @@ java_library( deps = [ "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/remote/tracing:tracing-lib", - artifact("io.opentelemetry:opentelemetry-context"), ], ) diff --git a/java/src/org/openqa/selenium/remote/tracing/empty/NullTracer.java b/java/src/org/openqa/selenium/remote/tracing/empty/NullTracer.java index 1ad23602a1626..628388cd9bf33 100644 --- a/java/src/org/openqa/selenium/remote/tracing/empty/NullTracer.java +++ b/java/src/org/openqa/selenium/remote/tracing/empty/NullTracer.java @@ -17,7 +17,6 @@ package org.openqa.selenium.remote.tracing.empty; -import io.opentelemetry.context.Context; import org.openqa.selenium.remote.tracing.Propagator; import org.openqa.selenium.remote.tracing.TraceContext; import org.openqa.selenium.remote.tracing.Tracer; @@ -32,7 +31,4 @@ public TraceContext getCurrentContext() { public Propagator getPropagator() { return new NullPropagator(); } - - @Override - public void setOpenTelemetryContext(Context context) {} } diff --git a/java/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryTracer.java b/java/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryTracer.java index 1f6304b3d3ac0..c90d6885f7dd6 100644 --- a/java/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryTracer.java +++ b/java/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryTracer.java @@ -107,7 +107,6 @@ public Propagator getPropagator() { return telemetryPropagator; } - @Override public void setOpenTelemetryContext(Context context) { this.context = context; } diff --git a/java/test/org/openqa/selenium/remote/tracing/opentelemetry/TracerTest.java b/java/test/org/openqa/selenium/remote/tracing/opentelemetry/TracerTest.java index 939adb0026d67..22ea00f32fe4a 100644 --- a/java/test/org/openqa/selenium/remote/tracing/opentelemetry/TracerTest.java +++ b/java/test/org/openqa/selenium/remote/tracing/opentelemetry/TracerTest.java @@ -618,7 +618,7 @@ void cleverShenanigansRepresentingWhatWeSeeInTheRouter() { @Test void shouldBeAbleToSetExternalContextAndCreatedSpansAreItsChildren() { List allSpans = new ArrayList<>(); - Tracer tracer = createTracer(allSpans); + OpenTelemetryTracer tracer = createTracer(allSpans); OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().build(); io.opentelemetry.api.trace.Span externalSpan = @@ -638,7 +638,7 @@ void shouldBeAbleToSetExternalContextAndCreatedSpansAreItsChildren() { .isEqualTo(externalSpan.getSpanContext().getSpanId()); } - private Tracer createTracer(List exportTo) { + private OpenTelemetryTracer createTracer(List exportTo) { ContextPropagators propagators = ContextPropagators.create((W3CTraceContextPropagator.getInstance())); SdkTracerProvider sdkTracerProvider =