Skip to content

Commit 955470a

Browse files
SylvainJugerenovate[bot]
SylvainJuge
and
renovate[bot]
authored
Semconv 1.25.0 migration (#10983)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 0bc2372 commit 955470a

File tree

417 files changed

+6396
-5685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+6396
-5685
lines changed

‎conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ tasks.withType<ShadowJar>().configureEach {
2828
// relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
2929
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
3030
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
31+
relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating")
3132
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
3233
relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
3334
}

‎dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ val asmVersion = "9.7"
4646
val jmhVersion = "1.37"
4747
val mockitoVersion = "4.11.0"
4848
val slf4jVersion = "2.0.12"
49+
val semConvVersion = "1.25.0-alpha"
4950

5051
val CORE_DEPENDENCIES = listOf(
51-
"io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha",
52+
"io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
53+
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}",
5254
"com.google.auto.service:auto-service:${autoServiceVersion}",
5355
"com.google.auto.service:auto-service-annotations:${autoServiceVersion}",
5456
"com.google.auto.value:auto-value:${autoValueVersion}",

‎examples/distro/gradle/shadow.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ext.relocatePackages = { shadowJar ->
1212
// relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
1313
shadowJar.relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
1414
shadowJar.relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
15+
shadowJar.relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating")
1516
shadowJar.relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
1617
shadowJar.relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
1718

‎instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
10-
import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION;
11-
import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE;
10+
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
11+
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
1212
import static org.assertj.core.api.Assertions.assertThat;
1313
import static org.assertj.core.api.Assertions.catchThrowable;
1414

‎instrumentation-annotations-support/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies {
1212

1313
api("io.opentelemetry:opentelemetry-api")
1414
api("io.opentelemetry.semconv:opentelemetry-semconv")
15+
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1516

1617
compileOnly("com.google.auto.value:auto-value-annotations")
1718
annotationProcessor("com.google.auto.value:auto-value")

‎instrumentation-api-incubator/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ group = "io.opentelemetry.instrumentation"
1212

1313
dependencies {
1414
api("io.opentelemetry.semconv:opentelemetry-semconv")
15+
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1516
api(project(":instrumentation-api"))
1617
implementation("io.opentelemetry:opentelemetry-extension-incubator")
1718

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.context.Context;
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
13-
import io.opentelemetry.semconv.SemanticAttributes;
13+
import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
1414
import javax.annotation.Nullable;
1515

1616
/**
@@ -37,9 +37,9 @@ private CodeAttributesExtractor(CodeAttributesGetter<REQUEST> getter) {
3737
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
3838
Class<?> cls = getter.getCodeClass(request);
3939
if (cls != null) {
40-
internalSet(attributes, SemanticAttributes.CODE_NAMESPACE, cls.getName());
40+
internalSet(attributes, CodeIncubatingAttributes.CODE_NAMESPACE, cls.getName());
4141
}
42-
internalSet(attributes, SemanticAttributes.CODE_FUNCTION, getter.getMethodName(request));
42+
internalSet(attributes, CodeIncubatingAttributes.CODE_FUNCTION, getter.getMethodName(request));
4343
}
4444

4545
@Override

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.context.Context;
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
13-
import io.opentelemetry.semconv.SemanticAttributes;
13+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1414

1515
/**
1616
* Extractor of <a
@@ -38,7 +38,7 @@ public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
3838
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
3939
super.onStart(attributes, parentContext, request);
4040

41-
internalSet(attributes, SemanticAttributes.DB_STATEMENT, getter.getStatement(request));
42-
internalSet(attributes, SemanticAttributes.DB_OPERATION, getter.getOperation(request));
41+
internalSet(attributes, DbIncubatingAttributes.DB_STATEMENT, getter.getStatement(request));
42+
internalSet(attributes, DbIncubatingAttributes.DB_OPERATION, getter.getOperation(request));
4343
}
4444
}

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.internal.SpanKey;
1414
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
15-
import io.opentelemetry.semconv.SemanticAttributes;
15+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1616
import javax.annotation.Nullable;
1717

1818
abstract class DbClientCommonAttributesExtractor<
@@ -25,13 +25,16 @@ abstract class DbClientCommonAttributesExtractor<
2525
this.getter = getter;
2626
}
2727

28+
@SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation
2829
@Override
2930
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
30-
internalSet(attributes, SemanticAttributes.DB_SYSTEM, getter.getSystem(request));
31-
internalSet(attributes, SemanticAttributes.DB_USER, getter.getUser(request));
32-
internalSet(attributes, SemanticAttributes.DB_NAME, getter.getName(request));
31+
internalSet(attributes, DbIncubatingAttributes.DB_SYSTEM, getter.getSystem(request));
32+
internalSet(attributes, DbIncubatingAttributes.DB_USER, getter.getUser(request));
33+
internalSet(attributes, DbIncubatingAttributes.DB_NAME, getter.getName(request));
3334
internalSet(
34-
attributes, SemanticAttributes.DB_CONNECTION_STRING, getter.getConnectionString(request));
35+
attributes,
36+
DbIncubatingAttributes.DB_CONNECTION_STRING,
37+
getter.getConnectionString(request));
3538
}
3639

3740
@Override

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
import io.opentelemetry.api.common.AttributesBuilder;
1212
import io.opentelemetry.context.Context;
1313
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
14-
import io.opentelemetry.semconv.SemanticAttributes;
14+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1515

1616
/**
1717
* Extractor of <a
1818
* href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md">database
1919
* attributes</a>. This class is designed with SQL (or SQL-like) database clients in mind.
2020
*
2121
* <p>It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional
22-
* <code>{@linkplain SemanticAttributes#DB_SQL_TABLE db.sql.table}</code> attribute. The raw SQL
23-
* statements returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are
24-
* sanitized before use, all statement parameters are removed.
22+
* <code>{@link DbIncubatingAttributes#DB_SQL_TABLE}</code> attribute. The raw SQL statements
23+
* returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are sanitized
24+
* before use, all statement parameters are removed.
2525
*/
2626
public final class SqlClientAttributesExtractor<REQUEST, RESPONSE>
2727
extends DbClientCommonAttributesExtractor<
@@ -62,8 +62,9 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
6262

6363
SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.getRawStatement(request));
6464
String operation = sanitizedStatement.getOperation();
65-
internalSet(attributes, SemanticAttributes.DB_STATEMENT, sanitizedStatement.getFullStatement());
66-
internalSet(attributes, SemanticAttributes.DB_OPERATION, operation);
65+
internalSet(
66+
attributes, DbIncubatingAttributes.DB_STATEMENT, sanitizedStatement.getFullStatement());
67+
internalSet(attributes, DbIncubatingAttributes.DB_OPERATION, operation);
6768
if (!SQL_CALL.equals(operation)) {
6869
internalSet(attributes, dbTableAttribute, sanitizedStatement.getMainIdentifier());
6970
}

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1111
import io.opentelemetry.api.common.AttributeKey;
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
13-
import io.opentelemetry.semconv.SemanticAttributes;
13+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1414

1515
/** A builder of {@link SqlClientAttributesExtractor}. */
1616
public final class SqlClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
1717

1818
final SqlClientAttributesGetter<REQUEST> getter;
19-
AttributeKey<String> dbTableAttribute = SemanticAttributes.DB_SQL_TABLE;
19+
AttributeKey<String> dbTableAttribute = DbIncubatingAttributes.DB_SQL_TABLE;
2020
boolean statementSanitizationEnabled = true;
2121

2222
SqlClientAttributesExtractorBuilder(SqlClientAttributesGetter<REQUEST> getter) {
@@ -26,7 +26,7 @@ public final class SqlClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
2626
/**
2727
* Configures the extractor to set the table value extracted by the {@link
2828
* SqlClientAttributesExtractor} under the {@code dbTableAttribute} key. By default, the <code>
29-
* {@linkplain SemanticAttributes#DB_SQL_TABLE db.sql.table}</code> attribute is used.
29+
* {@link DbIncubatingAttributes#DB_SQL_TABLE}</code> attribute is used.
3030
*
3131
* @param dbTableAttribute The {@link AttributeKey} under which the table extracted by the {@link
3232
* SqlClientAttributesExtractor} will be stored.

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.instrumentation.api.incubator.semconv.net.internal.UrlParser;
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
14-
import io.opentelemetry.semconv.SemanticAttributes;
14+
import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes;
1515
import java.util.function.Supplier;
1616
import javax.annotation.Nullable;
1717

@@ -67,7 +67,7 @@ public void onEnd(
6767
Supplier<String> pathSupplier = () -> getUrlPath(attributesGetter, request);
6868
String peerService = mapToPeerService(serverAddress, serverPort, pathSupplier);
6969
if (peerService != null) {
70-
attributes.put(SemanticAttributes.PEER_SERVICE, peerService);
70+
attributes.put(PeerIncubatingAttributes.PEER_SERVICE, peerService);
7171
}
7272
}
7373

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
1414
import io.opentelemetry.instrumentation.api.semconv.http.HttpCommonAttributesGetter;
1515
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
16-
import io.opentelemetry.semconv.SemanticAttributes;
16+
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
1717
import java.util.List;
1818
import javax.annotation.Nullable;
1919

@@ -49,11 +49,11 @@ public void onEnd(
4949
@Nullable Throwable error) {
5050

5151
Long requestBodySize = requestBodySize(request);
52-
internalSet(attributes, SemanticAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize);
52+
internalSet(attributes, HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize);
5353

5454
if (response != null) {
5555
Long responseBodySize = responseBodySize(request, response);
56-
internalSet(attributes, SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, responseBodySize);
56+
internalSet(attributes, HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, responseBodySize);
5757
}
5858
}
5959

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
import io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
1212
import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder;
1313
import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder;
14-
import io.opentelemetry.semconv.SemanticAttributes;
14+
import io.opentelemetry.semconv.ErrorAttributes;
15+
import io.opentelemetry.semconv.HttpAttributes;
16+
import io.opentelemetry.semconv.NetworkAttributes;
17+
import io.opentelemetry.semconv.ServerAttributes;
18+
import io.opentelemetry.semconv.UrlAttributes;
1519

1620
final class HttpExperimentalMetricsAdvice {
1721

@@ -22,13 +26,13 @@ static void applyClientRequestSizeAdvice(LongHistogramBuilder builder) {
2226
((ExtendedLongHistogramBuilder) builder)
2327
.setAttributesAdvice(
2428
asList(
25-
SemanticAttributes.HTTP_REQUEST_METHOD,
26-
SemanticAttributes.HTTP_RESPONSE_STATUS_CODE,
27-
SemanticAttributes.ERROR_TYPE,
28-
SemanticAttributes.NETWORK_PROTOCOL_NAME,
29-
SemanticAttributes.NETWORK_PROTOCOL_VERSION,
30-
SemanticAttributes.SERVER_ADDRESS,
31-
SemanticAttributes.SERVER_PORT));
29+
HttpAttributes.HTTP_REQUEST_METHOD,
30+
HttpAttributes.HTTP_RESPONSE_STATUS_CODE,
31+
ErrorAttributes.ERROR_TYPE,
32+
NetworkAttributes.NETWORK_PROTOCOL_NAME,
33+
NetworkAttributes.NETWORK_PROTOCOL_VERSION,
34+
ServerAttributes.SERVER_ADDRESS,
35+
ServerAttributes.SERVER_PORT));
3236
}
3337

3438
static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) {
@@ -39,13 +43,13 @@ static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) {
3943
.setAttributesAdvice(
4044
asList(
4145
// stable attributes
42-
SemanticAttributes.HTTP_ROUTE,
43-
SemanticAttributes.HTTP_REQUEST_METHOD,
44-
SemanticAttributes.HTTP_RESPONSE_STATUS_CODE,
45-
SemanticAttributes.ERROR_TYPE,
46-
SemanticAttributes.NETWORK_PROTOCOL_NAME,
47-
SemanticAttributes.NETWORK_PROTOCOL_VERSION,
48-
SemanticAttributes.URL_SCHEME));
46+
HttpAttributes.HTTP_ROUTE,
47+
HttpAttributes.HTTP_REQUEST_METHOD,
48+
HttpAttributes.HTTP_RESPONSE_STATUS_CODE,
49+
ErrorAttributes.ERROR_TYPE,
50+
NetworkAttributes.NETWORK_PROTOCOL_NAME,
51+
NetworkAttributes.NETWORK_PROTOCOL_VERSION,
52+
UrlAttributes.URL_SCHEME));
4953
}
5054

5155
static void applyServerActiveRequestsAdvice(LongUpDownCounterBuilder builder) {
@@ -56,7 +60,7 @@ static void applyServerActiveRequestsAdvice(LongUpDownCounterBuilder builder) {
5660
.setAttributesAdvice(
5761
asList(
5862
// https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-metrics.md#metric-httpserveractive_requests
59-
SemanticAttributes.HTTP_REQUEST_METHOD, SemanticAttributes.URL_SCHEME));
63+
HttpAttributes.HTTP_REQUEST_METHOD, UrlAttributes.URL_SCHEME));
6064
}
6165

6266
private HttpExperimentalMetricsAdvice() {}

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpMessageBodySizeUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.common.Attributes;
10-
import io.opentelemetry.semconv.SemanticAttributes;
10+
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
1111
import javax.annotation.Nullable;
1212

1313
final class HttpMessageBodySizeUtil {
1414

1515
@Nullable
1616
static Long getHttpRequestBodySize(Attributes... attributesList) {
17-
return getAttribute(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, attributesList);
17+
return getAttribute(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, attributesList);
1818
}
1919

2020
@Nullable
2121
static Long getHttpResponseBodySize(Attributes... attributesList) {
22-
return getAttribute(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, attributesList);
22+
return getAttribute(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, attributesList);
2323
}
2424

2525
@Nullable

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.internal.SpanKey;
1414
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
15-
import io.opentelemetry.semconv.SemanticAttributes;
15+
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
1616
import java.util.List;
1717
import javax.annotation.Nullable;
1818

@@ -62,40 +62,46 @@ public static <REQUEST, RESPONSE> MessagingAttributesExtractorBuilder<REQUEST, R
6262

6363
@Override
6464
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
65-
internalSet(attributes, SemanticAttributes.MESSAGING_SYSTEM, getter.getSystem(request));
65+
internalSet(
66+
attributes, MessagingIncubatingAttributes.MESSAGING_SYSTEM, getter.getSystem(request));
6667
boolean isTemporaryDestination = getter.isTemporaryDestination(request);
6768
if (isTemporaryDestination) {
68-
internalSet(attributes, SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true);
69-
internalSet(attributes, SemanticAttributes.MESSAGING_DESTINATION_NAME, TEMP_DESTINATION_NAME);
69+
internalSet(attributes, MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, true);
70+
internalSet(
71+
attributes,
72+
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
73+
TEMP_DESTINATION_NAME);
7074
} else {
7175
internalSet(
7276
attributes,
73-
SemanticAttributes.MESSAGING_DESTINATION_NAME,
77+
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
7478
getter.getDestination(request));
7579
internalSet(
7680
attributes,
77-
SemanticAttributes.MESSAGING_DESTINATION_TEMPLATE,
81+
MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPLATE,
7882
getter.getDestinationTemplate(request));
7983
}
8084
boolean isAnonymousDestination = getter.isAnonymousDestination(request);
8185
if (isAnonymousDestination) {
82-
internalSet(attributes, SemanticAttributes.MESSAGING_DESTINATION_ANONYMOUS, true);
86+
internalSet(attributes, MessagingIncubatingAttributes.MESSAGING_DESTINATION_ANONYMOUS, true);
8387
}
8488
internalSet(
8589
attributes,
86-
SemanticAttributes.MESSAGING_MESSAGE_CONVERSATION_ID,
90+
MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID,
8791
getter.getConversationId(request));
8892
internalSet(
8993
attributes,
90-
SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE,
94+
MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE,
9195
getter.getMessageBodySize(request));
9296
internalSet(
9397
attributes,
94-
SemanticAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE,
98+
MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE,
9599
getter.getMessageEnvelopeSize(request));
96-
internalSet(attributes, SemanticAttributes.MESSAGING_CLIENT_ID, getter.getClientId(request));
100+
internalSet(
101+
attributes, MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, getter.getClientId(request));
97102
if (operation != null) {
98-
internalSet(attributes, SemanticAttributes.MESSAGING_OPERATION, operation.operationName());
103+
internalSet(
104+
attributes, MessagingIncubatingAttributes.MESSAGING_OPERATION, operation.operationName());
99105
}
100106
}
101107

@@ -108,11 +114,11 @@ public void onEnd(
108114
@Nullable Throwable error) {
109115
internalSet(
110116
attributes,
111-
SemanticAttributes.MESSAGING_MESSAGE_ID,
117+
MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID,
112118
getter.getMessageId(request, response));
113119
internalSet(
114120
attributes,
115-
SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT,
121+
MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT,
116122
getter.getBatchMessageCount(request, response));
117123

118124
for (String name : capturedHeaders) {

0 commit comments

Comments
 (0)