added comments and attributions

Author: anahatAWS

instrumentation/aws-sdk/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AwsExperimentalAttributes.java

@@ -15,12 +15,20 @@
 
 package software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11;
 
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ */
+
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
 import io.opentelemetry.api.common.AttributeKey;
 
 final class AwsExperimentalAttributes {
 
+  // 2025-07-22: Amazon addition
   static final AttributeKey<String> AWS_STREAM_ARN = stringKey("aws.stream.arn");
   static final AttributeKey<String> AWS_TABLE_ARN = stringKey("aws.table.arn");
   static final AttributeKey<String> AWS_AGENT_ID = stringKey("aws.bedrock.agent.id");
@@ -56,5 +64,7 @@ final class AwsExperimentalAttributes {
       stringKey("aws.lambda.resource_mapping.id");
   static final AttributeKey<String> AWS_AUTH_ACCESS_KEY = stringKey("aws.auth.account.access_key");
 
+  // End of Amazon addition
+
   private AwsExperimentalAttributes() {}
 }

instrumentation/aws-sdk/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/AwsSdkExperimentalAttributesExtractor.java

@@ -15,6 +15,13 @@
 
 package software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11;
 
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ */
+
 import static software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11.AwsExperimentalAttributes.AWS_AGENT_ID;
 import static software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11.AwsExperimentalAttributes.AWS_AUTH_ACCESS_KEY;
 import static software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11.AwsExperimentalAttributes.AWS_BEDROCK_RUNTIME_MODEL_ID;
@@ -52,6 +59,7 @@
 
 class AwsSdkExperimentalAttributesExtractor
     implements AttributesExtractor<Request<?>, Response<?>> {
+  // 2025-07-22: Amazon addition
   private static final String BEDROCK_SERVICE = "AmazonBedrock";
   private static final String BEDROCK_AGENT_SERVICE = "AWSBedrockAgent";
   private static final String BEDROCK_AGENT_RUNTIME_SERVICE = "AWSBedrockAgentRuntime";
@@ -220,6 +228,8 @@ private static boolean isBedrockService(String serviceName) {
         || serviceName.equals(BEDROCK_RUNTIME_SERVICE);
   }
 
+  // End of Amazon addition
+
   private static void setAttribute(
       AttributesBuilder attributes,
       AttributeKey<String> key,

instrumentation/aws-sdk/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/RequestAccess.java

@@ -15,6 +15,13 @@
 
 package software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11;
 
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ */
+
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -36,6 +43,7 @@ protected RequestAccess computeValue(Class<?> type) {
         }
       };
 
+  // 2025-07-22: Amazon addition
   @Nullable
   private static BedrockJsonParser.LlmJson parseTargetBody(ByteBuffer buffer) {
     try {
@@ -384,6 +392,8 @@ static String getModelId(Object request) {
     return invokeOrNull(access.getModelId, request);
   }
 
+  // End of Amazon addition
+
   @Nullable
   private static String invokeOrNull(@Nullable MethodHandle method, Object obj) {
     if (method == null) {
@@ -396,6 +406,7 @@ private static String invokeOrNull(@Nullable MethodHandle method, Object obj) {
     }
   }
 
+  // 2025-07-22: Amazon addition
   @Nullable
   private static <T> T invokeOrNullGeneric(
       @Nullable MethodHandle method, Object obj, Class<T> returnType) {
@@ -439,17 +450,44 @@ private RequestAccess(Class<?> clz) {
     getLambdaResourceId = findAccessorOrNull(clz, "getUUID", String.class);
   }
 
+  /**
+   * Uses Java reflection to find a getter method on a class and create a MethodHandle for it.
+   *
+   * @param clz The class to search for the method
+   * @param methodName The name of the getter method (e.g., "getStreamARN")
+   * @param returnType The expected return type of the method
+   * @return A MethodHandle for the method, or null if not found
+   *     <p>Example: For class PutRecordRequest with method "getStreamARN":
+   *     findAccessorOrNull(PutRecordRequest.class, "getStreamARN", String.class) Creates a method
+   *     handle that can invoke getStreamARN() on PutRecordRequest instances
+   */
   @Nullable
   private static MethodHandle findAccessorOrNull(
       Class<?> clz, String methodName, Class<?> returnType) {
     try {
+      // Uses MethodHandles.publicLookup() to get access to public methods
+      // findVirtual finds an instance method with the given name and type
+      // methodType creates a method type with no parameters and the specified return type
       return MethodHandles.publicLookup()
           .findVirtual(clz, methodName, MethodType.methodType(returnType));
     } catch (Throwable t) {
+      // Returns null if method doesn't exist or can't be accessed
       return null;
     }
   }
 
+  /**
+   * Uses reflection to navigate through nested method calls and extract a String value. Unlike
+   * using method handles, this supports chained method calls where each method might return a
+   * different type of object.
+   *
+   * @param obj The initial object to start method calls from
+   * @param methodNames Variable list of method names to call in sequence
+   * @return The final String value, or null if any method in the chain fails or returns null
+   *     <p>Example: For Lambda ARN: findNestedAccessorOrNull(request, "getConfiguration",
+   *     "getFunctionArn") - First calls request.getConfiguration() to get a Configuration object,
+   *     then calls configuration.getFunctionArn() to get the ARN string
+   */
   @Nullable
   private static String findNestedAccessorOrNull(Object obj, String... methodNames) {
     Object current = obj;
@@ -466,4 +504,5 @@ private static String findNestedAccessorOrNull(Object obj, String... methodNames
     }
     return (current instanceof String) ? (String) current : null;
   }
+  // End of Amazon addition
 }

instrumentation/aws-sdk/src/test/groovy/software/amazon/opentelemetry/javaagent/instrumentation/awssdk_v1_11/BedrockJsonParserTest.groovy

@@ -1,10 +1,22 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
 package software.amazon.opentelemetry.javaagent.instrumentation.awssdk_v1_11
 
 import spock.lang.Specification
 
-/*
- * This is a new class created during ADOT git patching.
- */
 class BedrockJsonParserTest extends Specification {
     def "should parse simple JSON object"() {
         given: