Skip to content

Commit c9aaa0d

Browse files
committed
use constant from semconv
1 parent ec52509 commit c9aaa0d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1515
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
1616
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_REQUEST_ID;
17+
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_SECRETSMANAGER_SECRET_ARN;
1718
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1819
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
1920
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
@@ -27,7 +28,6 @@
2728
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2829
import static org.assertj.core.api.Assertions.catchThrowable;
2930

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

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-
114110
private static final String ec2BodyContent =
115111
"<AllocateAddressResponse xmlns=\"http://ec2.amazonaws.com/doc/2016-11-15/\">"
116112
+ " <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>"
@@ -240,7 +236,7 @@ private void clientAssertions(
240236
if (service.equals("SecretsManager")) {
241237
attributes.add(
242238
equalTo(
243-
stringKey(AWS_SECRETSMANAGER_SECRET_ARN.getKey()),
239+
AWS_SECRETSMANAGER_SECRET_ARN,
244240
"arn:aws:secretsmanager:us-east-1:123456789012:secret:MySecretFromCLI-sNkBwD"));
245241
}
246242

0 commit comments

Comments
 (0)