Skip to content

Add attribute to camel aws SNS assertions #14434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2025
Merged

Add attribute to camel aws SNS assertions #14434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...st/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_SNS_TOPIC_ARN;
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
Expand Down Expand Up @@ -139,16 +140,18 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName
v -> val.isInstanceOf(Number.class), v -> assertThat(v).isNull())));
}

static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn) {
static SpanDataAssert sns(
SpanDataAssert span, String spanName, String topicArn, String destinationName) {
return span.hasName(spanName)
.hasKind(CLIENT)
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
equalTo(AWS_SNS_TOPIC_ARN, topicArn),
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_METHOD, spanName.substring(4)),
equalTo(RPC_SERVICE, "AmazonSNS"),
equalTo(MESSAGING_DESTINATION_NAME, topicArn),
equalTo(MESSAGING_DESTINATION_NAME, destinationName),
equalTo(HTTP_REQUEST_METHOD, "POST"),
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
satisfies(URL_FULL, val -> val.isInstanceOf(String.class)),
Expand Down
17 changes: 11 additions & 6 deletions ...rc/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ void awsSdkSnsProducerToCamelSqsConsumer() {
span -> AwsSpanAssertions.sqs(span, "SQS.ListQueues").hasNoParent()),
trace ->
trace.hasSpansSatisfyingExactly(
span -> AwsSpanAssertions.sns(span, "SNS.ListTopics", null).hasNoParent()),
span -> AwsSpanAssertions.sns(span, "SNS.ListTopics", null, null).hasNoParent()),
trace ->
trace.hasSpansSatisfyingExactly(
span -> AwsSpanAssertions.sns(span, "SNS.Publish", metaData.topicArn).hasNoParent(),
span ->
AwsSpanAssertions.sns(span, "SNS.Publish", metaData.topicArn, metaData.topicArn)
.hasNoParent(),
span ->
AwsSpanAssertions.sqs(
span,
Expand Down Expand Up @@ -107,13 +109,13 @@ void camelSnsProducerToCamelSqsConsumer() {
span -> AwsSpanAssertions.sqs(span, "SQS.ListQueues").hasNoParent()),
trace ->
trace.hasSpansSatisfyingExactly(
span -> AwsSpanAssertions.sns(span, "SNS.ListTopics", null).hasNoParent()),
span -> AwsSpanAssertions.sns(span, "SNS.ListTopics", null, null).hasNoParent()),
trace ->
trace.hasSpansSatisfyingExactly(
span -> CamelSpanAssertions.direct(span, "input"),
span -> CamelSpanAssertions.snsPublish(span, topicName).hasParent(trace.getSpan(0)),
span ->
AwsSpanAssertions.sns(span, "SNS.Publish", metaData.topicArn)
AwsSpanAssertions.sns(span, "SNS.Publish", metaData.topicArn, metaData.topicArn)
.hasParent(trace.getSpan(1)),
span ->
AwsSpanAssertions.sqs(
Expand Down Expand Up @@ -150,10 +152,13 @@ private static void waitAndClearSetupTraces(String queueUrl, String queueName, S
AwsSpanAssertions.sqs(span, "SQS.SetQueueAttributes", queueUrl).hasNoParent()),
trace ->
trace.hasSpansSatisfyingExactly(
span -> AwsSpanAssertions.sns(span, "SNS.CreateTopic", null).hasNoParent()),
span ->
AwsSpanAssertions.sns(span, "SNS.CreateTopic", topicArn, null).hasNoParent()),
trace ->
trace.hasSpansSatisfyingExactly(
span -> AwsSpanAssertions.sns(span, "SNS.Subscribe", topicArn).hasNoParent()));
span ->
AwsSpanAssertions.sns(span, "SNS.Subscribe", topicArn, topicArn)
.hasNoParent()));
testing.clearData();
}

Expand Down
Loading