Skip to content

Commit 2f03ab3

Browse files
lauritlaurit
committed
suppress deprecation warnings, fix compile errors
1 parent d51bc92 commit 2f03ab3

File tree

70 files changed

+212
-155
lines changed

Some content is hidden

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

70 files changed

+212
-155
lines changed

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

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 1 addition & 0 deletions
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(

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

Lines changed: 1 addition & 0 deletions
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/armeria/armeria-grpc-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/grpc/v1_14/ArmeriaGrpcTest.java‎

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 7 additions & 3 deletions
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-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)