Skip to content

Commit 0dd6deb

Browse files
jaydelucajaydeluca
committed
change reference to request ID to use AwsIncubatingAttributes, update hasAttributesSatisfyingExactly
1 parent 26e7134 commit 0dd6deb

File tree

11 files changed

+78
-71
lines changed

11 files changed

+78
-71
lines changed

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
6161
"aws.agent" "java-aws-sdk"
6262
"aws.endpoint" String
6363
"aws.queue.name" queueName
64-
"aws.request_id" String
64+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
6565
"rpc.method" "CreateQueue"
6666
"rpc.system" "aws-api"
6767
"rpc.service" "AmazonSQS"
@@ -106,7 +106,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
106106
"aws.agent" "java-aws-sdk"
107107
"aws.endpoint" String
108108
"aws.queue.url" queueUrl
109-
"aws.request_id" String
109+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
110110
"rpc.method" "GetQueueAttributes"
111111
"rpc.system" "aws-api"
112112
"rpc.service" "AmazonSQS"
@@ -129,7 +129,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
129129
"aws.agent" "java-aws-sdk"
130130
"aws.endpoint" String
131131
"aws.queue.url" queueUrl
132-
"aws.request_id" String
132+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
133133
"rpc.method" "SetQueueAttributes"
134134
"rpc.system" "aws-api"
135135
"rpc.service" "AmazonSQS"
@@ -192,7 +192,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
192192
"aws.agent" "java-aws-sdk"
193193
"aws.endpoint" String
194194
"aws.queue.url" queueUrl
195-
"aws.request_id" String
195+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
196196
"rpc.method" "ReceiveMessage"
197197
"rpc.system" "aws-api"
198198
"rpc.service" "AmazonSQS"
@@ -287,7 +287,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
287287
"aws.agent" "java-aws-sdk"
288288
"aws.endpoint" String
289289
"aws.queue.url" queueUrl
290-
"aws.request_id" String
290+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
291291
"rpc.method" "PurgeQueue"
292292
"rpc.system" "aws-api"
293293
"rpc.service" "AmazonSQS"
@@ -342,7 +342,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
342342
"aws.agent" "java-aws-sdk"
343343
"aws.endpoint" String
344344
"aws.queue.name" queueName
345-
"aws.request_id" String
345+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
346346
"rpc.method" "CreateQueue"
347347
"rpc.system" "aws-api"
348348
"rpc.service" "AmazonSQS"
@@ -364,7 +364,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
364364
"aws.agent" "java-aws-sdk"
365365
"aws.endpoint" String
366366
"aws.queue.url" queueUrl
367-
"aws.request_id" String
367+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
368368
"rpc.method" "GetQueueAttributes"
369369
"rpc.system" "aws-api"
370370
"rpc.service" "AmazonSQS"
@@ -406,7 +406,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
406406
attributes {
407407
"aws.agent" "java-aws-sdk"
408408
"aws.endpoint" String
409-
"aws.request_id" String
409+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
410410
"rpc.method" "CreateTopic"
411411
"rpc.system" "aws-api"
412412
"rpc.service" "AmazonSNS"
@@ -427,7 +427,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
427427
attributes {
428428
"aws.agent" "java-aws-sdk"
429429
"aws.endpoint" String
430-
"aws.request_id" String
430+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
431431
"rpc.method" "Subscribe"
432432
"rpc.system" "aws-api"
433433
"rpc.service" "AmazonSNS"
@@ -450,7 +450,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
450450
"aws.agent" "java-aws-sdk"
451451
"aws.endpoint" String
452452
"aws.queue.url" queueUrl
453-
"aws.request_id" String
453+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
454454
"rpc.method" "SetQueueAttributes"
455455
"rpc.system" "aws-api"
456456
"rpc.service" "AmazonSQS"
@@ -471,7 +471,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
471471
attributes {
472472
"aws.agent" "java-aws-sdk"
473473
"aws.endpoint" String
474-
"aws.request_id" String
474+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
475475
"rpc.method" "SetTopicAttributes"
476476
"rpc.system" "aws-api"
477477
"rpc.service" "AmazonSNS"
@@ -536,7 +536,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
536536
"aws.agent" "java-aws-sdk"
537537
"aws.endpoint" String
538538
"aws.queue.url" queueUrl
539-
"aws.request_id" String
539+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
540540
"rpc.method" "ReceiveMessage"
541541
"rpc.system" "aws-api"
542542
"rpc.service" "AmazonSQS"
@@ -631,7 +631,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
631631
"aws.agent" "java-aws-sdk"
632632
"aws.endpoint" String
633633
"aws.queue.url" queueUrl
634-
"aws.request_id" String
634+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
635635
"rpc.method" "PurgeQueue"
636636
"rpc.system" "aws-api"
637637
"rpc.service" "AmazonSQS"

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
5353
"aws.agent" "java-aws-sdk"
5454
"aws.endpoint" String
5555
"aws.queue.name" queueName
56-
"aws.request_id" String
56+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
5757
"rpc.method" "CreateQueue"
5858
"rpc.system" "aws-api"
5959
"rpc.service" "AmazonSQS"
@@ -76,7 +76,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
7676
"aws.agent" "java-aws-sdk"
7777
"aws.endpoint" String
7878
"aws.queue.url" queueUrl
79-
"aws.request_id" String
79+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
8080
"rpc.method" "GetQueueAttributes"
8181
"rpc.system" "aws-api"
8282
"rpc.service" "AmazonSQS"
@@ -99,7 +99,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
9999
"aws.agent" "java-aws-sdk"
100100
"aws.endpoint" String
101101
"aws.queue.url" queueUrl
102-
"aws.request_id" String
102+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
103103
"rpc.method" "SetQueueAttributes"
104104
"rpc.system" "aws-api"
105105
"rpc.service" "AmazonSQS"
@@ -121,7 +121,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
121121
attributes {
122122
"aws.agent" "java-aws-sdk"
123123
"aws.endpoint" String
124-
"aws.request_id" String
124+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
125125
"rpc.method" "CreateTopic"
126126
"rpc.system" "aws-api"
127127
"rpc.service" "AmazonSNS"
@@ -143,7 +143,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
143143
attributes {
144144
"aws.agent" "java-aws-sdk"
145145
"aws.endpoint" String
146-
"aws.request_id" String
146+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
147147
"rpc.method" "Subscribe"
148148
"rpc.system" "aws-api"
149149
"rpc.service" "AmazonSNS"
@@ -165,7 +165,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
165165
attributes {
166166
"aws.agent" "java-aws-sdk"
167167
"aws.endpoint" String
168-
"aws.request_id" String
168+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
169169
"rpc.method" "Publish"
170170
"rpc.system" "aws-api"
171171
"rpc.service" "AmazonSNS"
@@ -186,7 +186,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
186186
"aws.agent" "java-aws-sdk"
187187
"aws.endpoint" String
188188
"aws.queue.url" queueUrl
189-
"aws.request_id" String
189+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" String
190190
"rpc.system" "aws-api"
191191
"rpc.service" "AmazonSQS"
192192
"rpc.method" "ReceiveMessage"

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
123123
"$RpcIncubatingAttributes.RPC_METHOD" "${operation}"
124124
"aws.endpoint" "${server.httpUri()}"
125125
"aws.agent" "java-aws-sdk"
126-
"aws.request_id" hasRequestId ? String : null
126+
"$AwsIncubatingAttributes.AWS_REQUEST_ID" hasRequestId ? String : null
127127
for (def addedTag : additionalAttributes) {
128128
"$addedTag.key" "$addedTag.value"
129129
}

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.opentelemetry.semconv.NetworkAttributes;
2929
import io.opentelemetry.semconv.ServerAttributes;
3030
import io.opentelemetry.semconv.UrlAttributes;
31+
import io.opentelemetry.semconv.incubating.AwsIncubatingAttributes;
3132
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
3233
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes;
3334
import org.elasticmq.rest.sqs.SQSRestServer;
@@ -98,7 +99,7 @@ void testSimpleSqsProducerConsumerServices() {
9899
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
99100
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
100101
satisfies(
101-
stringKey("aws.request_id"),
102+
AwsIncubatingAttributes.AWS_REQUEST_ID,
102103
val -> val.isInstanceOf(String.class)),
103104
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
104105
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),
@@ -122,7 +123,7 @@ void testSimpleSqsProducerConsumerServices() {
122123
stringKey("aws.queue.url"),
123124
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
124125
satisfies(
125-
stringKey("aws.request_id"),
126+
AwsIncubatingAttributes.AWS_REQUEST_ID,
126127
val -> val.isInstanceOf(String.class)),
127128
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
128129
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),
@@ -155,7 +156,7 @@ void testSimpleSqsProducerConsumerServices() {
155156
stringKey("aws.queue.url"),
156157
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
157158
satisfies(
158-
stringKey("aws.request_id"),
159+
AwsIncubatingAttributes.AWS_REQUEST_ID,
159160
val -> val.isInstanceOf(String.class)),
160161
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
161162
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),
@@ -216,7 +217,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
216217
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
217218
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
218219
satisfies(
219-
stringKey("aws.request_id"),
220+
AwsIncubatingAttributes.AWS_REQUEST_ID,
220221
val -> val.isInstanceOf(String.class)),
221222
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
222223
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),
@@ -240,7 +241,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
240241
stringKey("aws.queue.url"),
241242
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
242243
satisfies(
243-
stringKey("aws.request_id"),
244+
AwsIncubatingAttributes.AWS_REQUEST_ID,
244245
val -> val.isInstanceOf(String.class)),
245246
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
246247
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),
@@ -273,7 +274,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
273274
stringKey("aws.queue.url"),
274275
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
275276
satisfies(
276-
stringKey("aws.request_id"),
277+
AwsIncubatingAttributes.AWS_REQUEST_ID,
277278
val -> val.isInstanceOf(String.class)),
278279
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
279280
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),
@@ -317,7 +318,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
317318
stringKey("aws.queue.url"),
318319
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
319320
satisfies(
320-
stringKey("aws.request_id"),
321+
AwsIncubatingAttributes.AWS_REQUEST_ID,
321322
val -> val.isInstanceOf(String.class)),
322323
equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"),
323324
equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"),

0 commit comments

Comments
 (0)