Skip to content

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

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

Merged
merged 2 commits into from
Jun 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83580eb
Limit usage of io.opentelemetry dependencies
joerg1985 Jun 6, 2023
4cdc8a3
Merge branch 'trunk' into opentelemetry
diemol Jun 28, 2023
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
1 change: 0 additions & 1 deletion java/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
],
)
1 change: 0 additions & 1 deletion java/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
],
)
2 changes: 0 additions & 2 deletions java/src/org/openqa/selenium/remote/tracing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
],
)
4 changes: 0 additions & 4 deletions java/src/org/openqa/selenium/remote/tracing/Tracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
1 change: 0 additions & 1 deletion java/src/org/openqa/selenium/remote/tracing/empty/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
],
)
4 changes: 0 additions & 4 deletions java/src/org/openqa/selenium/remote/tracing/empty/NullTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -32,7 +31,4 @@ public TraceContext getCurrentContext() {
public Propagator getPropagator() {
return new NullPropagator();
}

@Override
public void setOpenTelemetryContext(Context context) {}
}
1 change: 0 additions & 1 deletion java/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public Propagator getPropagator() {
return telemetryPropagator;
}

@Override
public void setOpenTelemetryContext(Context context) {
this.context = context;
}
Expand Down
4 changes: 2 additions & 2 deletions java/test/org/openqa/selenium/remote/tracing/opentelemetry/TracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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 =
Expand Down