[bazel][java] Limit usage of io.opentelemetry dependencies (#12164)

joerg1985 · diemol · web-flow · commit 41744d94e872 · 2023-06-28T18:15:00.000+02:00
Limit usage of io.opentelemetry dependencies

Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -618,7 +618,7 @@ void cleverShenanigansRepresentingWhatWeSeeInTheRouter() {
   @Test
   void shouldBeAbleToSetExternalContextAndCreatedSpansAreItsChildren() {
     List<SpanData> 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<SpanData> exportTo) {
+  private OpenTelemetryTracer createTracer(List<SpanData> exportTo) {
     ContextPropagators propagators =
         ContextPropagators.create((W3CTraceContextPropagator.getInstance()));
     SdkTracerProvider sdkTracerProvider =

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ java_library(`
`12`	`12`	`"//java/src/org/openqa/selenium/grid/config",`
`13`	`13`	`"//java/src/org/openqa/selenium/grid/sessionmap",`
`14`	`14`	`artifact("com.beust:jcommander"),`
`15`		`- artifact("io.opentelemetry:opentelemetry-api"),`
`16`	`15`	`],`
`17`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,5 @@ java_library(`
`14`	`14`	`"//java/src/org/openqa/selenium/grid/jmx",`
`15`	`15`	`"//java/src/org/openqa/selenium/grid/sessionqueue",`
`16`	`16`	`artifact("com.beust:jcommander"),`
`17`		`- artifact("io.opentelemetry:opentelemetry-api"),`
`18`	`17`	`],`
`19`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ java_library(`
`28`	`28`	`"//java/src/org/openqa/selenium:core",`
`29`	`29`	`"//java/src/org/openqa/selenium/remote/http",`
`30`	`30`	`artifact("com.google.guava:guava"),`
`31`		`- artifact("io.opentelemetry:opentelemetry-api"),`
`32`		`- artifact("io.opentelemetry:opentelemetry-context"),`
`33`	`31`	`artifact("io.opentelemetry:opentelemetry-semconv"),`
`34`	`32`	`],`
`35`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@ java_library(`
`10`	`10`	`deps = [`
`11`	`11`	`"//java/src/org/openqa/selenium:core",`
`12`	`12`	`"//java/src/org/openqa/selenium/remote/tracing:tracing-lib",`
`13`		`- artifact("io.opentelemetry:opentelemetry-context"),`
`14`	`13`	`],`
`15`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`
`18`	`18`	`package org.openqa.selenium.remote.tracing.empty;`
`19`	`19`
`20`		`-import io.opentelemetry.context.Context;`
`21`	`20`	`import org.openqa.selenium.remote.tracing.Propagator;`
`22`	`21`	`import org.openqa.selenium.remote.tracing.TraceContext;`
`23`	`22`	`import org.openqa.selenium.remote.tracing.Tracer;`
`@@ -32,7 +31,4 @@ public TraceContext getCurrentContext() {`
`32`	`31`	`public Propagator getPropagator() {`
`33`	`32`	`return new NullPropagator();`
`34`	`33`	`}`
`35`		`-`
`36`		`- @Override`
`37`		`- public void setOpenTelemetryContext(Context context) {}`
`38`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public Propagator getPropagator() {`
`107`	`107`	`return telemetryPropagator;`
`108`	`108`	`}`
`109`	`109`
`110`		`- @Override`
`111`	`110`	`public void setOpenTelemetryContext(Context context) {`
`112`	`111`	`this.context = context;`
`113`	`112`	`}`