parity with python nightly build

ezhang6811 · ezhang6811 · commit de3d22ac1ea7 · 2025-11-10T18:37:36.000-08:00
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -5,26 +5,23 @@ on:
   schedule:
     - cron: "21 3 * * *"
   workflow_dispatch:
-  push:
-    branches:
-      - zhaez/nightly-build
-
-permissions:
-  contents: write
-  pull-requests: write
-  id-token: write
 
 env:
   AWS_DEFAULT_REGION: us-east-1
   BRANCH_NAME: nightly-dependency-updates
 
+permissions:
+  id-token: write
+  contents: write
+  pull-requests: write
+
 jobs:
   update-dependencies:
     runs-on: ubuntu-latest
     outputs:
       has_changes: ${{ steps.check_changes.outputs.has_changes }}
-      otel_java_instrumentation_version: ${{ steps.update_deps.outputs.otel_java_instrumentation_version }}
-      otel_java_contrib_version: ${{ steps.update_deps.outputs.otel_java_contrib_version }}
+      otel_java_instrumentation_version: ${{ steps.get_versions.outputs.otel_java_instrumentation_version }}
+      otel_java_contrib_version: ${{ steps.get_versions.outputs.otel_java_contrib_version }}
       breaking_changes_info: ${{ steps.breaking_changes.outputs.breaking_changes_info }}
     
     steps:
@@ -34,10 +31,31 @@ jobs:
         fetch-depth: 0
         token: ${{ secrets.GITHUB_TOKEN }}
     
-    - name: Configure git
+    - name: Set up Python
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c #v6.0.0
+      with:
+        python-version: '3.x'
+    
+    - name: Install build tools
       run: |
-        git config --local user.email "action@github.com"
-        git config --local user.name "GitHub Action"
+        python -m pip install --upgrade pip
+        pip install requests packaging
+    
+    - name: Get latest upstream versions
+      id: get_versions
+      run: python scripts/get_upstream_versions.py
+    
+    - name: Check for breaking changes
+      id: breaking_changes
+      env:
+        OTEL_JAVA_INSTRUMENTATION_VERSION: ${{ steps.get_versions.outputs.otel_java_instrumentation_version }}
+        OTEL_JAVA_CONTRIB_VERSION: ${{ steps.get_versions.outputs.otel_java_contrib_version }}
+      run: python scripts/find_breaking_changes.py
+    
+    - name: Setup Git
+      run: |
+        git config user.name "github-actions"
+        git config user.email "github-actions@github.com"
     
     - name: Check out dependency update branch
       run: |
@@ -49,21 +67,11 @@ jobs:
           git checkout -b "$BRANCH_NAME"
         fi
     
-    - name: Set up Python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c #v6.0.0
-      with:
-        python-version: '3.11'
-    
-    - name: Install Python dependencies
-      run: pip install requests packaging
-    
-    - name: Generate breaking changes summary
-      id: breaking_changes
-      run: python3 scripts/find_breaking_changes.py
-    
     - name: Update dependencies
-      id: update_deps
-      run: python3 scripts/update_dependencies.py
+      env:
+        OTEL_JAVA_INSTRUMENTATION_VERSION: ${{ steps.get_versions.outputs.otel_java_instrumentation_version }}
+        OTEL_JAVA_CONTRIB_VERSION: ${{ steps.get_versions.outputs.otel_java_contrib_version }}
+      run: python scripts/update_dependencies.py
     
     - name: Check for changes and commit
       id: check_changes
@@ -75,8 +83,8 @@ jobs:
           echo "Dependencies were updated"
           echo "has_changes=true" >> $GITHUB_OUTPUT
           
-          git add dependencyManagement/build.gradle.kts
-          git commit -m "chore: update OpenTelemetry dependencies to latest versions"
+          git add .
+          git commit -m "chore: update OpenTelemetry dependencies to ${{ steps.get_versions.outputs.otel_java_instrumentation_version }}/${{ steps.get_versions.outputs.otel_java_contrib_version }}"
           git push origin "$BRANCH_NAME"
         fi
 
@@ -85,8 +93,10 @@ jobs:
     if: needs.update-dependencies.outputs.has_changes == 'true'
     uses: ./.github/workflows/main-build.yml
     secrets: inherit
+    permissions:
+      id-token: write
+      contents: read
     with:
-      caller-workflow-name: nightly-build
       ref: nightly-dependency-updates
 
   create-pr:
@@ -124,7 +134,7 @@ jobs:
         else
           echo "Creating new PR..."
           gh pr create \
-            --title "Nightly dependency update: OpenTelemetry packages to latest versions" \
+            --title "Nightly dependency update: OpenTelemetry ${{ needs.update-dependencies.outputs.otel_java_instrumentation_version }}/${{ needs.update-dependencies.outputs.otel_java_contrib_version }}" \
             --body "$PR_BODY" \
             --base main \
             --head "$BRANCH_NAME"
@@ -141,7 +151,7 @@ jobs:
       - name: Configure AWS Credentials for emitting metrics
         uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
         with:
-          role-to-assume: ${{ secrets.METRICS_ROLE_ARN }}
+          role-to-assume: ${{ secrets.MONITORING_ROLE_ARN }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
 
       - name: Publish nightly build status
diff --git a/scripts/find_breaking_changes.py b/scripts/find_breaking_changes.py
@@ -1,26 +1,34 @@
 #!/usr/bin/env python3
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 
+import os
 import re
-import requests
 import sys
+
+import requests
 from packaging import version
 
 
-def get_current_versions():
-    """Get current versions from build.gradle.kts."""
+def get_current_version_from_gradle():
+    """Extract current OpenTelemetry versions from build.gradle.kts."""
     try:
         with open("dependencyManagement/build.gradle.kts", "r", encoding="utf-8") as file:
             content = file.read()
 
-        # Extract otelVersion
+        # Extract otelVersion (instrumentation version)
         otel_version_match = re.search(r'val otelVersion = "([^"]*)"', content)
         current_instrumentation_version = otel_version_match.group(1) if otel_version_match else None
 
-        return current_instrumentation_version
+        # Extract contrib version from dependency line
+        contrib_match = re.search(r'"io\.opentelemetry\.contrib:opentelemetry-aws-xray:([^"]*)",', content)
+        current_contrib_version = contrib_match.group(1) if contrib_match else None
+
+        return current_instrumentation_version, current_contrib_version
 
     except (OSError, IOError) as error:
         print(f"Error reading current versions: {error}")
-        return None
+        return None, None
 
 
 def get_releases_with_breaking_changes(repo, current_version, new_version):
@@ -44,10 +52,9 @@ def get_releases_with_breaking_changes(repo, current_version, new_version):
                     <= version.parse(new_version)
                 ):
 
-                    # Check if release notes have breaking changes as headers
+                    # Check if release notes have breaking changes header or bold text
                     body = release.get("body", "")
-                    breaking_header_pattern = r'^\s*#+.*Breaking changes'
-                    if re.search(breaking_header_pattern, body, re.MULTILINE):
+                    if re.search(r"^(#+|\*\*)\s*breaking changes", body, re.MULTILINE | re.IGNORECASE):
                         breaking_releases.append(
                             {
                                 "version": release_version,
@@ -56,7 +63,8 @@ def get_releases_with_breaking_changes(repo, current_version, new_version):
                                 "body": release.get("body", ""),
                             }
                         )
-            except (ValueError, KeyError):
+            except (ValueError, KeyError) as parse_error:
+                print(f"Warning: Skipping release {release.get('name', 'unknown')} due to error: {parse_error}")
                 continue
 
         return breaking_releases
@@ -67,32 +75,32 @@ def get_releases_with_breaking_changes(repo, current_version, new_version):
 
 
 def main():
-    current_instrumentation_version = get_current_versions()
+    new_instrumentation_version = os.environ.get("OTEL_JAVA_INSTRUMENTATION_VERSION")
+    new_contrib_version = os.environ.get("OTEL_JAVA_CONTRIB_VERSION")
 
-    if not current_instrumentation_version:
-        print("Could not determine current versions")
+    if not new_instrumentation_version or not new_contrib_version:
+        print("Error: OTEL_JAVA_INSTRUMENTATION_VERSION and OTEL_JAVA_CONTRIB_VERSION environment variables required")
         sys.exit(1)
 
-    # Get new versions from the update script
-    sys.path.append('scripts')
-    from update_dependencies import get_latest_instrumentation_version, get_latest_contrib_version
-
-    new_instrumentation_version = get_latest_instrumentation_version()
-    new_contrib_version = get_latest_contrib_version()
+    current_instrumentation_version, current_contrib_version = get_current_version_from_gradle()
 
-    if not new_instrumentation_version:
-        print("Could not determine new versions")
+    if not current_instrumentation_version:
+        print("Could not determine current versions")
         sys.exit(1)
 
     print("Checking for breaking changes:")
     print(f"Instrumentation: {current_instrumentation_version} → {new_instrumentation_version}")
-    if new_contrib_version:
-        print(f"Contrib: → {new_contrib_version}")
+    print(f"Contrib: {current_contrib_version or 'unknown'} → {new_contrib_version}")
 
-    # Check instrumentation repo for breaking changes
+    # Check both repos for breaking changes
     instrumentation_breaking = get_releases_with_breaking_changes(
         "opentelemetry-java-instrumentation", current_instrumentation_version, new_instrumentation_version
     )
+    contrib_breaking = []
+    if current_contrib_version:
+        contrib_breaking = get_releases_with_breaking_changes(
+            "opentelemetry-java-contrib", current_contrib_version, new_contrib_version
+        )
 
     # Output for GitHub Actions
     breaking_info = ""
@@ -102,11 +110,12 @@ def main():
         for release in instrumentation_breaking:
             breaking_info += f"- [{release['name']}]({release['url']})\n"
 
-    if new_contrib_version:
-        breaking_info += "\n**Check contrib releases for potential breaking changes:**\n"
-        breaking_info += "- [opentelemetry-java-contrib releases](https://github.com/open-telemetry/opentelemetry-java-contrib/releases)\n"
+    if contrib_breaking:
+        breaking_info += "\n**opentelemetry-java-contrib:**\n"
+        for release in contrib_breaking:
+            breaking_info += f"- [{release['name']}]({release['url']})\n"
 
-    import os
+    # Set GitHub output
     if os.environ.get("GITHUB_OUTPUT"):
         with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as output_file:
             output_file.write(f"breaking_changes_info<<EOF\n{breaking_info}EOF\n")
diff --git a/scripts/get_upstream_versions.py b/scripts/get_upstream_versions.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+import re
+import sys
+
+import requests
+
+
+def get_latest_otel_versions():
+    """Get latest OpenTelemetry versions from GitHub releases."""
+    try:
+        # Get latest instrumentation version
+        response = requests.get(
+            "https://api.github.com/repos/open-telemetry/opentelemetry-java-instrumentation/releases/latest", timeout=30
+        )
+        response.raise_for_status()
+
+        release_data = response.json()
+        otel_java_instrumentation_version = release_data["tag_name"].lstrip("v")
+
+        # Get latest contrib version
+        contrib_response = requests.get(
+            "https://api.github.com/repos/open-telemetry/opentelemetry-java-contrib/releases", timeout=30
+        )
+        contrib_response.raise_for_status()
+
+        contrib_releases = contrib_response.json()
+        otel_java_contrib_version = None
+
+        # Find the latest stable release
+        for release in contrib_releases:
+            if release.get("prerelease", False):
+                continue
+
+            tag_name = release["tag_name"]
+            version_match = re.match(r"^v?(\d+\.\d+\.\d+)$", tag_name)
+            if version_match:
+                otel_java_contrib_version = version_match.group(1)
+                break
+
+        if not otel_java_contrib_version:
+            print("Warning: No stable contrib releases found")
+            otel_java_contrib_version = "1.48.0"  # fallback
+
+        return otel_java_instrumentation_version, otel_java_contrib_version
+
+    except requests.RequestException as request_error:
+        print(f"Error getting OpenTelemetry versions: {request_error}")
+        sys.exit(1)
+
+
+def main():
+    otel_java_instrumentation_version, otel_java_contrib_version = get_latest_otel_versions()
+
+    print(f"OTEL_JAVA_INSTRUMENTATION_VERSION={otel_java_instrumentation_version}")
+    print(f"OTEL_JAVA_CONTRIB_VERSION={otel_java_contrib_version}")
+
+    # Write to GitHub output if in CI
+    if "GITHUB_OUTPUT" in os.environ:
+        with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as output_file:
+            output_file.write(f"otel_java_instrumentation_version={otel_java_instrumentation_version}\n")
+            output_file.write(f"otel_java_contrib_version={otel_java_contrib_version}\n")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/update_dependencies.py b/scripts/update_dependencies.py
