Skip to content

Commit 892babe

Browse files
committed
[java] remove usage of deprecated SemanticAttributes class #15384
1 parent 80feb18 commit 892babe

File tree

5 files changed

+22
-39
lines changed

5 files changed

+22
-39
lines changed

Diff for: MODULE.bazel

-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ maven.install(
200200
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201201
"io.opentelemetry:opentelemetry-sdk-testing",
202202
"io.opentelemetry:opentelemetry-sdk-trace",
203-
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
204203
"it.ozimov:embedded-redis:0.7.3",
205204
"net.bytebuddy:byte-buddy:1.15.11",
206205
"org.htmlunit:htmlunit-core-js:4.7.0",

Diff for: java/maven_install.json

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1807026653,
4-
"__RESOLVED_ARTIFACTS_HASH": 978919996,
3+
"__INPUT_ARTIFACTS_HASH": -1085430726,
4+
"__RESOLVED_ARTIFACTS_HASH": 2146462613,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -324,13 +324,6 @@
324324
},
325325
"version": "4.1.118.Final"
326326
},
327-
"io.opentelemetry.semconv:opentelemetry-semconv": {
328-
"shasums": {
329-
"jar": "e8ab86e93cef09e421a6213f4cf18421fcc6e1f9cf0ab94b9a31ed4460ddf553",
330-
"sources": "b0588ae0617071c30451fe0f4916b2cde7aa8d24b542ee696a7bf59f7d7f46a8"
331-
},
332-
"version": "1.28.0-alpha"
333-
},
334327
"io.opentelemetry:opentelemetry-api": {
335328
"shasums": {
336329
"jar": "2a7658998f1da7a3730eada9c81f5005899484a1b35b8021e59884b9aaccdaf0",
@@ -1624,9 +1617,6 @@
16241617
"io.netty:netty-transport-native-unix-common": [
16251618
"io.netty.channel.unix"
16261619
],
1627-
"io.opentelemetry.semconv:opentelemetry-semconv": [
1628-
"io.opentelemetry.semconv"
1629-
],
16301620
"io.opentelemetry:opentelemetry-api": [
16311621
"io.opentelemetry.api",
16321622
"io.opentelemetry.api.baggage",
@@ -2976,8 +2966,6 @@
29762966
"io.netty:netty-transport-native-unix-common",
29772967
"io.netty:netty-transport-native-unix-common:jar:sources",
29782968
"io.netty:netty-transport:jar:sources",
2979-
"io.opentelemetry.semconv:opentelemetry-semconv",
2980-
"io.opentelemetry.semconv:opentelemetry-semconv:jar:sources",
29812969
"io.opentelemetry:opentelemetry-api",
29822970
"io.opentelemetry:opentelemetry-api-incubator",
29832971
"io.opentelemetry:opentelemetry-api-incubator:jar:sources",

Diff for: java/src/org/openqa/selenium/remote/tracing/AttributeKey.java

+20-22
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,27 @@
1717

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

20-
import io.opentelemetry.semconv.SemanticAttributes;
21-
2220
public enum AttributeKey {
23-
EXCEPTION_EVENT(SemanticAttributes.EXCEPTION_EVENT_NAME),
24-
EXCEPTION_TYPE(SemanticAttributes.EXCEPTION_TYPE.getKey()),
25-
EXCEPTION_MESSAGE(SemanticAttributes.EXCEPTION_MESSAGE.getKey()),
26-
EXCEPTION_STACKTRACE(SemanticAttributes.EXCEPTION_STACKTRACE.getKey()),
21+
EXCEPTION_EVENT("exception"),
22+
EXCEPTION_TYPE("exception.type"),
23+
EXCEPTION_MESSAGE("exception.message"),
24+
EXCEPTION_STACKTRACE("exception.stacktrace"),
2725

2826
SPAN_KIND("span.kind"),
2927

30-
HTTP_METHOD(SemanticAttributes.HTTP_METHOD.getKey()),
31-
HTTP_URL(SemanticAttributes.HTTP_URL.getKey()),
32-
HTTP_STATUS_CODE(SemanticAttributes.HTTP_STATUS_CODE.getKey()),
33-
HTTP_TARGET_HOST(SemanticAttributes.HTTP_TARGET.getKey()),
28+
HTTP_METHOD("http.method"),
29+
HTTP_URL("http.url"),
30+
HTTP_STATUS_CODE("http.status_code"),
31+
HTTP_TARGET_HOST("http.target"),
3432
HTTP_CLIENT_CLASS("http.client_class"),
3533
HTTP_HANDLER_CLASS("http.handler_class"),
36-
HTTP_USER_AGENT(SemanticAttributes.HTTP_USER_AGENT.getKey()),
37-
HTTP_HOST(SemanticAttributes.HTTP_HOST.getKey()),
38-
HTTP_TARGET(SemanticAttributes.HTTP_TARGET.getKey()),
39-
HTTP_REQUEST_CONTENT_LENGTH(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH.getKey()),
40-
HTTP_CLIENT_IP(SemanticAttributes.HTTP_CLIENT_IP.getKey()),
41-
HTTP_SCHEME(SemanticAttributes.HTTP_SCHEME.getKey()),
42-
HTTP_FLAVOR(SemanticAttributes.HTTP_FLAVOR.getKey()),
34+
HTTP_USER_AGENT("http.user_agent"),
35+
HTTP_HOST("http.host"),
36+
HTTP_TARGET("http.target"),
37+
HTTP_REQUEST_CONTENT_LENGTH("http.request_content_length"),
38+
HTTP_CLIENT_IP("http.client_ip"),
39+
HTTP_SCHEME("http.scheme"),
40+
HTTP_FLAVOR("http.flavor"),
4341

4442
ERROR("error"),
4543

@@ -54,11 +52,11 @@ public enum AttributeKey {
5452
SESSION_CAPABILITIES("session.capabilities"),
5553
SESSION_URI("session.uri"),
5654

57-
DATABASE_STATEMENT(SemanticAttributes.DB_STATEMENT.getKey()),
58-
DATABASE_OPERATION(SemanticAttributes.DB_OPERATION.getKey()),
59-
DATABASE_USER(SemanticAttributes.DB_USER.getKey()),
60-
DATABASE_CONNECTION_STRING(SemanticAttributes.DB_CONNECTION_STRING.getKey()),
61-
DATABASE_SYSTEM(SemanticAttributes.DB_SYSTEM.getKey()),
55+
DATABASE_STATEMENT("db.statement"),
56+
DATABASE_OPERATION("db.operation"),
57+
DATABASE_USER("db.user"),
58+
DATABASE_CONNECTION_STRING("db.connection_string"),
59+
DATABASE_SYSTEM("db.system"),
6260

6361
REQUEST_ID("request.id");
6462

Diff for: java/src/org/openqa/selenium/remote/tracing/BUILD.bazel

-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ java_library(
2828
"//java/src/org/openqa/selenium:core",
2929
"//java/src/org/openqa/selenium/remote/http",
3030
artifact("io.opentelemetry:opentelemetry-api"),
31-
artifact("io.opentelemetry.semconv:opentelemetry-semconv"),
3231
],
3332
)

Diff for: java/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel

-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ java_library(
2121
artifact("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"),
2222
artifact("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure"),
2323
artifact("io.opentelemetry:opentelemetry-sdk-trace"),
24-
artifact("io.opentelemetry.semconv:opentelemetry-semconv"),
2524
],
2625
)

0 commit comments

Comments
 (0)