Skip to content

Commit 2dbd08e

Browse files
committed
Addressed code review feedback:
1. Used constant from semconv. 2. Moved extraction code out of the experimental module.
1 parent 69754f8 commit 2dbd08e

File tree

3 files changed

+16
-33
lines changed

3 files changed

+16
-33
lines changed

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsExperimentalAttributes.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkRequestType.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55

66
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsExperimentalAttributes.AWS_BUCKET_NAME;
9-
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsExperimentalAttributes.AWS_QUEUE_NAME;
10-
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsExperimentalAttributes.AWS_QUEUE_URL;
11-
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsExperimentalAttributes.AWS_SECRET_ARN;
12-
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsExperimentalAttributes.AWS_STREAM_NAME;
13-
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsExperimentalAttributes.AWS_TABLE_NAME;
8+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
149
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.request;
1510
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.response;
1611

@@ -20,12 +15,12 @@
2015
import java.util.Map;
2116

2217
enum AwsSdkRequestType {
23-
S3(request(AWS_BUCKET_NAME.getKey(), "Bucket")),
24-
SQS(request(AWS_QUEUE_URL.getKey(), "QueueUrl"), request(AWS_QUEUE_NAME.getKey(), "QueueName")),
25-
KINESIS(request(AWS_STREAM_NAME.getKey(), "StreamName")),
26-
DYNAMODB(request(AWS_TABLE_NAME.getKey(), "TableName")),
18+
S3(request("aws.bucket.name", "Bucket")),
19+
SQS(request("aws.queue.url", "QueueUrl"), request("aws.queue.name", "QueueName")),
20+
KINESIS(request("aws.stream.name", "StreamName")),
21+
DYNAMODB(request("aws.table.name", "TableName")),
2722
BEDROCK_RUNTIME(),
28-
SECRETSMANAGER(response(AWS_SECRET_ARN.getKey(), "ARN")),
23+
SECRETSMANAGER(response(AttributeKeys.AWS_SECRETSMANAGER_SECRET_ARN.getKey(), "ARN")),
2924
SNS(
3025
/*
3126
* Only one of TopicArn and TargetArn are permitted on an SNS request.
@@ -46,6 +41,10 @@ List<FieldMapping> fields(FieldMapping.Type type) {
4641
}
4742

4843
private static class AttributeKeys {
44+
// Copied from AwsIncubatingAttributes
45+
static final AttributeKey<String> AWS_SECRETSMANAGER_SECRET_ARN =
46+
stringKey("aws.secretsmanager.secret.arn");
47+
4948
// copied from MessagingIncubatingAttributes
5049
static final AttributeKey<String> MESSAGING_DESTINATION_NAME =
5150
AttributeKey.stringKey("messaging.destination.name");

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2828
import static org.assertj.core.api.Assertions.catchThrowable;
2929

30+
import io.opentelemetry.api.common.AttributeKey;
3031
import io.opentelemetry.api.trace.SpanKind;
3132
import io.opentelemetry.context.Context;
3233
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
@@ -106,6 +107,10 @@ public abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest
106107
// prefix the hostname with the bucket name as label.
107108
private final URI clientUri = URI.create("http://localhost:" + server.httpPort());
108109

110+
// Copied from AwsIncubatingAttributes. Not available in current version of semconv.
111+
private static final AttributeKey<String> AWS_SECRETSMANAGER_SECRET_ARN =
112+
stringKey("aws.secretsmanager.secret.arn");
113+
109114
private static final String ec2BodyContent =
110115
"<AllocateAddressResponse xmlns=\"http://ec2.amazonaws.com/doc/2016-11-15/\">"
111116
+ " <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>"
@@ -235,7 +240,7 @@ private void clientAssertions(
235240
if (service.equals("SecretsManager")) {
236241
attributes.add(
237242
equalTo(
238-
stringKey("aws.secretsmanager.secret.arn"),
243+
stringKey(AWS_SECRETSMANAGER_SECRET_ARN.getKey()),
239244
"arn:aws:secretsmanager:us-east-1:123456789012:secret:MySecretFromCLI-sNkBwD"));
240245
}
241246

0 commit comments

Comments
 (0)