Skip to content

Commit 3b77cc4

Browse files
trasklaurit
andauthored
Semconv 1.21 (#9408)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 1ad203a commit 3b77cc4

File tree

395 files changed

+806
-811
lines changed

Some content is hidden

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

395 files changed

+806
-811
lines changed

conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ plugins {
1616
val latestReleasedVersion: String by lazy {
1717
// hack to find the current released version of the project
1818
val temp: Configuration = configurations.create("tempConfig")
19-
// pick the agent, since it's always there.
20-
dependencies.add(temp.name, "io.opentelemetry.javaagent:opentelemetry-javaagent:latest.release")
19+
// pick the bom, since we don't use dependency substitution on it.
20+
dependencies.add(temp.name, "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:latest.release")
2121
val moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion
2222

2323
configurations.remove(temp)

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+1-6
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ configurations.configureEach {
412412
substitute(module("io.opentelemetry.javaagent:opentelemetry-agent-for-testing")).using(project(":testing:agent-for-testing"))
413413
substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common"))
414414
substitute(module("io.opentelemetry.javaagent:opentelemetry-muzzle")).using(project(":muzzle"))
415+
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent")).using(project(":javaagent"))
415416
}
416417

417418
// The above substitutions ensure dependencies managed by this BOM for external projects refer to this repo's projects here.
@@ -420,9 +421,3 @@ configurations.configureEach {
420421
exclude("io.opentelemetry.instrumentation", "opentelemetry-instrumentation-bom-alpha")
421422
}
422423
}
423-
424-
// Pin opentelemetry-semconv to last version where io.opentelemetry.semconv.trace.attributes.SemanticAttributes
425-
// isn't deprecated.
426-
configurations.configureEach {
427-
resolutionStrategy.force("io.opentelemetry:opentelemetry-semconv:1.29.0-alpha")
428-
}

dependencyManagement/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ val mockitoVersion = "4.11.0"
4747
val slf4jVersion = "2.0.9"
4848

4949
val CORE_DEPENDENCIES = listOf(
50+
"io.opentelemetry.semconv:opentelemetry-semconv:1.21.0-alpha",
5051
"com.google.auto.service:auto-service:${autoServiceVersion}",
5152
"com.google.auto.service:auto-service-annotations:${autoServiceVersion}",
5253
"com.google.auto.value:auto-value:${autoValueVersion}",

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

+2-2
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.trace.attributes.SemanticAttributes.CODE_FUNCTION;
11-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_NAMESPACE;
10+
import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION;
11+
import static io.opentelemetry.semconv.SemanticAttributes.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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
implementation(project(":instrumentation-api"))
1212

1313
api("io.opentelemetry:opentelemetry-api")
14-
api("io.opentelemetry:opentelemetry-semconv")
14+
api("io.opentelemetry.semconv:opentelemetry-semconv")
1515

1616
compileOnly("com.google.auto.value:auto-value-annotations")
1717
annotationProcessor("com.google.auto.value:auto-value")

instrumentation-api-semconv/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
group = "io.opentelemetry.instrumentation"
1212

1313
dependencies {
14-
api("io.opentelemetry:opentelemetry-semconv")
14+
api("io.opentelemetry.semconv:opentelemetry-semconv")
1515
api(project(":instrumentation-api"))
1616
implementation("io.opentelemetry:opentelemetry-extension-incubator")
1717

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

+1-1
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.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414
import javax.annotation.Nullable;
1515

1616
/**

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

+1-1
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.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414

1515
/**
1616
* Extractor of <a

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

+1-1
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.trace.attributes.SemanticAttributes;
15+
import io.opentelemetry.semconv.SemanticAttributes;
1616
import javax.annotation.Nullable;
1717

1818
abstract class DbClientCommonAttributesExtractor<

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.opentelemetry.instrumentation.api.db.SqlStatementInfo;
1414
import io.opentelemetry.instrumentation.api.db.SqlStatementSanitizer;
1515
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
16-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
16+
import io.opentelemetry.semconv.SemanticAttributes;
1717

1818
/**
1919
* Extractor of <a

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.api.common.AttributeKey;
1212
import io.opentelemetry.instrumentation.api.db.SqlStatementSanitizer;
1313
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
14-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
14+
import io.opentelemetry.semconv.SemanticAttributes;
1515

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

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1818
import io.opentelemetry.instrumentation.api.internal.SpanKey;
1919
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
20-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
20+
import io.opentelemetry.semconv.SemanticAttributes;
2121
import java.util.function.ToIntFunction;
2222
import javax.annotation.Nullable;
2323

@@ -101,6 +101,7 @@ public static <REQUEST, RESPONSE> HttpClientAttributesExtractorBuilder<REQUEST,
101101
}
102102

103103
@Override
104+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
104105
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
105106
super.onStart(attributes, parentContext, request);
106107

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1717
import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
1818
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
19-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
19+
import io.opentelemetry.semconv.SemanticAttributes;
2020
import java.util.HashSet;
2121
import java.util.List;
2222
import java.util.Set;
@@ -48,6 +48,7 @@ abstract class HttpCommonAttributesExtractor<
4848
}
4949

5050
@Override
51+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
5152
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
5253
String method = getter.getHttpRequestMethod(request);
5354
if (SemconvStability.emitStableHttpSemconv()) {
@@ -72,6 +73,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
7273
}
7374

7475
@Override
76+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
7577
public void onEnd(
7678
AttributesBuilder attributes,
7779
Context context,

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
import io.opentelemetry.api.common.Attributes;
1010
import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
1111
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
12-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
12+
import io.opentelemetry.semconv.SemanticAttributes;
1313
import javax.annotation.Nullable;
1414

1515
final class HttpMessageBodySizeUtil {
1616

17+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
1718
private static final AttributeKey<Long> HTTP_REQUEST_BODY_SIZE =
1819
SemconvStability.emitOldHttpSemconv()
1920
? SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH
2021
: HttpAttributes.HTTP_REQUEST_BODY_SIZE;
2122

23+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
2224
private static final AttributeKey<Long> HTTP_RESPONSE_BODY_SIZE =
2325
SemconvStability.emitOldHttpSemconv()
2426
? SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpMetricsAdvice.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
1717
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes;
1818
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes;
19-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
19+
import io.opentelemetry.semconv.SemanticAttributes;
2020

2121
final class HttpMetricsAdvice {
2222

@@ -38,6 +38,7 @@ static void applyStableClientDurationAdvice(DoubleHistogramBuilder builder) {
3838
NetworkAttributes.SERVER_SOCKET_ADDRESS)));
3939
}
4040

41+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
4142
static void applyOldClientDurationAdvice(DoubleHistogramBuilder builder) {
4243
if (!(builder instanceof ExtendedDoubleHistogramBuilder)) {
4344
return;
@@ -56,6 +57,7 @@ static void applyOldClientDurationAdvice(DoubleHistogramBuilder builder) {
5657
SemanticAttributes.NET_SOCK_PEER_ADDR)));
5758
}
5859

60+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
5961
static void applyClientRequestSizeAdvice(LongHistogramBuilder builder) {
6062
if (!(builder instanceof ExtendedLongHistogramBuilder)) {
6163
return;
@@ -100,6 +102,7 @@ static void applyStableServerDurationAdvice(DoubleHistogramBuilder builder) {
100102
UrlAttributes.URL_SCHEME)));
101103
}
102104

105+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
103106
static void applyOldServerDurationAdvice(DoubleHistogramBuilder builder) {
104107
if (!(builder instanceof ExtendedDoubleHistogramBuilder)) {
105108
return;
@@ -119,6 +122,7 @@ static void applyOldServerDurationAdvice(DoubleHistogramBuilder builder) {
119122
SemanticAttributes.NET_PROTOCOL_VERSION)));
120123
}
121124

125+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
122126
static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) {
123127
if (!(builder instanceof ExtendedLongHistogramBuilder)) {
124128
return;
@@ -146,6 +150,7 @@ static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) {
146150
SemanticAttributes.NET_PROTOCOL_VERSION)));
147151
}
148152

153+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
149154
static void applyServerActiveRequestsAdvice(LongUpDownCounterBuilder builder) {
150155
if (!(builder instanceof ExtendedLongUpDownCounterBuilder)) {
151156
return;

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.InternalUrlAttributesExtractor;
1818
import io.opentelemetry.instrumentation.api.internal.SpanKey;
1919
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
20-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
20+
import io.opentelemetry.semconv.SemanticAttributes;
2121
import java.util.function.Function;
2222
import javax.annotation.Nullable;
2323

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerRoute.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1212
import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan;
1313
import io.opentelemetry.instrumentation.api.internal.HttpRouteState;
14-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
14+
import io.opentelemetry.semconv.SemanticAttributes;
1515
import javax.annotation.Nullable;
1616

1717
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1717
import io.opentelemetry.instrumentation.api.internal.SpanKey;
1818
import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
19-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
19+
import io.opentelemetry.semconv.SemanticAttributes;
2020
import java.util.List;
2121
import javax.annotation.Nullable;
2222

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1111
import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
1212
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
13-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414
import java.util.Map;
1515
import javax.annotation.Nullable;
1616

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.AddressAndPort;
1212
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.FallbackAddressPortExtractor;
13-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414
import javax.annotation.Nullable;
1515

1616
/**

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.AddressAndPort;
1212
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.FallbackAddressPortExtractor;
13-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414

1515
/**
1616
* This class is internal and is hence not for public use. Its APIs are unstable and can change at

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalClientAttributesExtractor.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.instrumentation.api.instrumenter.network.ClientAttributesGetter;
12-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
12+
import io.opentelemetry.semconv.SemanticAttributes;
1313
import javax.annotation.Nullable;
1414

1515
/**
@@ -34,6 +34,7 @@ public InternalClientAttributesExtractor(
3434
this.emitOldHttpAttributes = emitOldHttpAttributes;
3535
}
3636

37+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
3738
public void onStart(AttributesBuilder attributes, REQUEST request) {
3839
AddressAndPort clientAddressAndPort = extractClientAddressAndPort(request);
3940

@@ -48,6 +49,7 @@ public void onStart(AttributesBuilder attributes, REQUEST request) {
4849
}
4950
}
5051

52+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
5153
public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) {
5254
AddressAndPort clientAddressAndPort = extractClientAddressAndPort(request);
5355
String clientSocketAddress = getter.getClientSocketAddress(request, response);

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalNetworkAttributesExtractor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
12-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
12+
import io.opentelemetry.semconv.SemanticAttributes;
1313
import java.util.Locale;
1414
import javax.annotation.Nullable;
1515

@@ -35,6 +35,7 @@ public InternalNetworkAttributesExtractor(
3535
this.emitOldHttpAttributes = emitOldHttpAttributes;
3636
}
3737

38+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
3839
public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) {
3940
String protocolName = lowercase(getter.getNetworkProtocolName(request, response));
4041
String protocolVersion = lowercase(getter.getNetworkProtocolVersion(request, response));

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalServerAttributesExtractor.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.api.common.AttributeKey;
1111
import io.opentelemetry.api.common.AttributesBuilder;
1212
import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
13-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414
import java.util.function.BiPredicate;
1515
import javax.annotation.Nullable;
1616

@@ -117,7 +117,10 @@ private AddressAndPort extractServerAddressAndPort(REQUEST request) {
117117
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
118118
* any time.
119119
*/
120-
@SuppressWarnings("ImmutableEnumChecker")
120+
@SuppressWarnings({
121+
"ImmutableEnumChecker",
122+
"deprecation"
123+
}) // until old http semconv are dropped in 2.0
121124
public enum Mode {
122125
PEER(
123126
SemanticAttributes.NET_PEER_NAME,

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcCommonAttributesExtractor.java

+1-1
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.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414
import javax.annotation.Nullable;
1515

1616
abstract class RpcCommonAttributesExtractor<REQUEST, RESPONSE>

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcMetricsAdvice.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder;
1111
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes;
1212
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
13-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
13+
import io.opentelemetry.semconv.SemanticAttributes;
1414
import java.util.ArrayList;
1515
import java.util.List;
1616

1717
final class RpcMetricsAdvice {
1818

19+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
1920
static void applyClientDurationAdvice(DoubleHistogramBuilder builder) {
2021
if (!(builder instanceof ExtendedDoubleHistogramBuilder)) {
2122
return;
@@ -47,6 +48,7 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) {
4748
.setAdvice(advice -> advice.setAttributes(attributes));
4849
}
4950

51+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
5052
static void applyServerDurationAdvice(DoubleHistogramBuilder builder) {
5153
if (!(builder instanceof ExtendedDoubleHistogramBuilder)) {
5254
return;

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/url/internal/InternalUrlAttributesExtractor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.instrumentation.api.instrumenter.url.UrlAttributesGetter;
12-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
12+
import io.opentelemetry.semconv.SemanticAttributes;
1313
import java.util.function.Function;
1414
import javax.annotation.Nullable;
1515

@@ -35,6 +35,7 @@ public InternalUrlAttributesExtractor(
3535
this.emitOldHttpAttributes = emitOldHttpAttributes;
3636
}
3737

38+
@SuppressWarnings("deprecation") // until old http semconv are dropped in 2.0
3839
public void onStart(AttributesBuilder attributes, REQUEST request) {
3940
String urlScheme = getUrlScheme(request);
4041
String urlPath = getter.getUrlPath(request);

instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.opentelemetry.api.common.AttributesBuilder;
1313
import io.opentelemetry.context.Context;
1414
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
15-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
15+
import io.opentelemetry.semconv.SemanticAttributes;
1616
import java.util.Collections;
1717
import java.util.HashMap;
1818
import java.util.Map;

0 commit comments

Comments
 (0)