Skip to content

Commit 2a2f45d

Browse files
shs96cshs96c
committed
Bump OpenTelemetry to 0.14.1
1 parent ec500b8 commit 2a2f45d

9 files changed

Lines changed: 1367 additions & 2481 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ java_library(
2929
"//java/client/src/org/openqa/selenium/remote/http",
3030
artifact("com.google.guava:guava"),
3131
artifact("io.opentelemetry:opentelemetry-api"),
32-
artifact("io.opentelemetry:opentelemetry-api-trace"),
33-
artifact("io.opentelemetry:opentelemetry-api-common"),
3432
artifact("io.opentelemetry:opentelemetry-context"),
33+
artifact("io.opentelemetry:opentelemetry-semconv"),
3534
],
3635
)

‎java/client/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ java_library(
1212
"//java/client/src/org/openqa/selenium:core",
1313
"//java/client/src/org/openqa/selenium/remote/tracing",
1414
artifact("com.google.guava:guava"),
15-
artifact("io.opentelemetry:opentelemetry-api-trace"),
16-
artifact("io.opentelemetry:opentelemetry-api-common"),
1715
artifact("io.opentelemetry:opentelemetry-api"),
1816
artifact("io.opentelemetry:opentelemetry-context"),
1917
artifact("io.opentelemetry:opentelemetry-sdk"),

‎java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ java_library(
1313
"//java/client/src/org/openqa/selenium/remote/tracing",
1414
"//java/client/src/org/openqa/selenium/remote/tracing/opentelemetry",
1515
artifact("io.opentelemetry:opentelemetry-api"),
16-
artifact("io.opentelemetry:opentelemetry-api-trace"),
17-
artifact("io.opentelemetry:opentelemetry-api-common"),
1816
artifact("io.opentelemetry:opentelemetry-context"),
1917
],
2018
)

‎java/client/test/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ java_test_suite(
1111
"//java/client/test/org/openqa/selenium/testing:annotations",
1212
"//java/server/src/org/openqa/selenium/grid/web",
1313
artifact("io.opentelemetry:opentelemetry-api"),
14-
artifact("io.opentelemetry:opentelemetry-api-common"),
15-
artifact("io.opentelemetry:opentelemetry-api-trace"),
1614
artifact("io.opentelemetry:opentelemetry-sdk"),
1715
artifact("io.opentelemetry:opentelemetry-sdk-common"),
1816
artifact("io.opentelemetry:opentelemetry-sdk-trace"),

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

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
import io.opentelemetry.sdk.OpenTelemetrySdk;
2929
import io.opentelemetry.sdk.common.CompletableResultCode;
3030
import io.opentelemetry.sdk.trace.SdkTracerManagement;
31+
import io.opentelemetry.sdk.trace.data.EventData;
3132
import io.opentelemetry.sdk.trace.data.SpanData;
33+
import io.opentelemetry.sdk.trace.data.StatusData;
3234
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
3335
import io.opentelemetry.sdk.trace.export.SpanExporter;
3436
import org.junit.Test;
@@ -85,7 +87,7 @@ public void shouldBeAbleToCreateATracer() {
8587

8688
assertThat(values).hasSize(1);
8789
assertThat(values).element(0)
88-
.extracting(SpanData::getStatus).extracting(SpanData.Status::getStatusCode).isEqualTo(
90+
.extracting(SpanData::getStatus).extracting(StatusData::getStatusCode).isEqualTo(
8991
StatusCode.ERROR);
9092
assertThat(values).element(0)
9193
.extracting(el -> el.getAttributes().get(AttributeKey.stringKey("cheese"))).isEqualTo("gouda");
@@ -127,10 +129,10 @@ public void shouldBeAbleToCreateASpanWithAEvent() {
127129
SpanData spanData = allSpans.get(0);
128130
assertThat(spanData.getEvents()).hasSize(1);
129131

130-
List<SpanData.Event> timedEvents = spanData.getEvents();
131-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName)
132+
List<EventData> timedEvents = spanData.getEvents();
133+
assertThat(timedEvents).element(0).extracting(EventData::getName)
132134
.isEqualTo(event);
133-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getTotalAttributeCount)
135+
assertThat(timedEvents).element(0).extracting(EventData::getTotalAttributeCount)
134136
.isEqualTo(0);
135137
}
136138

@@ -150,12 +152,12 @@ public void shouldBeAbleToCreateASpanWithEvents() {
150152
SpanData spanData = allSpans.get(0);
151153
assertThat(spanData.getEvents()).hasSize(2);
152154

153-
List<SpanData.Event> timedEvents = spanData.getEvents();
154-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName)
155+
List<EventData> timedEvents = spanData.getEvents();
156+
assertThat(timedEvents).element(0).extracting(EventData::getName)
155157
.isEqualTo(startEvent);
156-
assertThat(timedEvents).element(1).extracting(SpanData.Event::getName)
158+
assertThat(timedEvents).element(1).extracting(EventData::getName)
157159
.isEqualTo(endEvent);
158-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getTotalAttributeCount)
160+
assertThat(timedEvents).element(0).extracting(EventData::getTotalAttributeCount)
159161
.isEqualTo(0);
160162
}
161163

@@ -179,14 +181,14 @@ public void shouldBeAbleToCreateSpansWithEvents() {
179181
assertThat(allSpans).hasSize(2);
180182
SpanData httpSpanData = allSpans.get(0);
181183
assertThat(httpSpanData.getEvents()).hasSize(1);
182-
List<SpanData.Event> httpTimedEvents = httpSpanData.getEvents();
183-
assertThat(httpTimedEvents).element(0).extracting(SpanData.Event::getName)
184+
List<EventData> httpTimedEvents = httpSpanData.getEvents();
185+
assertThat(httpTimedEvents).element(0).extracting(EventData::getName)
184186
.isEqualTo(httpEvent);
185187

186188
SpanData dbSpanData = allSpans.get(1);
187189
assertThat(dbSpanData.getEvents()).hasSize(1);
188-
List<SpanData.Event> dbTimedEvents = dbSpanData.getEvents();
189-
assertThat(dbTimedEvents).element(0).extracting(SpanData.Event::getName)
190+
List<EventData> dbTimedEvents = dbSpanData.getEvents();
191+
assertThat(dbTimedEvents).element(0).extracting(EventData::getName)
190192
.isEqualTo(databaseEvent);
191193
}
192194

@@ -207,8 +209,8 @@ public void canCreateASpanEventWithBooleanAttribute() {
207209
}
208210

209211
assertThat(allSpans).hasSize(1);
210-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
211-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
212+
List<EventData> timedEvents = allSpans.get(0).getEvents();
213+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
212214
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
213215
}
214216

@@ -233,8 +235,8 @@ public void canCreateASpanEventWithBooleanArrayAttributes() {
233235
}
234236

235237
assertThat(allSpans).hasSize(1);
236-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
237-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
238+
List<EventData> timedEvents = allSpans.get(0).getEvents();
239+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
238240
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
239241
}
240242

@@ -256,8 +258,8 @@ public void canCreateASpanEventWithDoubleAttribute() {
256258
}
257259

258260
assertThat(allSpans).hasSize(1);
259-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
260-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
261+
List<EventData> timedEvents = allSpans.get(0).getEvents();
262+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
261263
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
262264
}
263265

@@ -282,8 +284,8 @@ public void canCreateASpanEventWithDoubleArrayAttributes() {
282284
}
283285

284286
assertThat(allSpans).hasSize(1);
285-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
286-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
287+
List<EventData> timedEvents = allSpans.get(0).getEvents();
288+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
287289
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
288290
}
289291

@@ -305,8 +307,8 @@ public void canCreateASpanEventWithLongAttribute() {
305307
}
306308

307309
assertThat(allSpans).hasSize(1);
308-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
309-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
310+
List<EventData> timedEvents = allSpans.get(0).getEvents();
311+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
310312
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
311313
}
312314

@@ -331,8 +333,8 @@ public void canCreateASpanEventWithLongArrayAttributes() {
331333
}
332334

333335
assertThat(allSpans).hasSize(1);
334-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
335-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
336+
List<EventData> timedEvents = allSpans.get(0).getEvents();
337+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
336338
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
337339
}
338340

@@ -354,8 +356,8 @@ public void canCreateASpanEventWithStringAttribute() {
354356
}
355357

356358
assertThat(allSpans).hasSize(1);
357-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
358-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
359+
List<EventData> timedEvents = allSpans.get(0).getEvents();
360+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
359361
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
360362
}
361363

@@ -380,8 +382,8 @@ public void canCreateASpanEventWithStringArrayAttributes() {
380382
}
381383

382384
assertThat(allSpans).hasSize(1);
383-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
384-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
385+
List<EventData> timedEvents = allSpans.get(0).getEvents();
386+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
385387
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
386388
}
387389

@@ -405,8 +407,8 @@ public void canCreateASpanEventWithSameAttributeType() {
405407
}
406408

407409
assertThat(allSpans).hasSize(1);
408-
List<SpanData.Event> timedEvents = allSpans.get(0).getEvents();
409-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
410+
List<EventData> timedEvents = allSpans.get(0).getEvents();
411+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
410412
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
411413
}
412414

@@ -439,8 +441,8 @@ public void canCreateASpanEventWithMultipleAttributeTypes() {
439441
SpanData spanData = allSpans.get(0);
440442
assertThat(spanData.getEvents()).hasSize(1);
441443

442-
List<SpanData.Event> timedEvents = spanData.getEvents();
443-
assertThat(timedEvents).element(0).extracting(SpanData.Event::getName).isEqualTo(event);
444+
List<EventData> timedEvents = spanData.getEvents();
445+
assertThat(timedEvents).element(0).extracting(EventData::getName).isEqualTo(event);
444446
assertThat(timedEvents.get(0).getAttributes()).isEqualTo(attributes.build());
445447
}
446448

‎java/maven_deps.bzl‎

Lines changed: 3 additions & 9 deletions
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.53.Final"
6-
opentelemetry_version = "0.13.1"
6+
opentelemetry_version = "0.14.1"
77

88
maven_install(
99
artifacts = [
@@ -40,11 +40,9 @@ def selenium_java_deps():
4040
"io.netty:netty-transport-native-kqueue:jar:osx-x86_64:%s" % netty_version,
4141
"io.netty:netty-transport-native-unix-common:%s" % netty_version,
4242
"io.opentelemetry:opentelemetry-api:%s" % opentelemetry_version,
43-
"io.opentelemetry:opentelemetry-api-baggage:%s" % opentelemetry_version,
44-
"io.opentelemetry:opentelemetry-api-common:%s" % opentelemetry_version,
45-
"io.opentelemetry:opentelemetry-api-trace:%s" % opentelemetry_version,
4643
"io.opentelemetry:opentelemetry-context:%s" % opentelemetry_version,
4744
"io.opentelemetry:opentelemetry-exporter-logging:%s" % opentelemetry_version,
45+
"io.opentelemetry:opentelemetry-semconv:%s" % opentelemetry_version,
4846
"io.opentelemetry:opentelemetry-sdk:%s" % opentelemetry_version,
4947
"io.opentelemetry:opentelemetry-sdk-common:%s" % opentelemetry_version,
5048
"io.opentelemetry:opentelemetry-sdk-testing:%s" % opentelemetry_version,
@@ -86,10 +84,6 @@ def selenium_java_deps():
8684
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
8785
"org.hamcrest:hamcrest-core",
8886
"io.netty:netty-all", # Depend on the actual things you need
89-
"io.opentelemetry:opentelemetry-api-trace",
90-
"io.opentelemetry:opentelemetry-api-common",
91-
"io.opentelemetry:opentelemetry-context",
92-
"io.opentelemetry:opentelemetry-api-baggage",
9387
],
9488
override_targets = {
9589
"org.seleniumhq.selenium:selenium-api": "@//java/client/src/org/openqa/selenium:core",
@@ -100,8 +94,8 @@ def selenium_java_deps():
10094
fetch_sources = True,
10195
strict_visibility = True,
10296
repositories = [
103-
"https://jcenter.bintray.com/",
10497
"https://repo1.maven.org/maven2",
98+
"https://jcenter.bintray.com/",
10599
"https://maven.google.com",
106100
],
107101
maven_install_json = "@selenium//java:maven_install.json",

0 commit comments

Comments
 (0)