Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
12 changes: 12 additions & 0 deletions .github/workflows/templates/test.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ env:
contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
'main'
) || 'main' }}{% endraw %}
WEAVER_VERSION: "v0.22.1"
PIP_EXISTS_ACTION: w
CONTRIB_REPO_UTIL_HTTP: ${% raw %}{{ github.workspace }}{% endraw %}/opentelemetry-python-contrib/util/opentelemetry-util-http
CONTRIB_REPO_INSTRUMENTATION: ${% raw %}{{ github.workspace }}{% endraw %}/opentelemetry-python-contrib/opentelemetry-instrumentation
Expand All @@ -29,6 +30,8 @@ env:

jobs:
{%- for job_data in job_datas %}
{#- grpcio has no wheel for free-threaded Python or PyPy on Windows; Ubuntu builds from source fine #}
Comment thread
lmolkova marked this conversation as resolved.
Outdated
{%- if not (("py314t" in job_data.tox_env or "pypy3" in job_data.tox_env) and "test-opentelemetry-test-utils" in job_data.tox_env and job_data.os == "windows-latest") %}

{{ job_data.name }}:
name: {{ job_data.ui_name }}
Expand All @@ -51,6 +54,14 @@ jobs:
ref: ${% raw %}{{ env.CONTRIB_REPO_SHA }}{% endraw %}
path: opentelemetry-python-contrib
{%- endif %}
{%- if "test-opentelemetry-test-utils" in job_data.tox_env and job_data.os != "windows-latest" %}

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${% raw %}{{ env.WEAVER_VERSION }}{% endraw %}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver
{%- endif %}

- name: Set up Python {{ job_data.python_version }}
uses: actions/setup-python@v5
Expand All @@ -62,4 +73,5 @@ jobs:

- name: Run tests
run: tox -e {{ job_data.tox_env }} -- -ra
{%- endif %}
{%- endfor %}
85 changes: 43 additions & 42 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ env:
contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
'main'
) || 'main' }}
WEAVER_VERSION: "v0.22.1"
PIP_EXISTS_ACTION: w
CONTRIB_REPO_UTIL_HTTP: ${{ github.workspace }}/opentelemetry-python-contrib/util/opentelemetry-util-http
CONTRIB_REPO_INSTRUMENTATION: ${{ github.workspace }}/opentelemetry-python-contrib/opentelemetry-instrumentation
Expand Down Expand Up @@ -2865,6 +2866,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
Expand All @@ -2884,6 +2891,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
Expand All @@ -2903,6 +2916,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
Expand All @@ -2922,6 +2941,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
Expand All @@ -2941,6 +2966,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python 3.14
uses: actions/setup-python@v5
with:
Expand All @@ -2960,6 +2991,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python 3.14t
uses: actions/setup-python@v5
with:
Expand All @@ -2979,6 +3016,12 @@ jobs:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Install weaver
run: |
WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz"
curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver
sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver

- name: Set up Python pypy-3.10
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -6216,45 +6259,3 @@ jobs:

- name: Run tests
run: tox -e py314-test-opentelemetry-test-utils -- -ra

py314t-test-opentelemetry-test-utils_windows-latest:
name: opentelemetry-test-utils 3.14t Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
- name: Configure git to support long filenames
run: git config --system core.longpaths true
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Set up Python 3.14t
uses: actions/setup-python@v5
with:
python-version: "3.14t"

- name: Install tox
run: pip install tox-uv

- name: Run tests
run: tox -e py314t-test-opentelemetry-test-utils -- -ra

pypy3-test-opentelemetry-test-utils_windows-latest:
name: opentelemetry-test-utils pypy-3.10 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
- name: Configure git to support long filenames
run: git config --system core.longpaths true
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

- name: Set up Python pypy-3.10
uses: actions/setup-python@v5
with:
python-version: "pypy-3.10"

- name: Install tox
run: pip install tox-uv

- name: Run tests
run: tox -e pypy3-test-opentelemetry-test-utils -- -ra
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4907](https://github.com/open-telemetry/opentelemetry-python/issues/4907))
- Drop Python 3.9 support
([#5076](https://github.com/open-telemetry/opentelemetry-python/pull/5076))

- Add WeaverLiveCheck test util
([#5088](https://github.com/open-telemetry/opentelemetry-python/pull/5088))

## Version 1.41.0/0.62b0 (2026-04-09)

Expand Down
1 change: 1 addition & 0 deletions tests/opentelemetry-test-utils/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies = [
"asgiref ~= 3.0",
"opentelemetry-api == 1.42.0.dev",
"opentelemetry-sdk == 1.42.0.dev",
"requests ~= 2.28",
]

[project.urls]
Expand Down
Loading
Loading