Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
e74800c
add nightly build with scripts
ezhang6811 Sep 23, 2025
7252cb3
add otlp exporter dependency
ezhang6811 Sep 23, 2025
e56456b
create PR earlier
ezhang6811 Sep 23, 2025
c2d895d
add test branch
ezhang6811 Sep 23, 2025
6cc475d
remove dependencies label
ezhang6811 Sep 23, 2025
e9c78dd
only push to one branch
ezhang6811 Sep 23, 2025
7349738
add BRANCH_NAME var
ezhang6811 Sep 23, 2025
ca80bbb
update dependency update script
ezhang6811 Sep 23, 2025
cdbfea2
fix checkout
ezhang6811 Sep 23, 2025
feb2005
exit workflow early
ezhang6811 Sep 23, 2025
d9d2dfe
update independent dependency versions
ezhang6811 Sep 23, 2025
e2a6c4c
update comments
ezhang6811 Sep 23, 2025
b074e69
call main build directly from nightly build
ezhang6811 Sep 23, 2025
3fb046f
comment fix
ezhang6811 Sep 23, 2025
351813e
lint fixes
ezhang6811 Sep 23, 2025
9d57171
use SHAs instead of versions for actions
ezhang6811 Sep 23, 2025
9f0ebbb
lint
ezhang6811 Sep 23, 2025
60b627a
lint fixes
ezhang6811 Sep 23, 2025
1544468
more lint
ezhang6811 Sep 23, 2025
a6d58c1
more lint
ezhang6811 Sep 23, 2025
e84deb6
add headers to python scripts
ezhang6811 Sep 23, 2025
51a9ee0
remove push trigger
ezhang6811 Sep 23, 2025
957024b
call main build on nightly build branch
ezhang6811 Sep 23, 2025
076e529
add test branch to push to
ezhang6811 Sep 23, 2025
30d7d0a
Revert "add test branch to push to"
ezhang6811 Sep 23, 2025
f3b7a09
remove extra dependency
ezhang6811 Sep 24, 2025
5182877
always checkout branch and update
ezhang6811 Sep 24, 2025
9efd150
Revert "call main build on nightly build branch"
ezhang6811 Sep 25, 2025
5ebbe34
add links to breaking changes in PR
ezhang6811 Sep 25, 2025
1b56b75
add push trigger for testing
ezhang6811 Sep 25, 2025
2f26b9c
check breaking changes before updating
ezhang6811 Sep 25, 2025
0329b09
update PR for existing branch
ezhang6811 Sep 25, 2025
4db8d3e
update PR correctly if new breaking changes are found
ezhang6811 Sep 25, 2025
84706be
fix PR formatting
ezhang6811 Sep 25, 2025
d9d3a9a
search for open PR in branch
ezhang6811 Sep 25, 2025
1357fc8
PR format fix
ezhang6811 Sep 25, 2025
74c6fb4
publish metric for nightly build failures
ezhang6811 Sep 25, 2025
f5ba036
add permission to configure AWS credentials
ezhang6811 Sep 25, 2025
8b05265
add write and pr permissions
ezhang6811 Sep 25, 2025
dda3ac0
Revert "add test branch to push to"
ezhang6811 Sep 25, 2025
63b72f3
lint fixes for breaking changes script
ezhang6811 Sep 25, 2025
1c7bdf3
lint fix
ezhang6811 Sep 27, 2025
bb66be4
check for breaking changes as headers
ezhang6811 Sep 27, 2025
692abde
test trigger
ezhang6811 Sep 27, 2025
12cc0e5
Revert "check for breaking changes as headers"
ezhang6811 Sep 27, 2025
e7fb5f7
Revert "test trigger"
ezhang6811 Sep 27, 2025
15e4550
lint fix
ezhang6811 Sep 27, 2025
b1b4a87
address minor PR comments
ezhang6811 Oct 8, 2025
3c9440b
add workflow description
ezhang6811 Oct 8, 2025
e6b52b3
Merge branch 'main' into zhaez/nightly-build
ezhang6811 Oct 29, 2025
5e1171d
add independently versioned dependencies to PR description
ezhang6811 Oct 29, 2025
45ea16d
add note for upstream releases
ezhang6811 Oct 29, 2025
6c7b4bd
match only breaking changes as the header
ezhang6811 Oct 29, 2025
a1c81dc
update error handling when parsing upstream releases
ezhang6811 Oct 29, 2025
2846429
exit early on failed script functions
ezhang6811 Oct 30, 2025
831ed16
Merge branch 'main' into zhaez/nightly-build
ezhang6811 Oct 30, 2025
9fe4fee
lint fixes
ezhang6811 Oct 30, 2025
8642b0f
more lint
ezhang6811 Oct 30, 2025
2c189df
add test trigger
ezhang6811 Oct 30, 2025
daac532
minor fixes
ezhang6811 Oct 30, 2025
6d7edc4
refactor w'orkflow
ezhang6811 Oct 31, 2025
fae0a59
update dependencies in all file locations
ezhang6811 Oct 31, 2025
c9445a6
always create pr
ezhang6811 Oct 31, 2025
da1bcd6
fix regex to match all files
ezhang6811 Oct 31, 2025
8e6aa2b
Merge branch 'main' into zhaez/nightly-build
ezhang6811 Oct 31, 2025
bc28671
lint
ezhang6811 Oct 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ on:
- "release/v*"
- ci-workflow
workflow_dispatch: # be able to run the workflow on demand
workflow_call:
inputs:
ref:
description: 'Git ref to checkout'
required: false
type: string
env:
AWS_DEFAULT_REGION: us-east-1
STAGING_ECR_REGISTRY: 637423224110.dkr.ecr.us-east-1.amazonaws.com
Expand Down Expand Up @@ -34,6 +40,8 @@ jobs:
steps:
- name: Checkout Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
with:
ref: ${{ inputs.ref || github.sha }}

- name: Get Python Distro Output
id: python_output
Expand Down Expand Up @@ -114,7 +122,7 @@ jobs:
name: "Publish Main Build Status"
needs: [ build, application-signals-e2e-test ]
runs-on: ubuntu-latest
if: always()
if: always() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/v'))
steps:
- name: Configure AWS Credentials for emitting metrics
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
Expand Down
176 changes: 176 additions & 0 deletions .github/workflows/nightly-build.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the workflow should be:

  1. New job update-branch( everything in update-and-create-pr up to name: Create or update PR)
  2. build-and-test
  3. New job update-pr (Create or update PR and document if build-and-test was successful - callout status and link to the run)
  4. publish-nightly-build-status - (Failure = 0.0 IFF all three above jobs were successful or skipped)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So only create/update PR if main build passes? But then if it fails (most likely b/c of breaking changes), there's no PR to work off of?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, new job update-pr should always() run, but we should include the status of main-build run in the PR. It's easier to work with the PRs that way.

Copy link
Contributor Author

@ezhang6811 ezhang6811 Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, I will run build-and-test first and then link/add the result in the PR description. See new PR #528

Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
name: Nightly Upstream Snapshot Build
description: This workflow checks for new upstream versions of OpenTelemetry dependencies, creates a PR to update them, and builds and tests the new changes.

on:
schedule:
- cron: "21 3 * * *"
workflow_dispatch:
push:
branches:
- zhaez/nightly-build

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_python_version: ${{ steps.get_versions.outputs.otel_python_version }}
otel_contrib_version: ${{ steps.get_versions.outputs.otel_contrib_version }}
aws_sdk_ext_version: ${{ steps.get_versions.outputs.opentelemetry_sdk_extension_aws_version }}
aws_xray_prop_version: ${{ steps.get_versions.outputs.opentelemetry_propagator_aws_xray_version }}
breaking_changes_info: ${{ steps.breaking_changes.outputs.breaking_changes_info }}

steps:
- name: Checkout repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Python
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c #v6.0.0
with:
python-version: '3.x'

- name: Install build tools
run: |
python -m pip install --upgrade pip
pip install toml 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_PYTHON_VERSION: ${{ steps.get_versions.outputs.otel_python_version }}
OTEL_CONTRIB_VERSION: ${{ steps.get_versions.outputs.otel_contrib_version }}
run: python scripts/find_breaking_changes.py

- name: Setup Git
run: |
git config user.name "github-actions"
git config user.email "[email protected]"

- name: Check out dependency update branch
run: |
if git ls-remote --exit-code --heads origin "$BRANCH_NAME"; then
echo "Branch $BRANCH_NAME already exists, checking out..."
git checkout "$BRANCH_NAME"
else
echo "Branch $BRANCH_NAME does not exist, creating new branch..."
git checkout -b "$BRANCH_NAME"
fi

- name: Update dependencies
env:
OTEL_PYTHON_VERSION: ${{ steps.get_versions.outputs.otel_python_version }}
OTEL_CONTRIB_VERSION: ${{ steps.get_versions.outputs.otel_contrib_version }}
OPENTELEMETRY_SDK_EXTENSION_AWS_VERSION: ${{ steps.get_versions.outputs.opentelemetry_sdk_extension_aws_version }}
OPENTELEMETRY_PROPAGATOR_AWS_XRAY_VERSION: ${{ steps.get_versions.outputs.opentelemetry_propagator_aws_xray_version }}
run: python scripts/update_dependencies.py

- name: Check for changes and commit
id: check_changes
run: |
if git diff --quiet; then
echo "No dependency updates needed"
echo "has_changes=false" >> $GITHUB_OUTPUT
else
echo "Dependencies were updated"
echo "has_changes=true" >> $GITHUB_OUTPUT

git add .
git commit -m "chore: update OpenTelemetry dependencies to ${{ steps.get_versions.outputs.otel_python_version }}/${{ steps.get_versions.outputs.otel_contrib_version }}"
git push origin "$BRANCH_NAME"
fi

build-and-test:
needs: update-dependencies
if: needs.update-dependencies.outputs.has_changes == 'true'
uses: ./.github/workflows/main-build.yml
secrets: inherit
permissions:
id-token: write
contents: read
with:
ref: nightly-dependency-updates

create-pr:
needs: [update-dependencies, build-and-test]
if: always() && needs.update-dependencies.outputs.has_changes == 'true'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Create or update PR
run: |
BUILD_STATUS="${{ needs.build-and-test.result }}"
BUILD_EMOJI="${{ needs.build-and-test.result == 'success' && '✅' || '❌' }}"
BUILD_LINK="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

PR_BODY="Automated update of OpenTelemetry dependencies.

**Build Status:** ${BUILD_EMOJI} [${BUILD_STATUS}](${BUILD_LINK})

**Updated versions:**
- [OpenTelemetry Python](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v${{ needs.update-dependencies.outputs.otel_python_version }}): ${{ needs.update-dependencies.outputs.otel_python_version }}
- [OpenTelemetry Contrib](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${{ needs.update-dependencies.outputs.otel_contrib_version }}): ${{ needs.update-dependencies.outputs.otel_contrib_version }}
- [opentelemetry-sdk-extension-aws](https://pypi.org/project/opentelemetry-sdk-extension-aws/${{ needs.update-dependencies.outputs.aws_sdk_ext_version }}/): ${{ needs.update-dependencies.outputs.aws_sdk_ext_version }}
- [opentelemetry-propagator-aws-xray](https://pypi.org/project/opentelemetry-propagator-aws-xray/${{ needs.update-dependencies.outputs.aws_xray_prop_version }}/): ${{ needs.update-dependencies.outputs.aws_xray_prop_version }}

**Upstream releases with breaking changes:**
Note: the mechanism to detect upstream breaking changes is not perfect. Be sure to check all new releases and understand if any additional changes need to be addressed.

${{ 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"
else
echo "Creating new PR..."
gh pr create \
--title "Nightly dependency update: OpenTelemetry ${{ needs.update-dependencies.outputs.otel_python_version }}/${{ needs.update-dependencies.outputs.otel_contrib_version }}" \
--body "$PR_BODY" \
--base main \
--head "$BRANCH_NAME"
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-nightly-build-status:
name: "Publish Nightly Build Status"
needs: [ update-dependencies, build-and-test ]
runs-on: ubuntu-latest
if: always()
steps:
- name: Configure AWS Credentials for emitting metrics
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
with:
role-to-assume: ${{ secrets.MONITORING_ROLE_ARN }}
aws-region: ${{ env.AWS_DEFAULT_REGION }}

- name: Publish nightly build status
run: |
if [[ "${{ needs.build-and-test.result }}" == "skipped" ]]; then
echo "Build was skipped (no changes), not publishing metric"
else
value="${{ needs.build-and-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=nightly_build \
--value $value
fi
118 changes: 118 additions & 0 deletions scripts/find_breaking_changes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
#!/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
from packaging import version


def get_current_version_from_pyproject():
"""Extract current OpenTelemetry versions from pyproject.toml."""
try:
with open("aws-opentelemetry-distro/pyproject.toml", "r", encoding="utf-8") as file:
content = file.read()

# Find first opentelemetry-api version (core version)
api_match = re.search(r'"opentelemetry-api == ([^"]*)"', content)
current_core_version = api_match.group(1) if api_match else None

# Find first opentelemetry-distro version (contrib version)
distro_match = re.search(r'"opentelemetry-distro == ([^"]*)"', content)
current_contrib_version = distro_match.group(1) if distro_match else None

return current_core_version, current_contrib_version

except (OSError, IOError) as error:
print(f"Error reading current versions: {error}")
return None, None


def get_releases_with_breaking_changes(repo, current_version, new_version):
"""Get releases between current and new version that mention breaking changes."""
try:
response = requests.get(f"https://api.github.com/repos/open-telemetry/{repo}/releases", timeout=30)
response.raise_for_status()

releases = response.json()
breaking_releases = []

for release in releases:
release_version = release["tag_name"].lstrip("v")

# Check if this release is between current and new version
try:
if version.parse(release_version) > version.parse(current_version) and version.parse(
release_version
) <= version.parse(new_version):

# Check if release notes have breaking changes header or bold text
body = release.get("body", "")
if re.search(r"^(#+|\*\*)\s*breaking changes", body, re.MULTILINE | re.IGNORECASE):
breaking_releases.append(
{
"version": release_version,
"name": release["name"],
"url": release["html_url"],
"body": release.get("body", ""),
}
)
except (ValueError, KeyError) as parse_error:
print(f"Warning: Skipping release {release.get('name', 'unknown')} due to error: {parse_error}")
continue

return breaking_releases

except requests.RequestException as request_error:
print(f"Error: Could not get releases for {repo}: {request_error}")
sys.exit(1)


def main():
new_core_version = os.environ.get("OTEL_PYTHON_VERSION")
new_contrib_version = os.environ.get("OTEL_CONTRIB_VERSION")

if not new_core_version or not new_contrib_version:
print("Error: OTEL_PYTHON_VERSION and OTEL_CONTRIB_VERSION environment variables required")
sys.exit(1)

current_core_version, current_contrib_version = get_current_version_from_pyproject()

if not current_core_version or not current_contrib_version:
print("Could not determine current versions")
sys.exit(1)

print("Checking for breaking changes:")
print(f"Core: {current_core_version} → {new_core_version}")
print(f"Contrib: {current_contrib_version} → {new_contrib_version}")

# Check both repos for breaking changes
core_breaking = get_releases_with_breaking_changes("opentelemetry-python", current_core_version, new_core_version)
contrib_breaking = get_releases_with_breaking_changes(
"opentelemetry-python-contrib", current_contrib_version, new_contrib_version
)

# Output for GitHub Actions
breaking_info = ""

if core_breaking:
breaking_info += "**opentelemetry-python:**\n"
for release in core_breaking:
breaking_info += f"- [{release['name']}]({release['url']})\n"

if contrib_breaking:
breaking_info += "\n**opentelemetry-python-contrib:**\n"
for release in contrib_breaking:
breaking_info += f"- [{release['name']}]({release['url']})\n"

# 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")


if __name__ == "__main__":
main()
Loading