Merge branch 'main' into issue-688-fix

Author: viw-test1

.github/workflows/build-agentcore-collector.yml

@@ -29,7 +29,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          LATEST_SHA=$(gh api repos/wangzlei/opentelemetry-collector-contrib/commits/genai-adapter-connector --jq '.sha')
+          LATEST_SHA=$(gh api repos/amazon-contributing/opentelemetry-collector-contrib/commits/aws-cwa-dev --jq '.sha')
           LAST_SHA=$(cat .last-code-sha 2>/dev/null || echo "")
 
           echo "Latest SHA: $LATEST_SHA"
@@ -53,11 +53,12 @@ jobs:
     permissions:
       id-token: write
       contents: read
+      actions: write
     steps:
       - name: Checkout code repo
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          repository: wangzlei/opentelemetry-collector-contrib
+          repository: amazon-contributing/opentelemetry-collector-contrib
           ref: ${{ needs.check-for-changes.outputs.latest_sha }}
 
       - name: Set up Go
@@ -78,7 +79,7 @@ jobs:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
         with:
-          role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
+          role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
           aws-region: us-east-1
 
       - name: Package and upload collector to S3
@@ -87,7 +88,7 @@ jobs:
           cp bin/otelcol-agentcore_linux_arm64 collector-package/otelcol-agentcore
           cp cmd/otelcol-agentcore/config.yaml collector-package/config.yaml
           cd collector-package && zip -r ../otelcol-agentcore.zip . && cd ..
-          aws s3 cp otelcol-agentcore.zip s3://${{ secrets.STAGING_BUCKET_NAME }}/otelcol-agentcore.zip
+          aws s3 cp otelcol-agentcore.zip s3://adot-main-build-staging-jar/otelcol-agentcore.zip
 
       - name: Checkout current repo for cache context
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.github/workflows/claude-code-review.yml

@@ -0,0 +1,50 @@
+name: Claude Code Review
+
+on:
+  pull_request_target:
+    branches:
+      - main
+    types: [opened, synchronize, ready_for_review, reopened]
+    # Optional: Only run on specific file changes
+    # paths:
+    #   - "**/*.py"
+    #   - "**/*.pyi"
+
+concurrency:
+  group: claude-review-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  claude-review:
+    if: ${{ !github.event.pull_request.draft }}
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: read
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 #v4.3.1
+        with:
+          fetch-depth: 50
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
+        with:
+          role-to-assume: ${{ secrets.TELEGEN_AWS_ASSUME_ROLE_ARN }}
+          aws-region: ${{ vars.AWS_DEFAULT_REGION || 'us-east-1' }}
+
+      - name: Run Claude Code Review
+        id: claude-review
+        uses: anthropics/claude-code-action@1b422b3517b51140e4484faab676c5e68b914866 #v1.0.73
+        with:
+          use_bedrock: "true"
+          direct_api: "true"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          claude_args: |
+            --model us.anthropic.claude-opus-4-6-v1 --allowedTools "Bash(gh pr diff *),Bash(gh pr view *),Bash(gh api repos/*/pulls/*/comments*),Bash(gh api repos/*/pulls/*/reviews*)"
+          prompt: |
+            Review this PR for bugs, security issues, and code quality. Post your findings as inline review comments on the relevant lines.

.github/workflows/main-build.yml

@@ -134,15 +134,15 @@ jobs:
       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 }}
 
-  # build-agentcore-collector:
-  #   name: "Build AgentCore Runtime Collector"
-  #   needs: [ build ]
-  #   uses: ./.github/workflows/build-agentcore-collector.yml
-  #   secrets: inherit
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #     actions: write
+  build-agentcore-collector:
+    name: "Build AgentCore Runtime Collector"
+    needs: [ build ]
+    uses: ./.github/workflows/build-agentcore-collector.yml
+    secrets: inherit
+    permissions:
+      id-token: write
+      contents: read
+      actions: write
 
   publish-main-build-status:
     name: "Publish Main Build Status"

.github/workflows/nightly-build.yml

@@ -100,6 +100,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
+      actions: write
     with:
       ref: nightly-dependency-updates
 
@@ -151,8 +152,10 @@ jobs:
         ${{ needs.update-dependencies.outputs.breaking_changes_info }}"
         
         if gh pr view "$BRANCH_NAME" --json state --jq '.state' 2>/dev/null | grep -q "OPEN"; then
-          echo "Open PR already exists, updating description..."
-          gh pr edit "$BRANCH_NAME" --body "$PR_BODY"
+          echo "Open PR already exists, updating title and description..."
+          gh pr edit "$BRANCH_NAME" \
+            --title "Nightly dependency update: OpenTelemetry ${{ needs.update-dependencies.outputs.otel_python_version }}/${{ needs.update-dependencies.outputs.otel_contrib_version }}" \
+            --body "$PR_BODY"
         else
           echo "Creating new PR..."
           gh pr create \