Skip to content

Commit 41744d9

Browse files
joerg1985diemol
andauthored
[bazel][java] Limit usage of io.opentelemetry dependencies (#12164)
Limit usage of io.opentelemetry dependencies Co-authored-by: Diego Molina <diemol@users.noreply.github.com>
1 parent c49361a commit 41744d9

File tree

8 files changed

+2
-16
lines changed

8 files changed

+2
-16
lines changed

java/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ java_library(
1212
"//java/src/org/openqa/selenium/grid/config",
1313
"//java/src/org/openqa/selenium/grid/sessionmap",
1414
artifact("com.beust:jcommander"),
15-
artifact("io.opentelemetry:opentelemetry-api"),
1615
],
1716
)

java/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ java_library(
1414
"//java/src/org/openqa/selenium/grid/jmx",
1515
"//java/src/org/openqa/selenium/grid/sessionqueue",
1616
artifact("com.beust:jcommander"),
17-
artifact("io.opentelemetry:opentelemetry-api"),
1817
],
1918
)

java/src/org/openqa/selenium/remote/tracing/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ java_library(
2828
"//java/src/org/openqa/selenium:core",
2929
"//java/src/org/openqa/selenium/remote/http",
3030
artifact("com.google.guava:guava"),
31-
artifact("io.opentelemetry:opentelemetry-api"),
32-
artifact("io.opentelemetry:opentelemetry-context"),
3331
artifact("io.opentelemetry:opentelemetry-semconv"),
3432
],
3533
)

java/src/org/openqa/selenium/remote/tracing/Tracer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,9 @@
1717

1818
package org.openqa.selenium.remote.tracing;
1919

20-
import io.opentelemetry.context.Context;
21-
2220
public interface Tracer {
2321

2422
TraceContext getCurrentContext();
2523

2624
Propagator getPropagator();
27-
28-
void setOpenTelemetryContext(Context context);
2925
}

java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ java_library(
1010
deps = [
1111
"//java/src/org/openqa/selenium:core",
1212
"//java/src/org/openqa/selenium/remote/tracing:tracing-lib",
13-
artifact("io.opentelemetry:opentelemetry-context"),
1413
],
1514
)

java/src/org/openqa/selenium/remote/tracing/empty/NullTracer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.openqa.selenium.remote.tracing.empty;
1919

20-
import io.opentelemetry.context.Context;
2120
import org.openqa.selenium.remote.tracing.Propagator;
2221
import org.openqa.selenium.remote.tracing.TraceContext;
2322
import org.openqa.selenium.remote.tracing.Tracer;
@@ -32,7 +31,4 @@ public TraceContext getCurrentContext() {
3231
public Propagator getPropagator() {
3332
return new NullPropagator();
3433
}
35-
36-
@Override
37-
public void setOpenTelemetryContext(Context context) {}
3834
}

java/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryTracer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public Propagator getPropagator() {
107107
return telemetryPropagator;
108108
}
109109

110-
@Override
111110
public void setOpenTelemetryContext(Context context) {
112111
this.context = context;
113112
}

java/test/org/openqa/selenium/remote/tracing/opentelemetry/TracerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ void cleverShenanigansRepresentingWhatWeSeeInTheRouter() {
618618
@Test
619619
void shouldBeAbleToSetExternalContextAndCreatedSpansAreItsChildren() {
620620
List<SpanData> allSpans = new ArrayList<>();
621-
Tracer tracer = createTracer(allSpans);
621+
OpenTelemetryTracer tracer = createTracer(allSpans);
622622

623623
OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().build();
624624
io.opentelemetry.api.trace.Span externalSpan =
@@ -638,7 +638,7 @@ void shouldBeAbleToSetExternalContextAndCreatedSpansAreItsChildren() {
638638
.isEqualTo(externalSpan.getSpanContext().getSpanId());
639639
}
640640

641-
private Tracer createTracer(List<SpanData> exportTo) {
641+
private OpenTelemetryTracer createTracer(List<SpanData> exportTo) {
642642
ContextPropagators propagators =
643643
ContextPropagators.create((W3CTraceContextPropagator.getInstance()));
644644
SdkTracerProvider sdkTracerProvider =

0 commit comments

Comments
 (0)