From 2b1b62fcec01f05f685d41476c7a328898e7d322 Mon Sep 17 00:00:00 2001 From: Charles Cheng Date: Mon, 20 Jul 2026 12:15:30 +0800 Subject: [PATCH 1/3] test: re-enable PyPy botocore matrix --- .github/workflows/test.yml | 114 +++++++++++++++++++++++++++++++++++++ tox.ini | 4 +- 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f27399a863..fa7fd0a084 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3387,6 +3387,120 @@ jobs: - name: Run tests run: tox -e py314-test-instrumentation-botocore-3 -- -ra + pypy3-test-instrumentation-botocore-0-wrapt1_ubuntu-latest: + name: instrumentation-botocore-0-wrapt1 pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - 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-instrumentation-botocore-0-wrapt1 -- -ra + + pypy3-test-instrumentation-botocore-0-wrapt2_ubuntu-latest: + name: instrumentation-botocore-0-wrapt2 pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - 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-instrumentation-botocore-0-wrapt2 -- -ra + + pypy3-test-instrumentation-botocore-1-wrapt1_ubuntu-latest: + name: instrumentation-botocore-1-wrapt1 pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - 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-instrumentation-botocore-1-wrapt1 -- -ra + + pypy3-test-instrumentation-botocore-1-wrapt2_ubuntu-latest: + name: instrumentation-botocore-1-wrapt2 pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - 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-instrumentation-botocore-1-wrapt2 -- -ra + + pypy3-test-instrumentation-botocore-2_ubuntu-latest: + name: instrumentation-botocore-2 pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - 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-instrumentation-botocore-2 -- -ra + + pypy3-test-instrumentation-botocore-3_ubuntu-latest: + name: instrumentation-botocore-3 pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - 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-instrumentation-botocore-3 -- -ra + py310-test-instrumentation-boto3sqs_ubuntu-latest: name: instrumentation-boto3sqs 3.10 Ubuntu runs-on: ubuntu-latest diff --git a/tox.ini b/tox.ini index 81ba52d1f5..57fa9871f7 100644 --- a/tox.ini +++ b/tox.ini @@ -95,8 +95,8 @@ envlist = ; opentelemetry-instrumentation-botocore py3{10,11,12,13,14}-test-instrumentation-botocore-{0,1}-{wrapt1,wrapt2} py3{10,11,12,13,14}-test-instrumentation-botocore-{2,3} - ; FIXME: see https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1736 - ; pypy3-test-instrumentation-botocore + pypy3-test-instrumentation-botocore-{0,1}-{wrapt1,wrapt2} + pypy3-test-instrumentation-botocore-{2,3} lint-instrumentation-botocore ; opentelemetry-instrumentation-boto3sqs From f0ab46b54228683c2eb5c341ef5ba07f8947b310 Mon Sep 17 00:00:00 2001 From: Charles Cheng Date: Mon, 20 Jul 2026 12:21:18 +0800 Subject: [PATCH 2/3] chore: add botocore changelog fragment --- .changelog/4841.fixed | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/4841.fixed diff --git a/.changelog/4841.fixed b/.changelog/4841.fixed new file mode 100644 index 0000000000..761e12d539 --- /dev/null +++ b/.changelog/4841.fixed @@ -0,0 +1 @@ +`opentelemetry-instrumentation-botocore`: Restore PyPy test coverage. From 55e0d76bf7ec748c9ff10815c6e9f4a827e25c01 Mon Sep 17 00:00:00 2001 From: Charles Cheng Date: Wed, 22 Jul 2026 20:25:52 +0800 Subject: [PATCH 3/3] test: narrow PyPy botocore matrix --- .github/workflows/test.yml | 76 -------------------------------------- tox.ini | 4 +- 2 files changed, 2 insertions(+), 78 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa7fd0a084..58bf2a2196 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3387,63 +3387,6 @@ jobs: - name: Run tests run: tox -e py314-test-instrumentation-botocore-3 -- -ra - pypy3-test-instrumentation-botocore-0-wrapt1_ubuntu-latest: - name: instrumentation-botocore-0-wrapt1 pypy-3.10 Ubuntu - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - 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-instrumentation-botocore-0-wrapt1 -- -ra - - pypy3-test-instrumentation-botocore-0-wrapt2_ubuntu-latest: - name: instrumentation-botocore-0-wrapt2 pypy-3.10 Ubuntu - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - 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-instrumentation-botocore-0-wrapt2 -- -ra - - pypy3-test-instrumentation-botocore-1-wrapt1_ubuntu-latest: - name: instrumentation-botocore-1-wrapt1 pypy-3.10 Ubuntu - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - 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-instrumentation-botocore-1-wrapt1 -- -ra - pypy3-test-instrumentation-botocore-1-wrapt2_ubuntu-latest: name: instrumentation-botocore-1-wrapt2 pypy-3.10 Ubuntu runs-on: ubuntu-latest @@ -3463,25 +3406,6 @@ jobs: - name: Run tests run: tox -e pypy3-test-instrumentation-botocore-1-wrapt2 -- -ra - pypy3-test-instrumentation-botocore-2_ubuntu-latest: - name: instrumentation-botocore-2 pypy-3.10 Ubuntu - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - 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-instrumentation-botocore-2 -- -ra - pypy3-test-instrumentation-botocore-3_ubuntu-latest: name: instrumentation-botocore-3 pypy-3.10 Ubuntu runs-on: ubuntu-latest diff --git a/tox.ini b/tox.ini index 57fa9871f7..6e0993e9e0 100644 --- a/tox.ini +++ b/tox.ini @@ -95,8 +95,8 @@ envlist = ; opentelemetry-instrumentation-botocore py3{10,11,12,13,14}-test-instrumentation-botocore-{0,1}-{wrapt1,wrapt2} py3{10,11,12,13,14}-test-instrumentation-botocore-{2,3} - pypy3-test-instrumentation-botocore-{0,1}-{wrapt1,wrapt2} - pypy3-test-instrumentation-botocore-{2,3} + pypy3-test-instrumentation-botocore-1-wrapt2 + pypy3-test-instrumentation-botocore-3 lint-instrumentation-botocore ; opentelemetry-instrumentation-boto3sqs