Skip to content

Commit 351a23f

Browse files
jaydelucajaydeluca
committed
update attribute name for sqs request id to match sem conv
1 parent bcbb20c commit 351a23f

File tree

7 files changed

+58
-59
lines changed

7 files changed

+58
-59
lines changed

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsExperimentalAttributes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final class AwsExperimentalAttributes {
1717
static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");
1818
static final AttributeKey<String> AWS_STREAM_NAME = stringKey("aws.stream.name");
1919
static final AttributeKey<String> AWS_TABLE_NAME = stringKey("aws.table.name");
20-
static final AttributeKey<String> AWS_REQUEST_ID = stringKey("aws.requestId");
20+
static final AttributeKey<String> AWS_REQUEST_ID = stringKey("aws.request_id");
2121

2222
private AwsExperimentalAttributes() {}
2323
}

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ private void onSdkResponse(
362362
Span span, SdkResponse response, ExecutionAttributes executionAttributes) {
363363
if (captureExperimentalSpanAttributes) {
364364
if (response instanceof AwsResponse) {
365-
span.setAttribute("aws.requestId", ((AwsResponse) response).responseMetadata().requestId());
365+
span.setAttribute(
366+
"aws.request_id", ((AwsResponse) response).responseMetadata().requestId());
366367
}
367368
AwsSdkRequest sdkRequest = executionAttributes.getAttribute(AWS_SDK_REQUEST_ATTRIBUTE);
368369
if (sdkRequest != null) {

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
146146
"$RpcIncubatingAttributes.RPC_SERVICE" "DynamoDb"
147147
"$RpcIncubatingAttributes.RPC_METHOD" "CreateTable"
148148
"aws.agent" "java-aws-sdk"
149-
"aws.requestId" "$requestId"
149+
"aws.request_id" "$requestId"
150150
"aws.table.name" "sometable"
151151
"$DbIncubatingAttributes.DB_SYSTEM" "dynamodb"
152152
"$DbIncubatingAttributes.DB_OPERATION" "CreateTable"
@@ -179,7 +179,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
179179
"$RpcIncubatingAttributes.RPC_SERVICE" "DynamoDb"
180180
"$RpcIncubatingAttributes.RPC_METHOD" "Query"
181181
"aws.agent" "java-aws-sdk"
182-
"aws.requestId" "$requestId"
182+
"aws.request_id" "$requestId"
183183
"aws.table.name" "sometable"
184184
"$DbIncubatingAttributes.DB_SYSTEM" "dynamodb"
185185
"$DbIncubatingAttributes.DB_OPERATION" "Query"
@@ -211,7 +211,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification {
211211
"$RpcIncubatingAttributes.RPC_SERVICE" "$service"
212212
"$RpcIncubatingAttributes.RPC_METHOD" "${operation}"
213213
"aws.agent" "java-aws-sdk"
214-
"aws.requestId" "$requestId"
214+
"aws.request_id" "$requestId"
215215
"aws.table.name" "sometable"
216216
"$DbIncubatingAttributes.DB_SYSTEM" "dynamodb"
217217
"$DbIncubatingAttributes.DB_OPERATION" "${operation}"

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
135135
"$RpcIncubatingAttributes.RPC_SERVICE" "$service"
136136
"$RpcIncubatingAttributes.RPC_METHOD" "${operation}"
137137
"aws.agent" "java-aws-sdk"
138-
"aws.requestId" "$requestId"
138+
"aws.request_id" "$requestId"
139139
if (service == "S3") {
140140
"aws.bucket.name" "somebucket"
141141
} else if (service == "Sqs" && operation == "CreateQueue") {
@@ -295,7 +295,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
295295
"$RpcIncubatingAttributes.RPC_SERVICE" "$service"
296296
"$RpcIncubatingAttributes.RPC_METHOD" "${operation}"
297297
"aws.agent" "java-aws-sdk"
298-
"aws.requestId" "$requestId"
298+
"aws.request_id" "$requestId"
299299
if (service == "S3") {
300300
"aws.bucket.name" "somebucket"
301301
} else if (service == "Sqs" && operation == "CreateQueue") {

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp
128128
attributes {
129129
"aws.agent" "java-aws-sdk"
130130
"aws.queue.name" "testSdkSqs"
131-
"aws.requestId" { it == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
131+
"aws.request_id" { it == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
132132
"rpc.system" "aws-api"
133133
"rpc.service" "Sqs"
134134
"rpc.method" "CreateQueue"
@@ -148,7 +148,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp
148148
attributes {
149149
"aws.agent" "java-aws-sdk"
150150
"aws.queue.url" "http://localhost:$sqsPort/000000000000/testSdkSqs"
151-
"aws.requestId" { it == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
151+
"aws.request_id" { it == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
152152
"rpc.system" "aws-api"
153153
"rpc.method" "SendMessage"
154154
"rpc.service" "Sqs"
@@ -208,7 +208,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp
208208
hasNoLinks()
209209
attributes {
210210
"aws.agent" "java-aws-sdk"
211-
"aws.requestId" { it == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
211+
"aws.request_id" { it == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
212212
"rpc.method" "ReceiveMessage"
213213
"aws.queue.url" "http://localhost:$sqsPort/000000000000/testSdkSqs"
214214
"rpc.system" "aws-api"
@@ -320,7 +320,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp
320320
attributes {
321321
"aws.agent" "java-aws-sdk"
322322
"aws.queue.url" "http://localhost:$sqsPort/000000000000/testSdkSqs"
323-
"aws.requestId" { it.trim() == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
323+
"aws.request_id" { it.trim() == "00000000-0000-0000-0000-000000000000" || it == "UNKNOWN" }
324324
"rpc.system" "aws-api"
325325
"rpc.method" "SendMessageBatch"
326326
"rpc.service" "Sqs"

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java‎

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -156,50 +156,48 @@ public void testSendDynamoDbRequestWithRetries() {
156156

157157
getTesting()
158158
.waitAndAssertTraces(
159-
trace -> {
160-
trace.hasSpansSatisfyingExactly(
161-
span -> {
162-
span.hasKind(SpanKind.CLIENT);
163-
span.hasNoParent();
164-
span.hasAttributesSatisfying(
165-
attributes -> {
166-
assertThat(attributes)
167-
.containsEntry(ServerAttributes.SERVER_ADDRESS, "127.0.0.1")
168-
.containsEntry(ServerAttributes.SERVER_PORT, server.httpPort())
169-
.containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method)
170-
.containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200)
171-
.containsEntry(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api")
172-
.containsEntry(RpcIncubatingAttributes.RPC_SERVICE, service)
173-
.containsEntry(RpcIncubatingAttributes.RPC_METHOD, operation)
174-
.containsEntry("aws.agent", "java-aws-sdk")
175-
.containsEntry("aws.requestId", requestId)
176-
.containsEntry("aws.table.name", "sometable")
177-
.containsEntry(DbIncubatingAttributes.DB_SYSTEM, "dynamodb")
178-
.containsEntry(DbIncubatingAttributes.DB_OPERATION, operation);
179-
});
180-
if (isRecordIndividualHttpErrorEnabled()) {
181-
span.hasEventsSatisfyingExactly(
182-
event ->
183-
event
184-
.hasName("HTTP request failure")
185-
.hasAttributesSatisfyingExactly(
186-
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500),
187-
equalTo(
188-
AttributeKey.stringKey("aws.http.error_message"),
189-
"DynamoDB could not process your request")),
190-
event ->
191-
event
192-
.hasName("HTTP request failure")
193-
.hasAttributesSatisfyingExactly(
194-
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 503),
195-
equalTo(
196-
AttributeKey.stringKey("aws.http.error_message"),
197-
"DynamoDB is currently unavailable")));
198-
} else {
199-
span.hasEventsSatisfying(events -> assertThat(events.size()).isEqualTo(0));
200-
}
201-
});
202-
});
159+
trace ->
160+
trace.hasSpansSatisfyingExactly(
161+
span -> {
162+
span.hasKind(SpanKind.CLIENT);
163+
span.hasNoParent();
164+
span.hasAttributesSatisfying(
165+
attributes ->
166+
assertThat(attributes)
167+
.containsEntry(ServerAttributes.SERVER_ADDRESS, "127.0.0.1")
168+
.containsEntry(ServerAttributes.SERVER_PORT, server.httpPort())
169+
.containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method)
170+
.containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200)
171+
.containsEntry(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api")
172+
.containsEntry(RpcIncubatingAttributes.RPC_SERVICE, service)
173+
.containsEntry(RpcIncubatingAttributes.RPC_METHOD, operation)
174+
.containsEntry("aws.agent", "java-aws-sdk")
175+
.containsEntry("aws.request_id", requestId)
176+
.containsEntry("aws.table.name", "sometable")
177+
.containsEntry(DbIncubatingAttributes.DB_SYSTEM, "dynamodb")
178+
.containsEntry(DbIncubatingAttributes.DB_OPERATION, operation));
179+
if (isRecordIndividualHttpErrorEnabled()) {
180+
span.hasEventsSatisfyingExactly(
181+
event ->
182+
event
183+
.hasName("HTTP request failure")
184+
.hasAttributesSatisfyingExactly(
185+
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500),
186+
equalTo(
187+
AttributeKey.stringKey("aws.http.error_message"),
188+
"DynamoDB could not process your request")),
189+
event ->
190+
event
191+
.hasName("HTTP request failure")
192+
.hasAttributesSatisfyingExactly(
193+
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 503),
194+
equalTo(
195+
AttributeKey.stringKey("aws.http.error_message"),
196+
"DynamoDB is currently unavailable")));
197+
} else {
198+
span.hasEventsSatisfying(events -> assertThat(events.size()).isEqualTo(0));
199+
}
200+
}));
203201

204202
// make sure the response body input stream is still available and check its content to be
205203
// expected

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void assertSqsTraces(Boolean withParent, Boolean captureHeaders) {
166166
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
167167
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
168168
satisfies(
169-
stringKey("aws.requestId"),
169+
stringKey("aws.request_id"),
170170
val ->
171171
val.satisfiesAnyOf(
172172
v ->
@@ -196,7 +196,7 @@ void assertSqsTraces(Boolean withParent, Boolean captureHeaders) {
196196
stringKey("aws.queue.url"),
197197
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
198198
satisfies(
199-
stringKey("aws.requestId"),
199+
stringKey("aws.request_id"),
200200
val ->
201201
val.satisfiesAnyOf(
202202
v ->
@@ -260,7 +260,7 @@ void assertSqsTraces(Boolean withParent, Boolean captureHeaders) {
260260
stringKey("aws.queue.url"),
261261
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
262262
satisfies(
263-
stringKey("aws.requestId"),
263+
stringKey("aws.request_id"),
264264
val ->
265265
val.satisfiesAnyOf(
266266
v ->
@@ -507,7 +507,7 @@ void testBatchSqsProducerConsumerServicesSync() throws URISyntaxException {
507507
stringKey("aws.queue.url"),
508508
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
509509
satisfies(
510-
stringKey("aws.requestId"),
510+
stringKey("aws.request_id"),
511511
val ->
512512
val.satisfiesAnyOf(
513513
v ->

0 commit comments

Comments
 (0)