open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky aws sqs test (#10800)

This commit is contained in:
Lauri Tulmin 2024-03-11 15:08:41 +02:00 committed by GitHub
parent a942b2395c
commit bc53f2ead1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 120 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,11 +28,14 @@ import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.test.utils.PortUtils;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.SemanticAttributes;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import org.elasticmq.rest.sqs.SQSRestServer; import org.elasticmq.rest.sqs.SQSRestServer;
import org.elasticmq.rest.sqs.SQSRestServerBuilder; import org.elasticmq.rest.sqs.SQSRestServerBuilder;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
@ -324,25 +327,38 @@ public abstract class AbstractSqsTracingTest {
SemanticAttributes.MESSAGING_MESSAGE_ID, SemanticAttributes.MESSAGING_MESSAGE_ID,
val -> val.isInstanceOf(String.class)), val -> val.isInstanceOf(String.class)),
equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))),
trace -> trace -> {
trace.hasSpansSatisfyingExactlyInAnyOrder( AtomicReference<SpanData> receiveSpan = new AtomicReference<>();
span -> span.hasName("parent").hasNoParent().hasAttributes(Attributes.empty()), AtomicReference<SpanData> processSpan = new AtomicReference<>();
List<Consumer<SpanDataAssert>> assertions =
new ArrayList<>(
Arrays.asList(
span ->
span.hasName("parent")
.hasNoParent()
.hasAttributes(Attributes.empty()),
span -> span ->
span.hasName("SQS.ReceiveMessage") span.hasName("SQS.ReceiveMessage")
.hasKind(SpanKind.CLIENT) .hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(
stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo( equalTo(
stringKey("aws.queue.url"), stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), "http://localhost:"
+ sqsPort
+ "/000000000000/testSdkSqs"),
equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"),
equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"),
equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"),
equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"),
equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200),
equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(
SemanticAttributes.URL_FULL,
"http://localhost:" + sqsPort),
equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"),
equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.SERVER_PORT, sqsPort),
equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")),
@ -352,60 +368,82 @@ public abstract class AbstractSqsTracingTest {
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(
stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo( equalTo(
stringKey("aws.queue.url"), stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), "http://localhost:"
+ sqsPort
+ "/000000000000/testSdkSqs"),
equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"),
equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"),
equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"),
equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"),
equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200),
equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(
SemanticAttributes.URL_FULL,
"http://localhost:" + sqsPort),
equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"),
equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.SERVER_PORT, sqsPort),
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"),
equalTo( equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testSdkSqs"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"),
equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1), equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1),
equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")),
span -> { span ->
// on jdk8 the order of the "SQS.ReceiveMessage" and "testSdkSqs receive"
// spans can vary
SpanData parent =
"testSdkSqs receive".equals(trace.getSpan(2).getName())
? trace.getSpan(2)
: trace.getSpan(1);
span.hasName("testSdkSqs process") span.hasName("testSdkSqs process")
.hasKind(SpanKind.CONSUMER) .hasKind(SpanKind.CONSUMER)
.hasParent(parent) .hasParent(receiveSpan.get())
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(
stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo( equalTo(
stringKey("aws.queue.url"), stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), "http://localhost:"
+ sqsPort
+ "/000000000000/testSdkSqs"),
equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"),
equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"),
equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"),
equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"),
equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200),
equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(
SemanticAttributes.URL_FULL,
"http://localhost:" + sqsPort),
equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"),
equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.SERVER_PORT, sqsPort),
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testSdkSqs"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies( satisfies(
SemanticAttributes.MESSAGING_MESSAGE_ID, SemanticAttributes.MESSAGING_MESSAGE_ID,
val -> val.isInstanceOf(String.class)), val -> val.isInstanceOf(String.class)),
equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")); equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")),
},
span -> span ->
span.hasName("process child") span.hasName("process child")
.hasParent(trace.getSpan(3)) .hasParent(processSpan.get())
.hasAttributes(Attributes.empty()))); .hasAttributes(Attributes.empty())));
// on jdk8 the order of the "SQS.ReceiveMessage" and "testSdkSqs receive"
// spans can vary
if ("SQS.ReceiveMessage".equals(trace.getSpan(1).getName())) {
receiveSpan.set(trace.getSpan(2));
processSpan.set(trace.getSpan(3));
} else {
receiveSpan.set(trace.getSpan(1));
processSpan.set(trace.getSpan(2));
// move "SQS.ReceiveMessage" assertions to the last position
assertions.add(assertions.remove(1));
}
trace.hasSpansSatisfyingExactly(assertions);
});
} }
@Test @Test