Skip to content

Commit 58b7f0c

Browse files
committed
refactoring
1 parent 33a0d15 commit 58b7f0c

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -282,30 +282,7 @@ void testBatchSqsProducerConsumerServicesSync() throws URISyntaxException {
282282
span -> span.hasName("Sqs.CreateQueue").hasKind(SpanKind.CLIENT)),
283283
trace -> {
284284
publishSpan.set(trace.getSpan(0));
285-
trace.hasSpansSatisfyingExactly(
286-
span ->
287-
span.hasName("testSdkSqs publish")
288-
.hasKind(SpanKind.PRODUCER)
289-
.hasNoParent()
290-
.hasAttributesSatisfyingExactly(
291-
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
292-
equalTo(stringKey("aws.queue.url"), queueUrl),
293-
satisfies(
294-
AWS_REQUEST_ID,
295-
val ->
296-
val.matches(
297-
"\\s*00000000-0000-0000-0000-000000000000\\s*|UNKNOWN")),
298-
equalTo(RPC_SYSTEM, "aws-api"),
299-
equalTo(RPC_SERVICE, "Sqs"),
300-
equalTo(RPC_METHOD, "SendMessageBatch"),
301-
equalTo(HTTP_REQUEST_METHOD, "POST"),
302-
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
303-
satisfies(URL_FULL, v -> v.startsWith("http://localhost:" + sqsPort)),
304-
equalTo(SERVER_ADDRESS, "localhost"),
305-
equalTo(SERVER_PORT, sqsPort),
306-
equalTo(MESSAGING_SYSTEM, AWS_SQS),
307-
equalTo(MESSAGING_DESTINATION_NAME, "testSdkSqs"),
308-
equalTo(MESSAGING_OPERATION, "publish")));
285+
trace.hasSpansSatisfyingExactly(span -> publishSpan(span, queueUrl));
309286
},
310287
trace -> {
311288
List<Consumer<SpanDataAssert>> spanAsserts = new ArrayList<>();

0 commit comments

Comments
 (0)