Skip to content
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

Jump to bottom

Add implementation for context propagation based on changed in OpenTelemetry 0.9.0. #8884

Merged
merged 4 commits into from
Nov 19, 2020
Merged

Add implementation for context propagation based on changed in OpenTelemetry 0.9.0. #8884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c55c743
Update to use implementation of context propagator object according t…
pujagani Nov 17, 2020
8a3e6af
Add test for checking correct tracing context propagation.
pujagani Nov 18, 2020
c5c2444
Merge branch 'trunk' into opentelemetry_context_propagation
AutomatedTester Nov 19, 2020
6d4d473
Merge branch 'trunk' into opentelemetry_context_propagation
AutomatedTester Nov 19, 2020
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
Next Next commit
Update to use implementation of context propagator object according t… 
…o OpenTelemetry 0.9.0.
  • Loading branch information
@pujagani
pujagani committed Nov 18, 2020
commit c55c743efbb35b8b8a2eeb889340b3c7e71074f9
1 change: 1 addition & 0 deletions java/client/test/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ java_test_suite(
artifact("io.opentelemetry:opentelemetry-sdk"),
artifact("io.opentelemetry:opentelemetry-sdk-common"),
artifact("io.opentelemetry:opentelemetry-sdk-tracing"),
artifact("io.opentelemetry:opentelemetry-context-prop"),
artifact("junit:junit"),
artifact("org.assertj:assertj-core"),
],
Expand Down
8 changes: 7 additions & 1 deletion java/client/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 @@ -20,13 +20,16 @@
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.common.AttributeKey;
import io.opentelemetry.common.Attributes;
import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.context.propagation.DefaultContextPropagators;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.trace.TracerSdkProvider;
import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.trace.StatusCanonicalCode;
import io.opentelemetry.trace.propagation.HttpTraceContext;
import org.junit.Test;
import org.openqa.selenium.grid.web.CombinedHandler;
import org.openqa.selenium.remote.http.HttpRequest;
Expand Down Expand Up @@ -568,8 +571,11 @@ public CompletableResultCode shutdown() {
}).build());

io.opentelemetry.trace.Tracer otTracer = provider.get("get");
ContextPropagators propagators = DefaultContextPropagators.builder()
.addTextMapPropagator(HttpTraceContext.getInstance()).build();

return new OpenTelemetryTracer(
otTracer,
OpenTelemetry.getPropagators().getTextMapPropagator());
propagators.getTextMapPropagator());
}
}
10 changes: 9 additions & 1 deletion java/server/src/org/openqa/selenium/grid/log/LoggingOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import io.opentelemetry.common.AttributeConsumer;
import io.opentelemetry.common.AttributeKey;
import io.opentelemetry.common.Attributes;
import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.context.propagation.DefaultContextPropagators;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.trace.MultiSpanProcessor;
Expand All @@ -30,6 +32,7 @@
import io.opentelemetry.sdk.trace.data.SpanData.Event;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.trace.propagation.HttpTraceContext;
import org.openqa.selenium.grid.config.Config;
import org.openqa.selenium.internal.Require;
import org.openqa.selenium.json.Json;
Expand Down Expand Up @@ -177,9 +180,14 @@ public CompletableResultCode shutdown() {
exporter -> exporters.add(SimpleSpanProcessor.newBuilder(exporter).build()));
tracerFactory.addSpanProcessor(MultiSpanProcessor.create(exporters));

// OpenTelemetry default propagators are no-op since version 0.9.0.
// Hence, required propagators need to defined and added.
ContextPropagators propagators = DefaultContextPropagators.builder()
.addTextMapPropagator(HttpTraceContext.getInstance()).build();

return new OpenTelemetryTracer(
tracerFactory.get("default"),
OpenTelemetry.getPropagators().getTextMapPropagator());
propagators.getTextMapPropagator());
}

public void configureLogging() {
Expand Down