Skip to content

Commit 1d4bc74

Browse files
blarghmateyCopilot
blarghmatey
and
Copilot
committed
Add wrapt 1.x/2.x test matrix for all ObjectProxy-using instrumentations
Extend the wrapt1/wrapt2 test matrix to all instrumentations that use wrapt.ObjectProxy or wrapt.BaseObjectProxy: botocore, dbapi, grpc, pika, aiopg, httpx, and asyncpg. Changes: - tox.ini: Add {wrapt1,wrapt2} factor to envlist for all 7 packages; update deps to reference per-version test-requirements files - botocore/pyproject.toml: Add missing wrapt dependency (>= 1.0.0, < 3.0.0) - All base test-requirements files: Remove pinned wrapt== and Deprecated== - New test-requirements-wrapt1.txt / test-requirements-wrapt2.txt files for each package (using Deprecated>=1.2.18 for wrapt2 to avoid conflict with Deprecated==1.2.14 which requires wrapt<2) - Regenerate GitHub Actions workflows (including new test_3.yml due to expanded job count) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent db4adc0 commit 1d4bc74

40 files changed

+3877
-2182
lines changed

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 363 additions & 33 deletions
Large diffs are not rendered by default.

‎.github/workflows/test_0.yml‎

Lines changed: 547 additions & 547 deletions
Large diffs are not rendered by default.

‎.github/workflows/test_1.yml‎

Lines changed: 1181 additions & 1181 deletions
Large diffs are not rendered by default.

‎.github/workflows/test_2.yml‎

Lines changed: 1383 additions & 376 deletions
Large diffs are not rendered by default.

‎.github/workflows/test_3.yml‎

Lines changed: 299 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,299 @@
1+
# Do not edit this file.
2+
# This file is generated automatically by executing tox -e generate-workflows
3+
4+
name: Test 3
5+
6+
on:
7+
push:
8+
branches-ignore:
9+
- 'release/*'
10+
- 'otelbot/*'
11+
pull_request:
12+
13+
permissions:
14+
contents: read
15+
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
18+
cancel-in-progress: true
19+
20+
env:
21+
# Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
22+
# For PRs you can change the inner fallback ('main')
23+
# For pushes you change the outer fallback ('main')
24+
# The logic below is used during releases and depends on having an equivalent branch name in the core repo.
25+
CORE_REPO_SHA: ${{ github.event_name == 'pull_request' && (
26+
contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
27+
contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
28+
'main'
29+
) || 'main' }}
30+
CONTRIB_REPO_SHA: main
31+
PIP_EXISTS_ACTION: w
32+
33+
jobs:
34+
35+
py312-test-instrumentation-cassandra-driver_ubuntu-latest:
36+
name: instrumentation-cassandra-driver 3.12 Ubuntu
37+
runs-on: ubuntu-latest
38+
timeout-minutes: 30
39+
steps:
40+
- name: Checkout repo @ SHA - ${{ github.sha }}
41+
uses: actions/checkout@v4
42+
43+
- name: Set up Python 3.12
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: "3.12"
47+
48+
- name: Install tox
49+
run: pip install tox-uv
50+
51+
- name: Run tests
52+
run: tox -e py312-test-instrumentation-cassandra-driver -- -ra
53+
54+
py312-test-instrumentation-cassandra-scylla_ubuntu-latest:
55+
name: instrumentation-cassandra-scylla 3.12 Ubuntu
56+
runs-on: ubuntu-latest
57+
timeout-minutes: 30
58+
steps:
59+
- name: Checkout repo @ SHA - ${{ github.sha }}
60+
uses: actions/checkout@v4
61+
62+
- name: Set up Python 3.12
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.12"
66+
67+
- name: Install tox
68+
run: pip install tox-uv
69+
70+
- name: Run tests
71+
run: tox -e py312-test-instrumentation-cassandra-scylla -- -ra
72+
73+
py313-test-instrumentation-cassandra-driver_ubuntu-latest:
74+
name: instrumentation-cassandra-driver 3.13 Ubuntu
75+
runs-on: ubuntu-latest
76+
timeout-minutes: 30
77+
steps:
78+
- name: Checkout repo @ SHA - ${{ github.sha }}
79+
uses: actions/checkout@v4
80+
81+
- name: Set up Python 3.13
82+
uses: actions/setup-python@v5
83+
with:
84+
python-version: "3.13"
85+
86+
- name: Install tox
87+
run: pip install tox-uv
88+
89+
- name: Run tests
90+
run: tox -e py313-test-instrumentation-cassandra-driver -- -ra
91+
92+
py313-test-instrumentation-cassandra-scylla_ubuntu-latest:
93+
name: instrumentation-cassandra-scylla 3.13 Ubuntu
94+
runs-on: ubuntu-latest
95+
timeout-minutes: 30
96+
steps:
97+
- name: Checkout repo @ SHA - ${{ github.sha }}
98+
uses: actions/checkout@v4
99+
100+
- name: Set up Python 3.13
101+
uses: actions/setup-python@v5
102+
with:
103+
python-version: "3.13"
104+
105+
- name: Install tox
106+
run: pip install tox-uv
107+
108+
- name: Run tests
109+
run: tox -e py313-test-instrumentation-cassandra-scylla -- -ra
110+
111+
py314-test-instrumentation-cassandra-driver_ubuntu-latest:
112+
name: instrumentation-cassandra-driver 3.14 Ubuntu
113+
runs-on: ubuntu-latest
114+
timeout-minutes: 30
115+
steps:
116+
- name: Checkout repo @ SHA - ${{ github.sha }}
117+
uses: actions/checkout@v4
118+
119+
- name: Set up Python 3.14
120+
uses: actions/setup-python@v5
121+
with:
122+
python-version: "3.14"
123+
124+
- name: Install tox
125+
run: pip install tox-uv
126+
127+
- name: Run tests
128+
run: tox -e py314-test-instrumentation-cassandra-driver -- -ra
129+
130+
py314-test-instrumentation-cassandra-scylla_ubuntu-latest:
131+
name: instrumentation-cassandra-scylla 3.14 Ubuntu
132+
runs-on: ubuntu-latest
133+
timeout-minutes: 30
134+
steps:
135+
- name: Checkout repo @ SHA - ${{ github.sha }}
136+
uses: actions/checkout@v4
137+
138+
- name: Set up Python 3.14
139+
uses: actions/setup-python@v5
140+
with:
141+
python-version: "3.14"
142+
143+
- name: Install tox
144+
run: pip install tox-uv
145+
146+
- name: Run tests
147+
run: tox -e py314-test-instrumentation-cassandra-scylla -- -ra
148+
149+
pypy3-test-instrumentation-cassandra-scylla_ubuntu-latest:
150+
name: instrumentation-cassandra-scylla pypy-3.9 Ubuntu
151+
runs-on: ubuntu-latest
152+
timeout-minutes: 30
153+
steps:
154+
- name: Checkout repo @ SHA - ${{ github.sha }}
155+
uses: actions/checkout@v4
156+
157+
- name: Set up Python pypy-3.9
158+
uses: actions/setup-python@v5
159+
with:
160+
python-version: "pypy-3.9"
161+
162+
- name: Install tox
163+
run: pip install tox-uv
164+
165+
- name: Run tests
166+
run: tox -e pypy3-test-instrumentation-cassandra-scylla -- -ra
167+
168+
py39-test-processor-baggage_ubuntu-latest:
169+
name: processor-baggage 3.9 Ubuntu
170+
runs-on: ubuntu-latest
171+
timeout-minutes: 30
172+
steps:
173+
- name: Checkout repo @ SHA - ${{ github.sha }}
174+
uses: actions/checkout@v4
175+
176+
- name: Set up Python 3.9
177+
uses: actions/setup-python@v5
178+
with:
179+
python-version: "3.9"
180+
181+
- name: Install tox
182+
run: pip install tox-uv
183+
184+
- name: Run tests
185+
run: tox -e py39-test-processor-baggage -- -ra
186+
187+
py310-test-processor-baggage_ubuntu-latest:
188+
name: processor-baggage 3.10 Ubuntu
189+
runs-on: ubuntu-latest
190+
timeout-minutes: 30
191+
steps:
192+
- name: Checkout repo @ SHA - ${{ github.sha }}
193+
uses: actions/checkout@v4
194+
195+
- name: Set up Python 3.10
196+
uses: actions/setup-python@v5
197+
with:
198+
python-version: "3.10"
199+
200+
- name: Install tox
201+
run: pip install tox-uv
202+
203+
- name: Run tests
204+
run: tox -e py310-test-processor-baggage -- -ra
205+
206+
py311-test-processor-baggage_ubuntu-latest:
207+
name: processor-baggage 3.11 Ubuntu
208+
runs-on: ubuntu-latest
209+
timeout-minutes: 30
210+
steps:
211+
- name: Checkout repo @ SHA - ${{ github.sha }}
212+
uses: actions/checkout@v4
213+
214+
- name: Set up Python 3.11
215+
uses: actions/setup-python@v5
216+
with:
217+
python-version: "3.11"
218+
219+
- name: Install tox
220+
run: pip install tox-uv
221+
222+
- name: Run tests
223+
run: tox -e py311-test-processor-baggage -- -ra
224+
225+
py312-test-processor-baggage_ubuntu-latest:
226+
name: processor-baggage 3.12 Ubuntu
227+
runs-on: ubuntu-latest
228+
timeout-minutes: 30
229+
steps:
230+
- name: Checkout repo @ SHA - ${{ github.sha }}
231+
uses: actions/checkout@v4
232+
233+
- name: Set up Python 3.12
234+
uses: actions/setup-python@v5
235+
with:
236+
python-version: "3.12"
237+
238+
- name: Install tox
239+
run: pip install tox-uv
240+
241+
- name: Run tests
242+
run: tox -e py312-test-processor-baggage -- -ra
243+
244+
py313-test-processor-baggage_ubuntu-latest:
245+
name: processor-baggage 3.13 Ubuntu
246+
runs-on: ubuntu-latest
247+
timeout-minutes: 30
248+
steps:
249+
- name: Checkout repo @ SHA - ${{ github.sha }}
250+
uses: actions/checkout@v4
251+
252+
- name: Set up Python 3.13
253+
uses: actions/setup-python@v5
254+
with:
255+
python-version: "3.13"
256+
257+
- name: Install tox
258+
run: pip install tox-uv
259+
260+
- name: Run tests
261+
run: tox -e py313-test-processor-baggage -- -ra
262+
263+
py314-test-processor-baggage_ubuntu-latest:
264+
name: processor-baggage 3.14 Ubuntu
265+
runs-on: ubuntu-latest
266+
timeout-minutes: 30
267+
steps:
268+
- name: Checkout repo @ SHA - ${{ github.sha }}
269+
uses: actions/checkout@v4
270+
271+
- name: Set up Python 3.14
272+
uses: actions/setup-python@v5
273+
with:
274+
python-version: "3.14"
275+
276+
- name: Install tox
277+
run: pip install tox-uv
278+
279+
- name: Run tests
280+
run: tox -e py314-test-processor-baggage -- -ra
281+
282+
pypy3-test-processor-baggage_ubuntu-latest:
283+
name: processor-baggage pypy-3.9 Ubuntu
284+
runs-on: ubuntu-latest
285+
timeout-minutes: 30
286+
steps:
287+
- name: Checkout repo @ SHA - ${{ github.sha }}
288+
uses: actions/checkout@v4
289+
290+
- name: Set up Python pypy-3.9
291+
uses: actions/setup-python@v5
292+
with:
293+
python-version: "pypy-3.9"
294+
295+
- name: Install tox
296+
run: pip install tox-uv
297+
298+
- name: Run tests
299+
run: tox -e pypy3-test-processor-baggage -- -ra

‎instrumentation/opentelemetry-instrumentation-aiopg/test-requirements-wrapt1.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-r test-requirements.txt
2+
Deprecated==1.2.14
3+
wrapt>=1.0.0,<2.0.0

‎instrumentation/opentelemetry-instrumentation-aiopg/test-requirements-wrapt2.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-r test-requirements.txt
2+
Deprecated>=1.2.18
3+
wrapt>=2.0.0,<3.0.0

‎instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
aiopg==1.4.0
22
asgiref==3.8.1
33
async-timeout==4.0.3
4-
Deprecated==1.2.14
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0
@@ -10,7 +9,6 @@ py-cpuinfo==9.0.0
109
pytest==7.4.4
1110
tomli==2.0.1
1211
typing_extensions==4.12.2
13-
wrapt==1.16.0
1412
zipp==3.19.2
1513
-e opentelemetry-instrumentation
1614
-e instrumentation/opentelemetry-instrumentation-dbapi

‎instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements-wrapt1.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-r test-requirements.txt
2+
Deprecated==1.2.14
3+
wrapt>=1.0.0,<2.0.0

‎instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements-wrapt2.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-r test-requirements.txt
2+
Deprecated>=1.2.18
3+
wrapt>=2.0.0,<3.0.0

0 commit comments

Comments
 (0)