Skip to content

Commit cf0f530

Browse files
trasklaurit
trask
and
laurit
authored
Static import semconv constants in tests (#12920)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent ae3c778 commit cf0f530

File tree

7 files changed

+46
-101
lines changed

7 files changed

+46
-101
lines changed

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

+8-22
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1515
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1616
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
17+
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
1718
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1819
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
1920
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
@@ -37,7 +38,6 @@
3738
import io.opentelemetry.api.trace.SpanKind;
3839
import io.opentelemetry.instrumentation.test.utils.PortUtils;
3940
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
40-
import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes;
4141
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
4242
import org.elasticmq.rest.sqs.SQSRestServer;
4343
import org.elasticmq.rest.sqs.SQSRestServerBuilder;
@@ -107,9 +107,7 @@ void testSimpleSqsProducerConsumerServices() {
107107
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
108108
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
109109
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
110-
satisfies(
111-
AwsIncubatingAttributes.AWS_REQUEST_ID,
112-
val -> val.isInstanceOf(String.class)),
110+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
113111
equalTo(RPC_SYSTEM, "aws-api"),
114112
equalTo(RPC_SERVICE, "AmazonSQS"),
115113
equalTo(RPC_METHOD, "CreateQueue"),
@@ -131,9 +129,7 @@ void testSimpleSqsProducerConsumerServices() {
131129
equalTo(
132130
stringKey("aws.queue.url"),
133131
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
134-
satisfies(
135-
AwsIncubatingAttributes.AWS_REQUEST_ID,
136-
val -> val.isInstanceOf(String.class)),
132+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
137133
equalTo(RPC_SYSTEM, "aws-api"),
138134
equalTo(RPC_SERVICE, "AmazonSQS"),
139135
equalTo(RPC_METHOD, "SendMessage"),
@@ -161,9 +157,7 @@ void testSimpleSqsProducerConsumerServices() {
161157
equalTo(
162158
stringKey("aws.queue.url"),
163159
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
164-
satisfies(
165-
AwsIncubatingAttributes.AWS_REQUEST_ID,
166-
val -> val.isInstanceOf(String.class)),
160+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
167161
equalTo(RPC_SYSTEM, "aws-api"),
168162
equalTo(RPC_SERVICE, "AmazonSQS"),
169163
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -219,9 +213,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
219213
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
220214
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
221215
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
222-
satisfies(
223-
AwsIncubatingAttributes.AWS_REQUEST_ID,
224-
val -> val.isInstanceOf(String.class)),
216+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
225217
equalTo(RPC_SYSTEM, "aws-api"),
226218
equalTo(RPC_SERVICE, "AmazonSQS"),
227219
equalTo(RPC_METHOD, "CreateQueue"),
@@ -243,9 +235,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
243235
equalTo(
244236
stringKey("aws.queue.url"),
245237
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
246-
satisfies(
247-
AwsIncubatingAttributes.AWS_REQUEST_ID,
248-
val -> val.isInstanceOf(String.class)),
238+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
249239
equalTo(RPC_SYSTEM, "aws-api"),
250240
equalTo(RPC_SERVICE, "AmazonSQS"),
251241
equalTo(RPC_METHOD, "SendMessage"),
@@ -273,9 +263,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
273263
equalTo(
274264
stringKey("aws.queue.url"),
275265
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
276-
satisfies(
277-
AwsIncubatingAttributes.AWS_REQUEST_ID,
278-
val -> val.isInstanceOf(String.class)),
266+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
279267
equalTo(RPC_SYSTEM, "aws-api"),
280268
equalTo(RPC_SERVICE, "AmazonSQS"),
281269
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -314,9 +302,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
314302
equalTo(
315303
stringKey("aws.queue.url"),
316304
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
317-
satisfies(
318-
AwsIncubatingAttributes.AWS_REQUEST_ID,
319-
val -> val.isInstanceOf(String.class)),
305+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
320306
equalTo(RPC_SYSTEM, "aws-api"),
321307
equalTo(RPC_SERVICE, "AmazonSQS"),
322308
equalTo(RPC_METHOD, "ReceiveMessage"),

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

+10-25
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1616
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1717
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
18+
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
1819
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
1920
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
2021
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
@@ -44,7 +45,6 @@
4445
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
4546
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
4647
import io.opentelemetry.sdk.trace.data.SpanData;
47-
import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes;
4848
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
4949
import java.util.ArrayList;
5050
import java.util.Arrays;
@@ -141,9 +141,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
141141
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
142142
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
143143
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
144-
satisfies(
145-
AwsIncubatingAttributes.AWS_REQUEST_ID,
146-
val -> val.isInstanceOf(String.class)),
144+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
147145
equalTo(RPC_SYSTEM, "aws-api"),
148146
equalTo(RPC_SERVICE, "AmazonSQS"),
149147
equalTo(RPC_METHOD, "CreateQueue"),
@@ -164,9 +162,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
164162
equalTo(
165163
stringKey("aws.queue.url"),
166164
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
167-
satisfies(
168-
AwsIncubatingAttributes.AWS_REQUEST_ID,
169-
val -> val.isInstanceOf(String.class)),
165+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
170166
equalTo(RPC_SYSTEM, "aws-api"),
171167
equalTo(RPC_SERVICE, "AmazonSQS"),
172168
equalTo(RPC_METHOD, "SendMessage"),
@@ -208,9 +204,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
208204
equalTo(
209205
stringKey("aws.queue.url"),
210206
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
211-
satisfies(
212-
AwsIncubatingAttributes.AWS_REQUEST_ID,
213-
val -> val.isInstanceOf(String.class)),
207+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
214208
equalTo(RPC_SYSTEM, "aws-api"),
215209
equalTo(RPC_SERVICE, "AmazonSQS"),
216210
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -249,9 +243,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
249243
equalTo(
250244
stringKey("aws.queue.url"),
251245
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
252-
satisfies(
253-
AwsIncubatingAttributes.AWS_REQUEST_ID,
254-
val -> val.isInstanceOf(String.class)),
246+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
255247
equalTo(RPC_SYSTEM, "aws-api"),
256248
equalTo(RPC_SERVICE, "AmazonSQS"),
257249
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -319,9 +311,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
319311
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
320312
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
321313
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
322-
satisfies(
323-
AwsIncubatingAttributes.AWS_REQUEST_ID,
324-
val -> val.isInstanceOf(String.class)),
314+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
325315
equalTo(RPC_SYSTEM, "aws-api"),
326316
equalTo(RPC_SERVICE, "AmazonSQS"),
327317
equalTo(RPC_METHOD, "CreateQueue"),
@@ -343,9 +333,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
343333
equalTo(
344334
stringKey("aws.queue.url"),
345335
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
346-
satisfies(
347-
AwsIncubatingAttributes.AWS_REQUEST_ID,
348-
val -> val.isInstanceOf(String.class)),
336+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
349337
equalTo(RPC_SYSTEM, "aws-api"),
350338
equalTo(RPC_SERVICE, "AmazonSQS"),
351339
equalTo(RPC_METHOD, "SendMessage"),
@@ -388,8 +376,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
388376
+ sqsPort
389377
+ "/000000000000/testSdkSqs"),
390378
satisfies(
391-
AwsIncubatingAttributes.AWS_REQUEST_ID,
392-
val -> val.isInstanceOf(String.class)),
379+
AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
393380
equalTo(RPC_SYSTEM, "aws-api"),
394381
equalTo(RPC_SERVICE, "AmazonSQS"),
395382
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -413,8 +400,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
413400
+ sqsPort
414401
+ "/000000000000/testSdkSqs"),
415402
satisfies(
416-
AwsIncubatingAttributes.AWS_REQUEST_ID,
417-
val -> val.isInstanceOf(String.class)),
403+
AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
418404
equalTo(RPC_SYSTEM, "aws-api"),
419405
equalTo(RPC_SERVICE, "AmazonSQS"),
420406
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -448,8 +434,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
448434
+ sqsPort
449435
+ "/000000000000/testSdkSqs"),
450436
satisfies(
451-
AwsIncubatingAttributes.AWS_REQUEST_ID,
452-
val -> val.isInstanceOf(String.class)),
437+
AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
453438
equalTo(RPC_SYSTEM, "aws-api"),
454439
equalTo(RPC_SERVICE, "AmazonSQS"),
455440
equalTo(RPC_METHOD, "ReceiveMessage"),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1515
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
16+
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
1617
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
1718
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1819
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
@@ -22,7 +23,6 @@
2223
import io.opentelemetry.api.trace.SpanKind;
2324
import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
2425
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
25-
import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes;
2626
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
2727
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
2828
import io.opentelemetry.testing.internal.armeria.common.MediaType;
@@ -182,7 +182,7 @@ public void testSendDynamoDbRequestWithRetries() {
182182
equalTo(RPC_SERVICE, service),
183183
equalTo(RPC_METHOD, operation),
184184
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
185-
equalTo(AwsIncubatingAttributes.AWS_REQUEST_ID, requestId),
185+
equalTo(AWS_REQUEST_ID, requestId),
186186
equalTo(stringKey("aws.table.name"), "sometable"),
187187
equalTo(DB_SYSTEM, "dynamodb"),
188188
equalTo(maybeStable(DB_OPERATION), operation));

0 commit comments

Comments
 (0)