Merge branch 'main' into dependabot/pip/contract-tests/images/applications/django/django-5.0.13

Author: XinRanZhAWS

.github/workflows/daily_scan.yml

@@ -66,9 +66,9 @@ jobs:
         if: always()
         run: |
           gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 259A55407DD6C00299E6607EFFDE55BE73A2D1ED
-          VERSION=$(curl -s https://jeremylong.github.io/DependencyCheck/current.txt)
-          curl -Ls "https://github.com/jeremylong/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip" --output dependency-check.zip
-          curl -Ls "https://github.com/jeremylong/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip.asc" --output dependency-check.zip.asc
+          VERSION=$(curl -s https://jeremylong.github.io/DependencyCheck/current.txt | head -n1 | cut -d' ' -f1)
+          curl -Ls "https://github.com/dependency-check/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip" --output dependency-check.zip
+          curl -Ls "https://github.com/dependency-check/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip.asc" --output dependency-check.zip.asc
           gpg --verify dependency-check.zip.asc
           unzip dependency-check.zip
           ./dependency-check/bin/dependency-check.sh --enableExperimental --suppression .github/dependency-check-suppressions.xml --failOnCVSS 0 --nvdApiKey ${{ env.NVD_API_KEY_NVD_API_KEY }} -s aws-opentelemetry-distro/

.github/workflows/release-lambda.yml

@@ -212,10 +212,13 @@ jobs:
              layer_arns.tf layer.zip
           echo Removing release_notes.md ...
           rm -f release_notes.md
-      - name: Upload layer.zip to SDK Release Notes (tagged with latest)
+      - name: Upload layer.zip and SHA-256 checksum to SDK Release Notes (tagged with latest)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           LATEST_SDK_VERSION=$(gh release list --repo "aws-observability/aws-otel-python-instrumentation" --json tagName,isLatest -q 'map(select(.isLatest==true)) | .[0].tagName')
-          gh release upload "$LATEST_SDK_VERSION" layer.zip --repo "aws-observability/aws-otel-python-instrumentation" --clobber
+          # Generate SHA-256 checksum for layer.zip
+          shasum -a 256 layer.zip > layer.zip.sha256
+          # Upload layer.zip and its checksum to the latest SDK release note
+          gh release upload "$LATEST_SDK_VERSION" layer.zip layer.zip.sha256 --repo "aws-observability/aws-otel-python-instrumentation" --clobber
           echo "✅ layer.zip successfully uploaded to $LATEST_SDK_VERSION in the upstream repo!"

.github/workflows/release-udp-exporter.yml

@@ -7,6 +7,13 @@ on:
         description: 'Version number for deployment e.g. 0.1.0'
         required: true
         type: string
+env:
+  AWS_DEFAULT_REGION: us-east-1
+  ARTIFACT_NAME: aws_otel_otlp_udp_exporter-${{ github.event.inputs.version }}-py3-none-any.whl
+
+permissions:
+  id-token: write
+  contents: write
 
 jobs:
   build-test-publish:
@@ -74,4 +81,37 @@ jobs:
             exit 1
           fi
 
-      # TODO: Steps to publish to PyPI
+      - name: Configure AWS credentials for PyPI secrets
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRETS_MANAGER }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+
+      - name: Get PyPI secrets
+        uses: aws-actions/aws-secretsmanager-get-secrets@v1
+        id: pypi_secrets
+        with:
+          secret-ids: |
+            PROD_PYPI_TOKEN,${{ secrets.PYPI_PROD_TOKEN_SECRET_ARN }}
+            TEST_PYPI_TOKEN,${{ secrets.PYPI_TEST_TOKEN_SECRET_ARN }}
+          parse-json-secrets: true
+
+      - name: Install twine
+        run: pip install twine
+
+      # The step below publishes to testpypi in order to catch any issues
+      # with the package configuration that would cause a failure to upload to PyPI.
+      - name: Publish to TestPyPI
+        env:
+          TWINE_USERNAME: '__token__'
+          TWINE_PASSWORD: ${{ env.TEST_PYPI_TOKEN_API_TOKEN }}
+        run: |
+          twine upload --repository testpypi --skip-existing --verbose exporters/aws-otel-otlp-udp-exporter/dist/${{ env.ARTIFACT_NAME }}
+
+      # Publish to prod PyPI
+      - name: Publish to PyPI
+        env:
+          TWINE_USERNAME: '__token__'
+          TWINE_PASSWORD: ${{ env.PROD_PYPI_TOKEN_API_TOKEN }}
+        run: |
+          twine upload --skip-existing --verbose exporters/aws-otel-otlp-udp-exporter/dist/${{ env.ARTIFACT_NAME }}

.github/workflows/release_build.yml

@@ -133,14 +133,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         run: |
           # Download layer.zip from existing latest tagged SDK release note
-          LATEST_SDK_VERSION=$(gh release list --repo "aws-observability/aws-otel-java-instrumentation" --json tagName,isLatest -q 'map(select(.isLatest==true)) | .[0].tagName')
+          LATEST_SDK_VERSION=$(gh release list --repo "aws-observability/aws-otel-python-instrumentation" --json tagName,isLatest -q 'map(select(.isLatest==true)) | .[0].tagName')
           mkdir -p layer_artifact
-          gh release download "$LATEST_SDK_VERSION" --repo "aws-observability/aws-otel-java-instrumentation" --pattern "layer.zip" --dir layer_artifact
+          gh release download "$LATEST_SDK_VERSION" --repo "aws-observability/aws-otel-python-instrumentation" --pattern "layer.zip" --dir layer_artifact
+          shasum -a 256 layer_artifact/layer.zip > layer_artifact/layer.zip.sha256
 
           gh release create --target "$GITHUB_REF_NAME" \
              --title "Release v${{ github.event.inputs.version }}" \
              --draft \
              "v${{ github.event.inputs.version }}" \
              dist/${{ env.ARTIFACT_NAME }} \
              ${{ env.ARTIFACT_NAME }}.sha256 \
-             layer_artifact/layer.zip
+             layer_artifact/layer.zip \
+             layer_artifact/layer.zip.sha256

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/_aws_attribute_keys.py

@@ -13,6 +13,7 @@
 AWS_SDK_DESCENDANT: str = "aws.sdk.descendant"
 AWS_CONSUMER_PARENT_SPAN_KIND: str = "aws.consumer.parent.span.kind"
 AWS_TRACE_FLAG_SAMPLED: str = "aws.trace.flag.sampled"
+AWS_TRACE_LAMBDA_FLAG_MULTIPLE_SERVER: str = "aws.trace.lambda.multiple-server"
 AWS_CLOUDFORMATION_PRIMARY_IDENTIFIER: str = "aws.remote.resource.cfn.primary.identifier"
 
 # AWS_#_NAME attributes are not supported in python as they are not part of the Semantic Conventions.

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/_aws_span_processing_util.py

@@ -57,7 +57,8 @@ def get_ingress_operation(__, span: ReadableSpan) -> str:
     with the first API path parameter" if the default span name is None, UnknownOperation or http.method value.
     """
     operation: str = span.name
-    if _AWS_LAMBDA_FUNCTION_NAME in os.environ:
+    scope = getattr(span, "instrumentation_scope", None)
+    if _AWS_LAMBDA_FUNCTION_NAME in os.environ and scope.name != "opentelemetry.instrumentation.flask":
         operation = os.environ.get(_AWS_LAMBDA_FUNCTION_NAME) + "/FunctionHandler"
     elif should_use_internal_operation(span):
         operation = INTERNAL_OPERATION

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_lambda_span_processor.py

@@ -0,0 +1,47 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from typing import Optional
+
+from typing_extensions import override
+
+from amazon.opentelemetry.distro._aws_attribute_keys import AWS_TRACE_LAMBDA_FLAG_MULTIPLE_SERVER
+from opentelemetry.context import Context, get_value
+from opentelemetry.sdk.trace import ReadableSpan, Span, SpanProcessor
+from opentelemetry.trace import SpanKind
+from opentelemetry.trace.propagation import _SPAN_KEY
+
+
+class AwsLambdaSpanProcessor(SpanProcessor):
+    def __init__(self, instrumentation_names=None):
+        self.instrumentation_names = set(instrumentation_names or ["opentelemetry.instrumentation.flask"])
+
+    @override
+    def on_start(self, span: Span, parent_context: Optional[Context] = None) -> None:
+
+        scope = getattr(span, "instrumentation_scope", None)
+        if scope.name in self.instrumentation_names:
+            parent_span = get_value(_SPAN_KEY, context=parent_context)
+
+            if parent_span is None:
+                return
+
+            parent_scope = getattr(parent_span, "instrumentation_scope", None)
+            if parent_scope.name == "opentelemetry.instrumentation.aws_lambda":
+                span._kind = SpanKind.SERVER
+                parent_span.set_attribute(AWS_TRACE_LAMBDA_FLAG_MULTIPLE_SERVER, True)
+
+        return
+
+    # pylint: disable=no-self-use
+    @override
+    def on_end(self, span: ReadableSpan) -> None:
+        return
+
+    @override
+    def shutdown(self) -> None:
+        self.force_flush()
+
+    # pylint: disable=no-self-use
+    @override
+    def force_flush(self, timeout_millis: int = None) -> bool:
+        return True

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py

@@ -16,6 +16,7 @@
     AttributePropagatingSpanProcessorBuilder,
 )
 from amazon.opentelemetry.distro.aws_batch_unsampled_span_processor import BatchUnsampledSpanProcessor
+from amazon.opentelemetry.distro.aws_lambda_span_processor import AwsLambdaSpanProcessor
 from amazon.opentelemetry.distro.aws_metric_attributes_span_exporter_builder import (
     AwsMetricAttributesSpanExporterBuilder,
 )
@@ -343,6 +344,7 @@ def _customize_span_processors(provider: TracerProvider, resource: Resource) ->
     # Export 100% spans and not export Application-Signals metrics if on Lambda.
     if _is_lambda_environment():
         _export_unsampled_span_for_lambda(provider, resource)
+        provider.add_span_processor(AwsLambdaSpanProcessor())
         return
 
     # Construct meterProvider

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_lambda_span_processor.py

@@ -0,0 +1,86 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from amazon.opentelemetry.distro._aws_attribute_keys import AWS_TRACE_LAMBDA_FLAG_MULTIPLE_SERVER
+from amazon.opentelemetry.distro.aws_lambda_span_processor import AwsLambdaSpanProcessor
+from opentelemetry.context import Context, set_value
+from opentelemetry.trace import Span, SpanContext, SpanKind
+from opentelemetry.trace.propagation import _SPAN_KEY
+
+
+class TestAwsLambdaSpanProcessor(TestCase):
+
+    def setUp(self):
+        self.processor = AwsLambdaSpanProcessor()
+        self.lambda_span: Span = MagicMock()
+        self.lambda_span.instrumentation_scope.name = "opentelemetry.instrumentation.aws_lambda"
+        self.lambda_span.kind = SpanKind.SERVER
+
+        self.lambda_span_context: SpanContext = MagicMock()
+        self.lambda_span_context.trace_id = "ABC"
+        self.lambda_span_context.span_id = "lambda_id"
+
+        self.lambda_context: Context = set_value(_SPAN_KEY, self.lambda_span)
+
+        self.lambda_span.get_span_context.return_value = self.lambda_span_context
+        self.processor.on_start(self.lambda_span)
+
+    def tearDown(self):
+        self.processor.on_end(self.lambda_span)
+        self.processor.shutdown()
+
+    @patch("opentelemetry.sdk.trace.Span")
+    def test_lambda_span_multiple_server_flag_internal_api(self, mock_span_class):
+
+        flask_span = mock_span_class.return_value
+        flask_span.instrumentation_scope.name = "opentelemetry.instrumentation.flask"
+        flask_span.kind = SpanKind.INTERNAL
+        flask_span.parent = self.lambda_span_context
+
+        self.processor.on_start(flask_span, self.lambda_context)
+
+        self.assertEqual(flask_span._kind, SpanKind.SERVER)
+        self.assertIn(AWS_TRACE_LAMBDA_FLAG_MULTIPLE_SERVER, self.lambda_span.set_attribute.call_args_list[0][0][0])
+
+        self.processor.on_end(flask_span)
+        self.processor.on_end(self.lambda_span)
+
+        self.processor.shutdown()
+
+    @patch("opentelemetry.sdk.trace.Span")
+    def test_lambda_span_multiple_server_flag_server_api(self, mock_span_class):
+
+        flask_span = mock_span_class.return_value
+        flask_span.instrumentation_scope.name = "opentelemetry.instrumentation.flask"
+        flask_span.kind = SpanKind.SERVER
+        flask_span.parent = self.lambda_span_context
+
+        self.processor.on_start(flask_span, self.lambda_context)
+
+        self.assertEqual(flask_span.kind, SpanKind.SERVER)
+        self.assertIn(AWS_TRACE_LAMBDA_FLAG_MULTIPLE_SERVER, self.lambda_span.set_attribute.call_args_list[0][0][0])
+
+        self.processor.on_end(flask_span)
+        self.processor.on_end(self.lambda_span)
+
+        self.processor.shutdown()
+
+    @patch("opentelemetry.sdk.trace.Span")
+    def test_lambda_span_single_server_span(self, mock_span_class):
+
+        flask_span = mock_span_class.return_value
+        flask_span.instrumentation_scope.name = "opentelemetry.instrumentation.http"
+        flask_span.kind = SpanKind.CLIENT
+        flask_span.parent = self.lambda_span_context
+
+        self.processor.on_start(flask_span, self.lambda_context)
+
+        self.assertEqual(flask_span.kind, SpanKind.CLIENT)
+        flask_span.set_attribute.assert_not_called()
+
+        self.processor.on_end(flask_span)
+        self.processor.on_end(self.lambda_span)
+
+        self.processor.shutdown()

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_opentelementry_configurator.py

@@ -318,7 +318,7 @@ def test_customize_span_processors_lambda(self):
         os.environ.setdefault("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", "True")
         os.environ.setdefault("AWS_LAMBDA_FUNCTION_NAME", "myLambdaFunc")
         _customize_span_processors(mock_tracer_provider, Resource.get_empty())
-        self.assertEqual(mock_tracer_provider.add_span_processor.call_count, 2)
+        self.assertEqual(mock_tracer_provider.add_span_processor.call_count, 3)
         first_processor: SpanProcessor = mock_tracer_provider.add_span_processor.call_args_list[0].args[0]
         self.assertIsInstance(first_processor, AttributePropagatingSpanProcessor)
         second_processor: SpanProcessor = mock_tracer_provider.add_span_processor.call_args_list[1].args[0]