Address code review feedback:

1. Added a null check at the awsResp level.
2. Removed the call to getARN() from the request. In Secrets Manager, the request uses secretId, which is not necessarily an ARN. This change aligns with the V2 implementation. The ARN will now be retrieved from the response. A new test has been added using DescribeSecretRequest.

Author: lukeina2z

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

@@ -45,8 +45,6 @@ private static boolean canGetResponseMetadata() {
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, Request<?> request) {
     Object originalRequest = request.getOriginalRequest();
-    setAttribute(
-        attributes, AWS_SECRETSMANAGER_SECRET_ARN, originalRequest, RequestAccess::getSecretArn);
     setAttribute(
         attributes,
         AWS_STEP_FUNCTIONS_STATE_MACHINE_ARN,
@@ -66,8 +64,8 @@ public void onEnd(
       Request<?> request,
       @Nullable Response<?> response,
       @Nullable Throwable error) {
-    if (response != null) {
-      Object awsResp = response.getAwsResponse();
+    Object awsResp = getAwsResponse(response);
+    if (awsResp != null) {
       setAttribute(attributes, AWS_SECRETSMANAGER_SECRET_ARN, awsResp, RequestAccess::getSecretArn);
       setAttribute(
           attributes,
@@ -111,4 +109,11 @@ public static void setAttribute(
       attributes.put(key, value);
     }
   }
+
+  private static Object getAwsResponse(Response<?> response) {
+    if (response == null) {
+      return null;
+    }
+    return response.getAwsResponse();
+  }
 }

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

@@ -12,6 +12,7 @@
 import com.amazonaws.services.secretsmanager.AWSSecretsManager;
 import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder;
 import com.amazonaws.services.secretsmanager.model.CreateSecretRequest;
+import com.amazonaws.services.secretsmanager.model.DescribeSecretRequest;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
 import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
@@ -30,7 +31,7 @@ protected boolean hasRequestId() {
   }
 
   @Test
-  public void sendRequestWithMockedResponse() throws Exception {
+  public void sendCreateSecretRequestWithMockedResponse() throws Exception {
     AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
     AWSSecretsManager client =
         configureClient(clientBuilder)
@@ -59,4 +60,34 @@ public void sendRequestWithMockedResponse() throws Exception {
     assertRequestWithMockedResponse(
         response, client, "AWSSecretsManager", "CreateSecret", "POST", additionalAttributes);
   }
+
+  @Test
+  public void sendDescribeSecretRequestWithMockedResponse() throws Exception {
+    AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
+    AWSSecretsManager client =
+        configureClient(clientBuilder)
+            .withEndpointConfiguration(endpoint)
+            .withCredentials(credentialsProvider)
+            .build();
+
+    String body =
+        "{"
+            + "\"ARN\": \"arn:aws:secretsmanager:us-east-1:123456789012:secret:My-Secret-Id-WzAXar\","
+            + "\"Name\": \"My-Secret-Id\","
+            + "\"VersionId\": \"EXAMPLE1-90ab-cdef-fedc-ba987SECRET1\""
+            + "}";
+
+    server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
+    Object response = client.describeSecret(
+            new DescribeSecretRequest().withSecretId("My-Secret-Id"));
+
+    List<AttributeAssertion> additionalAttributes =
+        singletonList(
+            equalTo(
+                AWS_SECRETSMANAGER_SECRET_ARN,
+                "arn:aws:secretsmanager:us-east-1:123456789012:secret:My-Secret-Id-WzAXar"));
+
+    assertRequestWithMockedResponse(
+        response, client, "AWSSecretsManager", "DescribeSecret", "POST", additionalAttributes);
+  }
 }