19
19
import io .opentelemetry .semconv .ServerAttributes ;
20
20
import io .opentelemetry .semconv .UrlAttributes ;
21
21
import io .opentelemetry .semconv .incubating .MessagingIncubatingAttributes ;
22
+ import io .opentelemetry .semconv .incubating .RpcIncubatingAttributes ;
22
23
import java .util .ArrayList ;
23
24
import java .util .Arrays ;
24
25
import java .util .List ;
@@ -82,9 +83,11 @@ static SpanDataAssert sqs(
82
83
v -> assertThat (v ).isNull (),
83
84
v -> assertThat (v ).isInstanceOf (Number .class ))),
84
85
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" )));
88
91
89
92
if (spanName .endsWith ("receive" )
90
93
|| spanName .endsWith ("process" )
@@ -123,10 +126,10 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName
123
126
.hasAttributesSatisfyingExactly (
124
127
equalTo (stringKey ("aws.agent" ), "java-aws-sdk" ),
125
128
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" ),
129
129
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" ),
130
133
equalTo (HttpAttributes .HTTP_REQUEST_METHOD , method ),
131
134
equalTo (HttpAttributes .HTTP_RESPONSE_STATUS_CODE , 200 ),
132
135
satisfies (UrlAttributes .URL_FULL , val -> val .isInstanceOf (String .class )),
@@ -145,9 +148,9 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn)
145
148
.hasAttributesSatisfyingExactly (
146
149
equalTo (stringKey ("aws.agent" ), "java-aws-sdk" ),
147
150
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" ),
151
154
equalTo (MessagingIncubatingAttributes .MESSAGING_DESTINATION_NAME , topicArn ),
152
155
equalTo (HttpAttributes .HTTP_REQUEST_METHOD , "POST" ),
153
156
equalTo (HttpAttributes .HTTP_RESPONSE_STATUS_CODE , 200 ),
0 commit comments