merge main

Author: liustve

.github/workflows/release-lambda.yml

@@ -206,10 +206,13 @@ jobs:
           done
           echo "}" >> ../layer_cdk
           cat ../layer_cdk
-      - name: download layer.zip
+      - name: download aws-opentelemetry-java-layer.zip
         uses: actions/download-artifact@v5
         with:
-          name: layer.zip
+          name: aws-opentelemetry-java-layer.zip
+      - name: rename to layer.zip
+        run: |
+          mv aws-opentelemetry-java-layer.zip layer.zip
       - name: Get commit hash
         id: commit
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

CHANGELOG.md

@@ -13,5 +13,8 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
 
 ## Unreleased
 
+### Enhancements
 - add CloudWatch EMF metrics exporter
   ([#1209](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1209))
+- Support X-Ray Trace Id extraction from Lambda Context object, and respect user-configured OTEL_PROPAGATORS in AWS Lamdba instrumentation
+  ([#1191](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1191))

lambda-layer/otel-instrument

@@ -2,7 +2,7 @@
 
 export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
 
-export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-baggage,xray,tracecontext}"
+export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-baggage,tracecontext,xray}"
 
 export OTEL_SERVICE_NAME=${OTEL_SERVICE_NAME:-${AWS_LAMBDA_FUNCTION_NAME}}