Skip to content

Commit d488c0c

Browse files
pujaganidiemol
andauthored
Upgrade OpenTelemetry to latest stable version 1.0.0 (#9247)
* [tracing] Upgrade OpenTelemetry to 0.17.0 * [tracing] Upgrade OpenTelemetry to 1.0.0 * [tracing] Remove unused import Co-authored-by: Diego Molina <[email protected]>
1 parent a2dc341 commit d488c0c

File tree

5 files changed

+284
-277
lines changed

5 files changed

+284
-277
lines changed

java/client/src/org/openqa/selenium/remote/tracing/opentelemetry/OpenTelemetryPropagator.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
package org.openqa.selenium.remote.tracing.opentelemetry;
1919

2020
import io.opentelemetry.context.Context;
21+
import io.opentelemetry.context.propagation.TextMapGetter;
2122
import io.opentelemetry.context.propagation.TextMapPropagator;
2223
import io.opentelemetry.api.trace.Tracer;
2324
import io.opentelemetry.api.trace.Span;
25+
import io.opentelemetry.context.propagation.TextMapSetter;
2426
import org.openqa.selenium.internal.Require;
2527
import org.openqa.selenium.remote.tracing.Propagator;
2628
import org.openqa.selenium.remote.tracing.TraceContext;
@@ -44,7 +46,7 @@ public <C> void inject(TraceContext toInject, C carrier, Setter<C> setter) {
4446
Require.nonNull("Setter", setter);
4547
Require.argument("Trace context", toInject).instanceOf(OpenTelemetryContext.class);
4648

47-
TextMapPropagator.Setter<C> propagatorSetter = setter::set;
49+
TextMapSetter<C> propagatorSetter = setter::set;
4850

4951
httpTextFormat.inject(((OpenTelemetryContext) toInject).getContext(), carrier, propagatorSetter);
5052
}
@@ -57,7 +59,7 @@ public <C> OpenTelemetryContext extractContext(
5759
Require.nonNull("Getter", getter);
5860
Require.argument("Trace context", existing).instanceOf(OpenTelemetryContext.class);
5961

60-
TextMapPropagator.Getter<C> propagatorGetter = new TextMapPropagator.Getter<C>() {
62+
TextMapGetter<C> propagatorGetter = new TextMapGetter<C>() {
6163

6264
@Override
6365
public Iterable<String> keys(C carrier) {

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

+7
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ public static OpenTelemetryTracer getInstance() {
5858
private static OpenTelemetryTracer createTracer() {
5959
LOG.info("Using OpenTelemetry for tracing");
6060

61+
// Default exporter for traces and metrics is OTLP 0.17.0 onwards.
62+
// If the metrics exporter property is not set to none, external dependency is required.
63+
System.setProperty("otel.metrics.exporter", "none");
64+
String exporter = System.getProperty("otel.traces.exporter");
65+
if(exporter == null) {
66+
System.setProperty("otel.traces.exporter", "none");
67+
}
6168
OpenTelemetrySdk autoConfiguredSdk = OpenTelemetrySdkAutoConfiguration.initialize();
6269

6370
return new OpenTelemetryTracer(

java/maven_deps.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@rules_jvm_external//:specs.bzl", "maven")
33

44
def selenium_java_deps():
55
netty_version = "4.1.58.Final"
6-
opentelemetry_version = "0.16.0"
6+
opentelemetry_version = "1.0.0"
77

88
maven_install(
99
artifacts = [
@@ -44,7 +44,7 @@ def selenium_java_deps():
4444
"io.opentelemetry:opentelemetry-semconv:%s" % opentelemetry_version + "-alpha",
4545
"io.opentelemetry:opentelemetry-sdk:%s" % opentelemetry_version,
4646
"io.opentelemetry:opentelemetry-sdk-common:%s" % opentelemetry_version,
47-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:0.16.0-alpha",
47+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:%s" % opentelemetry_version + "-alpha",
4848
"io.opentelemetry:opentelemetry-sdk-testing:%s" % opentelemetry_version,
4949
"io.opentelemetry:opentelemetry-sdk-trace:%s" % opentelemetry_version,
5050
"io.ous:jtoml:2.0.0",

0 commit comments

Comments
 (0)