Lambda and AWS SDK metadata updates

docs/instrumentation-list.yaml

@@ -1322,6 +1322,8 @@ libraries:
     description: |
       Provides lightweight instrumentation of the Lambda core library, supporting all versions. It generates FaaS server spans with the `faas.invocation_id` attribute. Use this package if you only use `RequestStreamHandler` or know you don't use any event classes from `aws-lambda-java-events`. This also includes when you are using `aws-serverless-java-container` to run e.g., a Spring Boot application on Lambda.
       For custom wrappers when using library instrumentation, you can configure the `OTEL_INSTRUMENTATION_AWS_LAMBDA_HANDLER` environment variable to contain your lambda handler method (in the format `package.ClassName::methodName`) and use one of wrappers as your lambda `Handler`.
+    semantic_conventions:
+    - FAAS_SERVER_SPANS
     library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
     source_path: instrumentation/aws-lambda/aws-lambda-core-1.0
     scope:
@@ -1345,7 +1347,10 @@ libraries:
           type: STRING
   - name: aws-lambda-events-2.2
     description: |
-      This version of the library instrumentation is deprecated, please use the `aws-lambda-events-3.11` library instrumentation instead. This instrumentation builds on top of the `aws-lambda-core-1.0` instrumentation, expanding support to cover the Lambda library, including standard and custom event types.
+      This version of the library instrumentation is deprecated, please use `aws-lambda-events-3.11` instead. This instrumentation enables FaaS spans and messaging spans for AWS Lambda functions handling event types.
+    semantic_conventions:
+    - FAAS_SERVER_SPANS
+    - MESSAGING_SPANS
     library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
     source_path: instrumentation/aws-lambda/aws-lambda-events-2.2
     scope:
@@ -1391,7 +1396,10 @@ libraries:
           type: STRING
   - name: aws-lambda-events-3.11
     description: |
-      This instrumentation builds on top of the `aws-lambda-core-1.0` instrumentation, expanding support to cover the Lambda library, including standard and custom event types.
+      This library instrumentation provides FaaS spans and messaging spans for AWS Lambda functions handling event types.
+    semantic_conventions:
+    - FAAS_SERVER_SPANS
+    - MESSAGING_SPANS
     library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
     source_path: instrumentation/aws-lambda/aws-lambda-events-3.11
     scope:
@@ -1439,6 +1447,13 @@ libraries:
   - name: aws-sdk-1.11
     description: |
       This instrumentation covers the AWS SDK 1.11+ client library, enabling messaging and client spans and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, secrets manager, SNS/SQS and step functions.
+    semantic_conventions:
+    - HTTP_CLIENT_SPANS
+    - DATABASE_CLIENT_SPANS
+    - DATABASE_CLIENT_METRICS
+    - MESSAGING_SPANS
+    - GENAI_CLIENT_SPANS
+    - GENAI_CLIENT_METRICS
     library_link: https://aws.amazon.com/sdk-for-java/
     source_path: instrumentation/aws-sdk/aws-sdk-1.11
     scope:
@@ -1667,6 +1682,13 @@ libraries:
   - name: aws-sdk-2.2
     description: |
       This instrumentation covers the AWS SDK 2.2+ client library, enabling messaging and client spans and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, SNS/SQS and Bedrock.
+    semantic_conventions:
+    - HTTP_CLIENT_SPANS
+    - DATABASE_CLIENT_SPANS
+    - DATABASE_CLIENT_METRICS
+    - MESSAGING_SPANS
+    - GENAI_CLIENT_SPANS
+    - GENAI_CLIENT_METRICS
     library_link: https://aws.amazon.com/sdk-for-java/
     source_path: instrumentation/aws-sdk/aws-sdk-2.2
     scope:
@@ -5149,6 +5171,11 @@ libraries:
         and ROLLBACK operations.
       type: boolean
       default: false
+    - name: otel.instrumentation.jdbc.experimental.sqlcommenter.enabled
+      description: |
+        Enables augmenting queries with a comment containing the tracing information. See [sqlcommenter](https://google.github.io/sqlcommenter/) for more info. WARNING: augmenting queries with tracing context will make query texts unique, which may have adverse impact on database performance. Consult with database experts before enabling.
+      type: boolean
+      default: false
     - name: otel.instrumentation.common.peer-service-mapping
       description: Used to specify a mapping from host names or IP addresses to peer
         services.

instrumentation/aws-lambda/aws-lambda-core-1.0/metadata.yaml

@@ -8,6 +8,8 @@ description: >
   For custom wrappers when using library instrumentation, you can configure the `OTEL_INSTRUMENTATION_AWS_LAMBDA_HANDLER`
   environment variable to contain your lambda handler method (in the format `package.ClassName::methodName`) and use
   one of wrappers as your lambda `Handler`.
+semantic_conventions:
+  - FAAS_SERVER_SPANS
 library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
 configurations:
   - name: otel.instrumentation.aws-lambda.flush-timeout

instrumentation/aws-lambda/aws-lambda-events-2.2/metadata.yaml

@@ -1,7 +1,10 @@
 description: >
-  This version of the library instrumentation is deprecated, please use the `aws-lambda-events-3.11`
-  library instrumentation instead. This instrumentation builds on top of the `aws-lambda-core-1.0`
-  instrumentation, expanding support to cover the Lambda library, including standard and custom event types.
+  This version of the library instrumentation is deprecated, please use `aws-lambda-events-3.11`
+  instead. This instrumentation enables FaaS spans and messaging spans for AWS Lambda functions
+  handling event types.
+semantic_conventions:
+  - FAAS_SERVER_SPANS
+  - MESSAGING_SPANS
 library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
 configurations:
   - name: otel.instrumentation.aws-lambda.flush-timeout

instrumentation/aws-lambda/aws-lambda-events-3.11/metadata.yaml

@@ -1,6 +1,9 @@
 description: >
-  This instrumentation builds on top of the `aws-lambda-core-1.0` instrumentation, expanding support
-  to cover the Lambda library, including standard and custom event types.
+  This library instrumentation provides FaaS spans and messaging spans for AWS Lambda functions
+  handling event types.
+semantic_conventions:
+  - FAAS_SERVER_SPANS
+  - MESSAGING_SPANS
 library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
 configurations:
   - name: otel.instrumentation.aws-lambda.flush-timeout

instrumentation/aws-sdk/aws-sdk-1.11/metadata.yaml

@@ -3,6 +3,13 @@ description: >
   and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, secrets
   manager, SNS/SQS and step functions.
 library_link: https://aws.amazon.com/sdk-for-java/
+semantic_conventions:
+  - HTTP_CLIENT_SPANS
+  - DATABASE_CLIENT_SPANS
+  - DATABASE_CLIENT_METRICS
+  - MESSAGING_SPANS
+  - GENAI_CLIENT_SPANS
+  - GENAI_CLIENT_METRICS
 configurations:
   - name: otel.instrumentation.aws-sdk.experimental-span-attributes
     description: >

instrumentation/aws-sdk/aws-sdk-2.2/metadata.yaml

@@ -2,6 +2,13 @@ description: >
   This instrumentation covers the AWS SDK 2.2+ client library, enabling messaging and client spans
   and metrics for calls to AWS services including DynamoDB, EC2, Kinesis, Lambda, RDS, S3, SNS/SQS
   and Bedrock.
+semantic_conventions:
+  - HTTP_CLIENT_SPANS
+  - DATABASE_CLIENT_SPANS
+  - DATABASE_CLIENT_METRICS
+  - MESSAGING_SPANS
+  - GENAI_CLIENT_SPANS
+  - GENAI_CLIENT_METRICS
 library_link: https://aws.amazon.com/sdk-for-java/
 configurations:
   - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled