Merge branch 'main' into zhaez/merge-releases

Author: ezhang6811

.github/workflows/daily-scan.yml

@@ -95,7 +95,7 @@ jobs:
         id: high_scan
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.11.0"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.12.0"
           severity: 'CRITICAL,HIGH'
           logout: 'false'
 
@@ -104,7 +104,7 @@ jobs:
         id: low_scan
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.11.0"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.12.0"
           severity: 'MEDIUM,LOW,UNKNOWN'
           logout: 'false'
 

.github/workflows/main-build.yml

@@ -109,3 +109,23 @@ jobs:
     with:
       staging-wheel-name: ${{ needs.build.outputs.staging_wheel_file }}
       adot-image-name: ${{ needs.build.outputs.staging_registry }}/aws-observability/adot-autoinstrumentation-python-staging:${{ needs.build.outputs.python_image_tag }}
+
+  publish-main-build-status:
+    name: "Publish Main Build Status"
+    needs: [ build, application-signals-e2e-test ]
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Configure AWS Credentials for emitting metrics
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.MONITORING_ROLE_ARN }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+
+      - name: Publish main build status
+        run: |
+          value="${{ needs.build.result == 'success' && needs.application-signals-e2e-test.result == 'success' && '0.0' || '1.0'}}"
+          aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \
+            --metric-name Failure \
+            --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=main_build \
+            --value $value

.github/workflows/release-build.yml

@@ -35,6 +35,24 @@ jobs:
       - name: Checkout Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
 
+      - name: Check main build status
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          WORKFLOW_ID=$(gh api repos/${{ github.repository }}/actions/workflows --jq '.workflows[] | select(.name=="Python Instrumentation Main Build") | .id')
+          LATEST_RUN=$(gh api repos/${{ github.repository }}/actions/workflows/$WORKFLOW_ID/runs --jq '[.workflow_runs[] | select(.head_branch=="${{ github.ref_name }}")] | sort_by(.created_at) | .[-1] | {conclusion, status}')
+          STATUS=$(echo "$LATEST_RUN" | jq -r '.status')
+          CONCLUSION=$(echo "$LATEST_RUN" | jq -r '.conclusion')
+          
+          if [ "$STATUS" = "in_progress" ] || [ "$STATUS" = "queued" ]; then
+            echo "Main build is still running (status: $STATUS). Cannot proceed with release."
+            exit 1
+          elif [ "$CONCLUSION" != "success" ]; then
+            echo "Latest main build on branch ${{ github.ref_name }} conclusion: $CONCLUSION"
+            exit 1
+          fi
+          echo "Main build succeeded, proceeding with release"
+
       - name: Build Wheel and Image Files
         uses: ./.github/actions/artifacts_build
         with:

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

@@ -16,6 +16,7 @@
 ROLE_SYSTEM = "system"
 ROLE_USER = "user"
 ROLE_ASSISTANT = "assistant"
+ROLE_TOOL = "tool"
 
 _logger = logging.getLogger(__name__)
 
@@ -137,6 +138,35 @@ class PatternConfig(TypedDict, total=False):
         "role": ROLE_USER,
         "source": "prompt",
     },
+    # OTel GenAI Semantic Convention used by the latest Strands SDK
+    # References:
+    # - OTel GenAI SemConv: https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-events/
+    # - Strands SDK PR(introduced in v0.1.9): https://github.com/strands-agents/sdk-python/pull/319
+    "gen_ai.user.message": {
+        "type": PatternType.DIRECT,
+        "role": ROLE_USER,
+        "source": "prompt",
+    },
+    "gen_ai.assistant.message": {
+        "type": PatternType.DIRECT,
+        "role": ROLE_ASSISTANT,
+        "source": "output",
+    },
+    "gen_ai.system.message": {
+        "type": PatternType.DIRECT,
+        "role": ROLE_SYSTEM,
+        "source": "prompt",
+    },
+    "gen_ai.tool.message": {
+        "type": PatternType.DIRECT,
+        "role": ROLE_TOOL,
+        "source": "prompt",
+    },
+    "gen_ai.choice": {
+        "type": PatternType.DIRECT,
+        "role": ROLE_ASSISTANT,
+        "source": "output",
+    },
 }
 
 
@@ -214,6 +244,7 @@ def _collect_all_llo_messages(self, span: ReadableSpan, attributes: types.Attrib
         for attr_key, value in attributes.items():
             if attr_key in self._exact_match_patterns:
                 config = self._pattern_configs[attr_key]
+
                 messages.append(
                     {"content": value, "role": config.get("role", "unknown"), "source": config.get("source", "unknown")}
                 )
@@ -279,6 +310,12 @@ def _collect_llo_attributes_from_span(self, span: ReadableSpan) -> Dict[str, Any
         # Collect from span events
         if span.events:
             for event in span.events:
+                # Check if event name itself is an LLO pattern (e.g., "gen_ai.user.message")
+                if self._is_llo_attribute(event.name):
+                    # Put all event attributes as the content as LLO in log event
+                    all_llo_attributes[event.name] = dict(event.attributes) if event.attributes else {}
+
+                # Also check traditional pattern - LLO attributes within event attributes
                 if event.attributes:
                     for key, value in event.attributes.items():
                         if self._is_llo_attribute(key):
@@ -372,6 +409,10 @@ def _filter_span_events(self, span: ReadableSpan) -> None:
         updated_events = []
 
         for event in span.events:
+            # Skip entire event if event name is an LLO pattern
+            if self._is_llo_attribute(event.name):
+                continue
+
             if not event.attributes:
                 updated_events.append(event)
                 continue
@@ -417,7 +458,7 @@ def _group_messages_by_type(self, messages: List[Dict[str, Any]]) -> Dict[str, L
             elif role == ROLE_ASSISTANT:
                 output_messages.append(formatted_message)
             else:
-                # Route based on source for non-standard roles
+                # Route based on source for non-standard roles including tool
                 if any(key in message.get("source", "") for key in ["completion", "output", "result"]):
                     output_messages.append(formatted_message)
                 else:

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

@@ -1,4 +1,4 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = "0.11.0.dev0"
+__version__ = "0.12.0.dev0"