Skip to content

Commit 855c7a0

Browse files
renovate[bot]laurit
renovate[bot]
and
laurit
authored
fix(deps): update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.28.0-alpha (#12292)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent fe4de02 commit 855c7a0

File tree

143 files changed

+505
-376
lines changed

Some content is hidden

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

143 files changed

+505
-376
lines changed

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ val asmVersion = "9.7.1"
4646
val jmhVersion = "1.37"
4747
val mockitoVersion = "4.11.0"
4848
val slf4jVersion = "2.0.16"
49-
val semConvVersion = "1.25.0-alpha"
49+
val semConvVersion = "1.28.0-alpha"
5050

5151
val CORE_DEPENDENCIES = listOf(
5252
"io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.Map;
1919
import org.junit.jupiter.api.Test;
2020

21+
@SuppressWarnings("deprecation") // using deprecated semconv
2122
class SqlClientAttributesExtractorTest {
2223

2324
static final class TestAttributesGetter

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
class MessagingAttributesExtractorTest {
3131

32+
@SuppressWarnings("deprecation") // using deprecated semconv
3233
@ParameterizedTest
3334
@MethodSource("destinations")
3435
void shouldExtractAllAvailableAttributes(
@@ -88,7 +89,7 @@ void shouldExtractAllAvailableAttributes(
8889
entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, "42"));
8990
expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, 100L));
9091
expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE, 120L));
91-
expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, "43"));
92+
expectedEntries.add(entry(AttributeKey.stringKey("messaging.client_id"), "43"));
9293
expectedEntries.add(
9394
entry(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation.operationName()));
9495

‎instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class MessagingProducerMetricsTest {
2727
private static final double[] DURATION_BUCKETS =
2828
MessagingMetricsAdvice.DURATION_SECONDS_BUCKETS.stream().mapToDouble(d -> d).toArray();
2929

30+
@SuppressWarnings("deprecation") // using deprecated semconv
3031
@Test
3132
void collectsMetrics() {
3233
InMemoryMetricReader metricReader = InMemoryMetricReader.create();

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
130130
.hasAttributesSatisfyingExactly(
131131
equalTo(
132132
RpcIncubatingAttributes.RPC_SYSTEM,
133-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
133+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
134134
equalTo(
135135
RpcIncubatingAttributes.RPC_SERVICE,
136136
"org.apache.dubbo.rpc.service.GenericService"),
@@ -165,7 +165,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
165165
.hasAttributesSatisfying(
166166
equalTo(
167167
RpcIncubatingAttributes.RPC_SYSTEM,
168-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
168+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
169169
equalTo(
170170
RpcIncubatingAttributes.RPC_SERVICE,
171171
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
@@ -230,7 +230,7 @@ void testApacheDubboTest()
230230
.hasAttributesSatisfyingExactly(
231231
equalTo(
232232
RpcIncubatingAttributes.RPC_SYSTEM,
233-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
233+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
234234
equalTo(
235235
RpcIncubatingAttributes.RPC_SERVICE,
236236
"org.apache.dubbo.rpc.service.GenericService"),
@@ -265,7 +265,7 @@ void testApacheDubboTest()
265265
.hasAttributesSatisfying(
266266
equalTo(
267267
RpcIncubatingAttributes.RPC_SYSTEM,
268-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
268+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
269269
equalTo(
270270
RpcIncubatingAttributes.RPC_SERVICE,
271271
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void testDubboChain() throws ReflectiveOperationException {
173173
.hasAttributesSatisfyingExactly(
174174
equalTo(
175175
RpcIncubatingAttributes.RPC_SYSTEM,
176-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
176+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
177177
equalTo(
178178
RpcIncubatingAttributes.RPC_SERVICE,
179179
"org.apache.dubbo.rpc.service.GenericService"),
@@ -208,7 +208,7 @@ void testDubboChain() throws ReflectiveOperationException {
208208
.hasAttributesSatisfying(
209209
equalTo(
210210
RpcIncubatingAttributes.RPC_SYSTEM,
211-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
211+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
212212
equalTo(
213213
RpcIncubatingAttributes.RPC_SERVICE,
214214
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService"),
@@ -233,7 +233,7 @@ void testDubboChain() throws ReflectiveOperationException {
233233
.hasAttributesSatisfyingExactly(
234234
equalTo(
235235
RpcIncubatingAttributes.RPC_SYSTEM,
236-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
236+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
237237
equalTo(
238238
RpcIncubatingAttributes.RPC_SERVICE,
239239
"org.apache.dubbo.rpc.service.GenericService"),
@@ -268,7 +268,7 @@ void testDubboChain() throws ReflectiveOperationException {
268268
.hasAttributesSatisfying(
269269
equalTo(
270270
RpcIncubatingAttributes.RPC_SYSTEM,
271-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
271+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
272272
equalTo(
273273
RpcIncubatingAttributes.RPC_SERVICE,
274274
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
@@ -354,7 +354,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
354354
.hasAttributesSatisfyingExactly(
355355
equalTo(
356356
RpcIncubatingAttributes.RPC_SYSTEM,
357-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
357+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
358358
equalTo(
359359
RpcIncubatingAttributes.RPC_SERVICE,
360360
"org.apache.dubbo.rpc.service.GenericService"),
@@ -389,7 +389,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
389389
.hasAttributesSatisfying(
390390
equalTo(
391391
RpcIncubatingAttributes.RPC_SYSTEM,
392-
RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO),
392+
RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
393393
equalTo(
394394
RpcIncubatingAttributes.RPC_SERVICE,
395395
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService"),

‎instrumentation/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public void sayHello(
5353
}
5454
};
5555

56+
@SuppressWarnings("deprecation") // using deprecated semconv
5657
@Test
5758
void grpcInstrumentation() {
5859
GreeterGrpc.GreeterBlockingStub client =

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class SqsEventAttributesExtractor implements AttributesExtractor<SQSEvent, Void>
1919
AttributeKey.stringKey("messaging.operation");
2020
private static final AttributeKey<String> MESSAGING_SYSTEM =
2121
AttributeKey.stringKey("messaging.system");
22-
// copied from MessagingIncubatingAttributes.MessagingSystemValues
22+
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues
2323
private static final String AWS_SQS = "aws_sqs";
2424

2525
@Override

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class SqsMessageAttributesExtractor implements AttributesExtractor<SQSMessage, V
2323
AttributeKey.stringKey("messaging.operation");
2424
private static final AttributeKey<String> MESSAGING_SYSTEM =
2525
AttributeKey.stringKey("messaging.system");
26-
// copied from MessagingIncubatingAttributes.MessagingSystemValues
26+
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues
2727
private static final String AWS_SQS = "aws_sqs";
2828

2929
@Override

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void tearDown() {
5555
assertThat(testing.forceFlushCalled()).isTrue();
5656
}
5757

58+
@SuppressWarnings("deprecation") // using deprecated semconv
5859
@Test
5960
void eventTraced() {
6061
SQSEvent event = new SQSEvent();
@@ -86,7 +87,8 @@ void eventTraced() {
8687
.hasAttributesSatisfyingExactly(
8788
equalTo(
8889
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
89-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
90+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
91+
.AWS_SQS),
9092
equalTo(
9193
MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"))));
9294
}

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ void tearDown() {
5656
assertThat(testing.forceFlushCalled()).isTrue();
5757
}
5858

59+
@SuppressWarnings("deprecation") // using deprecated semconv
5960
@Test
6061
void processSpans() {
6162
SQSEvent.SQSMessage message1 = newMessage();
@@ -88,7 +89,8 @@ void processSpans() {
8889
.hasAttributesSatisfyingExactly(
8990
equalTo(
9091
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
91-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
92+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
93+
.AWS_SQS),
9294
equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"))
9395
.hasLinks(
9496
LinkData.create(
@@ -110,7 +112,8 @@ void processSpans() {
110112
.hasAttributesSatisfyingExactly(
111113
equalTo(
112114
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
113-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
115+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
116+
.AWS_SQS),
114117
equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"),
115118
equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "message1"),
116119
equalTo(
@@ -129,7 +132,8 @@ void processSpans() {
129132
.hasAttributesSatisfyingExactly(
130133
equalTo(
131134
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
132-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
135+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
136+
.AWS_SQS),
133137
equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"),
134138
equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "message2"),
135139
equalTo(

‎instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.mockito.Mock;
2727
import org.mockito.junit.jupiter.MockitoExtension;
2828

29+
@SuppressWarnings("deprecation") // using deprecated semconv
2930
@ExtendWith(MockitoExtension.class)
3031
public abstract class AbstractAwsLambdaSqsEventHandlerTest {
3132

@@ -82,7 +83,8 @@ void sameSource() {
8283
.hasAttributesSatisfyingExactly(
8384
equalTo(
8485
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
85-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
86+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
87+
.AWS_SQS),
8688
equalTo(
8789
MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"))
8890
.hasLinksSatisfying(
@@ -131,7 +133,8 @@ void differentSource() {
131133
.hasAttributesSatisfyingExactly(
132134
equalTo(
133135
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
134-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
136+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
137+
.AWS_SQS),
135138
equalTo(
136139
MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"))
137140
.hasLinksSatisfying(

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
202202
"$UrlAttributes.URL_FULL" { it.startsWith("http://") }
203203
"$ServerAttributes.SERVER_ADDRESS" String
204204
"$ServerAttributes.SERVER_PORT" { it == null || Number }
205-
"$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS
205+
"$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemIncubatingValues.AWS_SQS
206206
"$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "s3ToSqsTestQueue"
207207
"$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process"
208208
"$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String
@@ -546,7 +546,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
546546
"$UrlAttributes.URL_FULL" { it.startsWith("http://") }
547547
"$ServerAttributes.SERVER_ADDRESS" String
548548
"$ServerAttributes.SERVER_PORT" { it == null || Number }
549-
"$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS
549+
"$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemIncubatingValues.AWS_SQS
550550
"$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "s3ToSnsToSqsTestQueue"
551551
"$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process"
552552
"$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
196196
"$UrlAttributes.URL_FULL" String
197197
"$ServerAttributes.SERVER_ADDRESS" String
198198
"$ServerAttributes.SERVER_PORT" { it == null || Number }
199-
"$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS
199+
"$MessagingIncubatingAttributes.MESSAGING_SYSTEM" MessagingIncubatingAttributes.MessagingSystemIncubatingValues.AWS_SQS
200200
"$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "snsToSqsTestQueue"
201201
"$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process"
202202
"$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
enum SqsAttributesGetter implements MessagingAttributesGetter<Request<?>, Response<?>> {
1616
INSTANCE;
1717

18-
// copied from MessagingIncubatingAttributes.MessagingSystemValues
18+
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues
1919
private static final String AWS_SQS = "aws_sqs";
2020

2121
@Override

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsProcessRequestAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ enum SqsProcessRequestAttributesGetter
1515
implements MessagingAttributesGetter<SqsProcessRequest, Response<?>> {
1616
INSTANCE;
1717

18-
// copied from MessagingIncubatingAttributes.MessagingSystemValues
18+
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues
1919
private static final String AWS_SQS = "aws_sqs";
2020

2121
@Override

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsReceiveRequestAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ enum SqsReceiveRequestAttributesGetter
1616
implements MessagingAttributesGetter<SqsReceiveRequest, Response<?>> {
1717
INSTANCE;
1818

19-
// copied from MessagingIncubatingAttributes.MessagingSystemValues
19+
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues
2020
private static final String AWS_SQS = "aws_sqs";
2121

2222
@Override

0 commit comments

Comments
 (0)