Skip to content

Commit e94604a

Browse files
zeitlingerzeitlinger
committed
format
1 parent 74b6399 commit e94604a

15 files changed

Lines changed: 86 additions & 96 deletions

File tree

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSpanAssertions.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ static SpanDataAssert sqs(
5656
SERVER_PORT,
5757
val ->
5858
val.satisfiesAnyOf(
59-
v -> assertThat(v).isNull(),
60-
v -> assertThat(v).isInstanceOf(Number.class))));
59+
v -> assertThat(v).isNull(), v -> assertThat(v).isInstanceOf(Number.class))));
6160

6261
return span.hasName("SQS." + rpcMethod)
6362
.hasKind(SpanKind.CLIENT)
@@ -87,8 +86,7 @@ static SpanDataAssert s3(
8786
SERVER_PORT,
8887
val ->
8988
val.satisfiesAnyOf(
90-
v -> assertThat(v).isNull(),
91-
v -> assertThat(v).isInstanceOf(Number.class))));
89+
v -> assertThat(v).isNull(), v -> assertThat(v).isInstanceOf(Number.class))));
9290

9391
return span.hasName("S3." + rpcMethod)
9492
.hasKind(SpanKind.CLIENT)
@@ -117,8 +115,7 @@ static SpanDataAssert sns(SpanDataAssert span, String topicArn, String rpcMethod
117115
SERVER_PORT,
118116
val ->
119117
val.satisfiesAnyOf(
120-
v -> assertThat(v).isNull(),
121-
v -> assertThat(v).isInstanceOf(Number.class))));
118+
v -> assertThat(v).isNull(), v -> assertThat(v).isInstanceOf(Number.class))));
122119

123120
return span.hasName("SNS." + rpcMethod)
124121
.hasKind(SpanKind.CLIENT)

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3TracingTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
9+
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
10+
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
911
import static io.opentelemetry.javaagent.instrumentation.awssdk.v1_11.AwsSpanAssertions.s3;
1012
import static io.opentelemetry.javaagent.instrumentation.awssdk.v1_11.AwsSpanAssertions.sns;
1113
import static io.opentelemetry.javaagent.instrumentation.awssdk.v1_11.AwsSpanAssertions.sqs;
@@ -19,8 +21,6 @@
1921
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
2022
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
2123
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_SQS_QUEUE_URL;
22-
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
23-
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
2424
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
2525
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
2626
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
@@ -118,7 +118,8 @@ void testS3UploadTriggersSqsMessage() {
118118
attributes.add(equalTo(MESSAGING_SYSTEM, AWS_SQS));
119119
attributes.add(equalTo(MESSAGING_DESTINATION_NAME, "s3ToSqsTestQueue"));
120120
attributes.add(equalTo(MESSAGING_OPERATION, "process"));
121-
attributes.add(satisfies(MESSAGING_MESSAGE_ID, v -> v.isInstanceOf(String.class)));
121+
attributes.add(
122+
satisfies(MESSAGING_MESSAGE_ID, v -> v.isInstanceOf(String.class)));
122123

123124
span.hasName("s3ToSqsTestQueue process")
124125
.hasKind(SpanKind.CONSUMER)
@@ -213,7 +214,8 @@ void testS3UploadTriggersSnsTopicNotificationThenCreatesSqsMessage() {
213214
attributes.add(equalTo(MESSAGING_SYSTEM, AWS_SQS));
214215
attributes.add(equalTo(MESSAGING_DESTINATION_NAME, "s3ToSnsToSqsTestQueue"));
215216
attributes.add(equalTo(MESSAGING_OPERATION, "process"));
216-
attributes.add(satisfies(MESSAGING_MESSAGE_ID, v -> v.isInstanceOf(String.class)));
217+
attributes.add(
218+
satisfies(MESSAGING_MESSAGE_ID, v -> v.isInstanceOf(String.class)));
217219

218220
span.hasName("s3ToSnsToSqsTestQueue process")
219221
.hasKind(SpanKind.CONSUMER)

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws0ClientTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
1313
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
1414
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
15-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1615
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1716
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
1817
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
9+
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
10+
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
911
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1012
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1113
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
@@ -20,8 +22,6 @@
2022
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
2123
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
2224
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
23-
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
24-
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
2525
import static org.assertj.core.api.Assertions.assertThat;
2626

2727
import com.amazonaws.auth.AWSStaticCredentialsProvider;

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

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
99
import static io.opentelemetry.api.common.AttributeKey.stringKey;
10+
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
11+
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
1012
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1113
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1214
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
@@ -22,8 +24,6 @@
2224
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
2325
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
2426
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
25-
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcMethodAssertions;
26-
import static io.opentelemetry.instrumentation.testing.junit.rpc.RpcSemconvStabilityUtil.rpcSystemAssertion;
2727
import static java.util.Collections.singletonList;
2828
import static org.assertj.core.api.Assertions.assertThat;
2929

@@ -137,7 +137,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
137137
List<AttributeAssertion> attributes = new ArrayList<>();
138138
attributes.add(equalTo(stringKey("aws.agent"), "java-aws-sdk"));
139139
attributes.add(equalTo(stringKey("aws.queue.name"), "testSdkSqs"));
140-
attributes.add(satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
140+
attributes.add(
141+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
141142
attributes.add(rpcSystemAssertion("aws-api"));
142143
attributes.addAll(rpcMethodAssertions("AmazonSQS", "CreateQueue"));
143144
attributes.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -160,7 +161,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
160161
equalTo(
161162
AWS_SQS_QUEUE_URL,
162163
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
163-
attributes.add(satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
164+
attributes.add(
165+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
164166
attributes.add(rpcSystemAssertion("aws-api"));
165167
attributes.addAll(rpcMethodAssertions("AmazonSQS", "SendMessage"));
166168
attributes.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -176,8 +178,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
176178
attributes.add(equalTo(MESSAGING_DESTINATION_NAME, "testSdkSqs"));
177179
attributes.add(equalTo(MESSAGING_OPERATION, "publish"));
178180
attributes.add(
179-
satisfies(
180-
MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
181+
satisfies(MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
181182
attributes.add(equalTo(NETWORK_PROTOCOL_VERSION, "1.1"));
182183

183184
if (testCaptureHeaders) {
@@ -201,7 +202,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
201202
equalTo(
202203
AWS_SQS_QUEUE_URL,
203204
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
204-
attributes.add(satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
205+
attributes.add(
206+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
205207
attributes.add(rpcSystemAssertion("aws-api"));
206208
attributes.addAll(rpcMethodAssertions("AmazonSQS", "ReceiveMessage"));
207209
attributes.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -238,7 +240,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
238240
equalTo(
239241
AWS_SQS_QUEUE_URL,
240242
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
241-
attributes.add(satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
243+
attributes.add(
244+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
242245
attributes.add(rpcSystemAssertion("aws-api"));
243246
attributes.addAll(rpcMethodAssertions("AmazonSQS", "ReceiveMessage"));
244247
attributes.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -254,8 +257,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
254257
attributes.add(equalTo(MESSAGING_DESTINATION_NAME, "testSdkSqs"));
255258
attributes.add(equalTo(MESSAGING_OPERATION, "process"));
256259
attributes.add(
257-
satisfies(
258-
MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
260+
satisfies(MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
259261
attributes.add(equalTo(NETWORK_PROTOCOL_VERSION, "1.1"));
260262

261263
if (testCaptureHeaders) {
@@ -303,7 +305,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
303305
List<AttributeAssertion> attributes = new ArrayList<>();
304306
attributes.add(equalTo(stringKey("aws.agent"), "java-aws-sdk"));
305307
attributes.add(equalTo(stringKey("aws.queue.name"), "testSdkSqs"));
306-
attributes.add(satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
308+
attributes.add(
309+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
307310
attributes.add(rpcSystemAssertion("aws-api"));
308311
attributes.addAll(rpcMethodAssertions("AmazonSQS", "CreateQueue"));
309312
attributes.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -326,7 +329,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
326329
equalTo(
327330
AWS_SQS_QUEUE_URL,
328331
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
329-
attributes.add(satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
332+
attributes.add(
333+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
330334
attributes.add(rpcSystemAssertion("aws-api"));
331335
attributes.addAll(rpcMethodAssertions("AmazonSQS", "SendMessage"));
332336
attributes.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -342,8 +346,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
342346
attributes.add(equalTo(MESSAGING_DESTINATION_NAME, "testSdkSqs"));
343347
attributes.add(equalTo(MESSAGING_OPERATION, "publish"));
344348
attributes.add(
345-
satisfies(
346-
MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
349+
satisfies(MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
347350
attributes.add(equalTo(NETWORK_PROTOCOL_VERSION, "1.1"));
348351
span.hasName("testSdkSqs publish")
349352
.hasKind(SpanKind.PRODUCER)
@@ -367,12 +370,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
367370
attrs.add(
368371
equalTo(
369372
AWS_SQS_QUEUE_URL,
370-
"http://localhost:"
371-
+ sqsPort
372-
+ "/000000000000/testSdkSqs"));
373+
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
373374
attrs.add(
374-
satisfies(
375-
AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
375+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
376376
attrs.add(rpcSystemAssertion("aws-api"));
377377
attrs.addAll(rpcMethodAssertions("AmazonSQS", "ReceiveMessage"));
378378
attrs.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -392,12 +392,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
392392
attrs.add(
393393
equalTo(
394394
AWS_SQS_QUEUE_URL,
395-
"http://localhost:"
396-
+ sqsPort
397-
+ "/000000000000/testSdkSqs"));
395+
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
398396
attrs.add(
399-
satisfies(
400-
AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
397+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
401398
attrs.add(rpcSystemAssertion("aws-api"));
402399
attrs.addAll(rpcMethodAssertions("AmazonSQS", "ReceiveMessage"));
403400
attrs.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -408,14 +405,13 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
408405
attrs.add(
409406
equalTo(
410407
MESSAGING_SYSTEM,
411-
MessagingIncubatingAttributes
412-
.MessagingSystemIncubatingValues.AWS_SQS));
408+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
409+
.AWS_SQS));
413410
attrs.add(equalTo(MESSAGING_DESTINATION_NAME, "testSdkSqs"));
414411
attrs.add(equalTo(MESSAGING_OPERATION, "receive"));
415412
attrs.add(
416413
equalTo(
417-
MessagingIncubatingAttributes
418-
.MESSAGING_BATCH_MESSAGE_COUNT,
414+
MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT,
419415
1));
420416
attrs.add(equalTo(NETWORK_PROTOCOL_VERSION, "1.1"));
421417
span.hasName("testSdkSqs receive")
@@ -429,12 +425,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
429425
attrs.add(
430426
equalTo(
431427
AWS_SQS_QUEUE_URL,
432-
"http://localhost:"
433-
+ sqsPort
434-
+ "/000000000000/testSdkSqs"));
428+
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"));
435429
attrs.add(
436-
satisfies(
437-
AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
430+
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)));
438431
attrs.add(rpcSystemAssertion("aws-api"));
439432
attrs.addAll(rpcMethodAssertions("AmazonSQS", "ReceiveMessage"));
440433
attrs.add(equalTo(HTTP_REQUEST_METHOD, "POST"));
@@ -445,14 +438,13 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
445438
attrs.add(
446439
equalTo(
447440
MESSAGING_SYSTEM,
448-
MessagingIncubatingAttributes
449-
.MessagingSystemIncubatingValues.AWS_SQS));
441+
MessagingIncubatingAttributes.MessagingSystemIncubatingValues
442+
.AWS_SQS));
450443
attrs.add(equalTo(MESSAGING_DESTINATION_NAME, "testSdkSqs"));
451444
attrs.add(equalTo(MESSAGING_OPERATION, "process"));
452445
attrs.add(
453446
satisfies(
454-
MESSAGING_MESSAGE_ID,
455-
val -> val.isInstanceOf(String.class)));
447+
MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
456448
attrs.add(equalTo(NETWORK_PROTOCOL_VERSION, "1.1"));
457449
span.hasName("testSdkSqs process")
458450
.hasKind(SpanKind.CONSUMER)

0 commit comments

Comments
 (0)