Skip to content

Commit f9f3080

Browse files
authored
Update camel tests to use RpcIncubatingAttributes (#11253)
1 parent d1591f7 commit f9f3080

File tree

1 file changed

+12
-9
lines changed
  • instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws

1 file changed

+12
-9
lines changed

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java

+12-9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.opentelemetry.semconv.ServerAttributes;
2020
import io.opentelemetry.semconv.UrlAttributes;
2121
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
22+
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes;
2223
import java.util.ArrayList;
2324
import java.util.Arrays;
2425
import java.util.List;
@@ -82,9 +83,11 @@ static SpanDataAssert sqs(
8283
v -> assertThat(v).isNull(),
8384
v -> assertThat(v).isInstanceOf(Number.class))),
8485
equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"),
85-
equalTo(stringKey("rpc.system"), "aws-api"),
86-
satisfies(stringKey("rpc.method"), stringAssert -> stringAssert.isEqualTo(rpcMethod)),
87-
equalTo(stringKey("rpc.service"), "AmazonSQS")));
86+
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
87+
satisfies(
88+
RpcIncubatingAttributes.RPC_METHOD,
89+
stringAssert -> stringAssert.isEqualTo(rpcMethod)),
90+
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS")));
8891

8992
if (spanName.endsWith("receive")
9093
|| spanName.endsWith("process")
@@ -123,10 +126,10 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName
123126
.hasAttributesSatisfyingExactly(
124127
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
125128
satisfies(stringKey("aws.endpoint"), val -> val.isInstanceOf(String.class)),
126-
equalTo(stringKey("rpc.system"), "aws-api"),
127-
equalTo(stringKey("rpc.method"), spanName.substring(3)),
128-
equalTo(stringKey("rpc.service"), "Amazon S3"),
129129
equalTo(stringKey("aws.bucket.name"), bucketName),
130+
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
131+
equalTo(RpcIncubatingAttributes.RPC_METHOD, spanName.substring(3)),
132+
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "Amazon S3"),
130133
equalTo(HttpAttributes.HTTP_REQUEST_METHOD, method),
131134
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200),
132135
satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)),
@@ -145,9 +148,9 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn)
145148
.hasAttributesSatisfyingExactly(
146149
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
147150
satisfies(stringKey("aws.endpoint"), val -> val.isInstanceOf(String.class)),
148-
equalTo(stringKey("rpc.system"), "aws-api"),
149-
equalTo(stringKey("rpc.method"), spanName.substring(4)),
150-
equalTo(stringKey("rpc.service"), "AmazonSNS"),
151+
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
152+
equalTo(RpcIncubatingAttributes.RPC_METHOD, spanName.substring(4)),
153+
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSNS"),
151154
equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topicArn),
152155
equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"),
153156
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200),

0 commit comments

Comments
 (0)