Skip to content

Commit a895c18

Browse files
lauritlaurit
committed
suppress deprecation warnings
1 parent 6d99812 commit a895c18

File tree

73 files changed

+230
-139
lines changed

Some content is hidden

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

73 files changed

+230
-139
lines changed

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

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

Lines changed: 6 additions & 6 deletions
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/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java‎

Lines changed: 5 additions & 2 deletions
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/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Test;
3939

40+
@SuppressWarnings("deprecation") // using deprecated semconv
4041
public abstract class AbstractSqsSuppressReceiveSpansTest {
4142

4243
protected abstract InstrumentationExtension testing();
@@ -135,7 +136,8 @@ void testSimpleSqsProducerConsumerServices() {
135136
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
136137
equalTo(
137138
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
138-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
139+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
140+
.AWS_SQS),
139141
equalTo(
140142
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
141143
"testSdkSqs"),
@@ -168,7 +170,8 @@ void testSimpleSqsProducerConsumerServices() {
168170
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
169171
equalTo(
170172
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
171-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
173+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
174+
.AWS_SQS),
172175
equalTo(
173176
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
174177
"testSdkSqs"),
@@ -253,7 +256,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
253256
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
254257
equalTo(
255258
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
256-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
259+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
260+
.AWS_SQS),
257261
equalTo(
258262
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
259263
"testSdkSqs"),
@@ -286,7 +290,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
286290
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
287291
equalTo(
288292
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
289-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
293+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
294+
.AWS_SQS),
290295
equalTo(
291296
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
292297
"testSdkSqs"),

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.junit.jupiter.params.ParameterizedTest;
5151
import org.junit.jupiter.params.provider.ValueSource;
5252

53+
@SuppressWarnings("deprecation") // using deprecated semconv
5354
public abstract class AbstractSqsTracingTest {
5455

5556
protected abstract InstrumentationExtension testing();
@@ -167,7 +168,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
167168
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
168169
equalTo(
169170
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
170-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
171+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
172+
.AWS_SQS),
171173
equalTo(
172174
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
173175
"testSdkSqs"),
@@ -214,7 +216,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
214216
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
215217
equalTo(
216218
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
217-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
219+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
220+
.AWS_SQS),
218221
equalTo(
219222
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
220223
"testSdkSqs"),
@@ -259,7 +262,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
259262
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
260263
equalTo(
261264
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
262-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
265+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
266+
.AWS_SQS),
263267
equalTo(
264268
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
265269
"testSdkSqs"),
@@ -356,7 +360,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
356360
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
357361
equalTo(
358362
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
359-
MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS),
363+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
364+
.AWS_SQS),
360365
equalTo(
361366
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
362367
"testSdkSqs"),
@@ -430,8 +435,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
430435
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
431436
equalTo(
432437
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
433-
MessagingIncubatingAttributes.MessagingSystemValues
434-
.AWS_SQS),
438+
MessagingIncubatingAttributes
439+
.MessagingSystemIncubatingValues.AWS_SQS),
435440
equalTo(
436441
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
437442
"testSdkSqs"),
@@ -470,8 +475,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
470475
equalTo(ServerAttributes.SERVER_PORT, sqsPort),
471476
equalTo(
472477
MessagingIncubatingAttributes.MESSAGING_SYSTEM,
473-
MessagingIncubatingAttributes.MessagingSystemValues
474-
.AWS_SQS),
478+
MessagingIncubatingAttributes
479+
.MessagingSystemIncubatingValues.AWS_SQS),
475480
equalTo(
476481
MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
477482
"testSdkSqs"),

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.Optional;
3232
import java.util.stream.Collectors;
33+
import org.junit.jupiter.api.AfterAll;
3334
import org.junit.jupiter.api.BeforeAll;
3435
import org.junit.jupiter.api.Test;
3536
import org.junit.jupiter.api.TestInstance;
@@ -59,6 +60,7 @@ public static void setup() {
5960
server.start();
6061
}
6162

63+
@AfterAll
6264
public static void cleanup() {
6365
server.stop();
6466
}
@@ -118,6 +120,7 @@ public boolean isRecordIndividualHttpErrorEnabled() {
118120
"otel.instrumentation.aws-sdk.experimental-record-individual-http-error", false);
119121
}
120122

123+
@SuppressWarnings("deprecation") // using deprecated semconv
121124
@Test
122125
public void testSendDynamoDbRequestWithRetries() {
123126
cleanResponses();

0 commit comments

Comments
 (0)