Skip to content

Commit 2be97ec

Browse files
fix(tracer): ensure compatibility with wrapt 2.0 (#14959)
## Description wrapt 2.0 released in 2025 oct 20 has some breaking changes. In particular, BaseObjectProxy is now the base class of all object proxy. Also: typing was introduced in wrapt 2.0, but this is breaking our mypy steps, because it was done too naively. This PR makes the necessary changes to pass this step. ## Testing This is tested with all existing tests and should fix new failures on system tests related to this change. APPSEC-59731
1 parent b433817 commit 2be97ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+541
-251
lines changed

.riot/requirements/106dceb.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/106dceb.in
6+
#
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
9+
gevent==25.9.1
10+
greenlet==3.2.4
11+
httpretty==1.1.4
12+
hypothesis==6.45.0
13+
iniconfig==2.3.0
14+
mock==5.2.0
15+
opentracing==2.4.0
16+
packaging==25.0
17+
pluggy==1.6.0
18+
py-cpuinfo==9.0.0
19+
pyfakefs==5.10.0
20+
pygments==2.19.2
21+
pytest==8.4.2
22+
pytest-asyncio==0.23.8
23+
pytest-benchmark==5.1.0
24+
pytest-cov==7.0.0
25+
pytest-mock==3.15.1
26+
pytest-randomly==4.0.1
27+
python-json-logger==2.0.7
28+
sortedcontainers==2.4.0
29+
wrapt==1.17.3
30+
zope-event==6.0
31+
zope-interface==8.0.1
32+
33+
# The following packages are considered to be unsafe in a requirements file:
34+
setuptools==80.9.0

.riot/requirements/1cf83ae.txt renamed to .riot/requirements/12ac950.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# This file is autogenerated by pip-compile with Python 3.13
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1cf83ae.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/12ac950.in
66
#
7-
attrs==25.3.0
8-
coverage[toml]==7.10.6
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
99
gevent==25.9.1
1010
greenlet==3.2.4
1111
httpretty==1.1.4
1212
hypothesis==6.45.0
13-
iniconfig==2.1.0
13+
iniconfig==2.3.0
1414
mock==5.2.0
1515
opentracing==2.4.0
1616
packaging==25.0
1717
pluggy==1.6.0
1818
py-cpuinfo==9.0.0
19-
pyfakefs==5.9.3
19+
pyfakefs==5.10.0
2020
pygments==2.19.2
2121
pytest==8.4.2
2222
pytest-asyncio==0.23.8
@@ -26,6 +26,7 @@ pytest-mock==3.15.1
2626
pytest-randomly==4.0.1
2727
python-json-logger==2.0.7
2828
sortedcontainers==2.4.0
29+
wrapt==2.0.0
2930
zope-event==5.0
3031
zope-interface==7.2
3132

.riot/requirements/188dfd0.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/188dfd0.in
6+
#
7+
attrs==25.4.0
8+
coverage[toml]==7.10.7
9+
exceptiongroup==1.3.0
10+
gevent==25.9.1
11+
greenlet==3.2.4
12+
httpretty==1.1.4
13+
hypothesis==6.45.0
14+
importlib-metadata==8.7.0
15+
iniconfig==2.1.0
16+
mock==5.2.0
17+
opentracing==2.4.0
18+
packaging==25.0
19+
pluggy==1.6.0
20+
py-cpuinfo==9.0.0
21+
pyfakefs==5.10.0
22+
pygments==2.19.2
23+
pytest==8.4.2
24+
pytest-asyncio==0.23.8
25+
pytest-benchmark==5.1.0
26+
pytest-cov==7.0.0
27+
pytest-mock==3.15.1
28+
pytest-randomly==4.0.1
29+
python-json-logger==2.0.7
30+
sortedcontainers==2.4.0
31+
tomli==2.3.0
32+
typing-extensions==4.15.0
33+
wrapt==1.17.3
34+
zipp==3.23.0
35+
zope-event==6.0
36+
zope-interface==8.0.1
37+
38+
# The following packages are considered to be unsafe in a requirements file:
39+
setuptools==80.9.0

.riot/requirements/1ae8364.txt renamed to .riot/requirements/1aa6774.txt

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,38 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/1ae8364.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1aa6774.in
66
#
7-
attrs==25.3.0
8-
coverage[toml]==7.8.0
9-
exceptiongroup==1.2.2
10-
gevent==25.4.2
11-
greenlet==3.2.1
7+
attrs==25.4.0
8+
coverage[toml]==7.10.7
9+
exceptiongroup==1.3.0
10+
gevent==25.9.1
11+
greenlet==3.2.4
1212
httpretty==1.1.4
1313
hypothesis==6.45.0
1414
importlib-metadata==8.7.0
1515
iniconfig==2.1.0
1616
mock==5.2.0
1717
opentracing==2.4.0
1818
packaging==25.0
19-
pluggy==1.5.0
19+
pluggy==1.6.0
2020
py-cpuinfo==9.0.0
21-
pyfakefs==5.8.0
22-
pytest==8.3.5
21+
pyfakefs==5.10.0
22+
pygments==2.19.2
23+
pytest==8.4.2
2324
pytest-asyncio==0.23.8
2425
pytest-benchmark==5.1.0
25-
pytest-cov==6.1.1
26-
pytest-mock==3.14.0
27-
pytest-randomly==3.16.0
26+
pytest-cov==7.0.0
27+
pytest-mock==3.15.1
28+
pytest-randomly==4.0.1
2829
python-json-logger==2.0.7
2930
sortedcontainers==2.4.0
30-
tomli==2.2.1
31-
zipp==3.21.0
32-
zope-event==5.0
33-
zope-interface==7.2
31+
tomli==2.3.0
32+
typing-extensions==4.15.0
33+
wrapt==2.0.0
34+
zipp==3.23.0
35+
zope-event==6.0
36+
zope-interface==8.0.1
3437

3538
# The following packages are considered to be unsafe in a requirements file:
36-
# setuptools
39+
setuptools==80.9.0

.riot/requirements/1ae87da.txt renamed to .riot/requirements/1b6e144.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1ae87da.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1b6e144.in
66
#
7-
attrs==25.3.0
8-
coverage[toml]==7.10.6
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
99
gevent==25.9.1
1010
greenlet==3.2.4
1111
httpretty==1.1.4
1212
hypothesis==6.45.0
13-
iniconfig==2.1.0
13+
iniconfig==2.3.0
1414
mock==5.2.0
1515
opentracing==2.4.0
1616
packaging==25.0
1717
pluggy==1.6.0
1818
py-cpuinfo==9.0.0
19-
pyfakefs==5.9.3
19+
pyfakefs==5.10.0
2020
pygments==2.19.2
2121
pytest==8.4.2
2222
pytest-asyncio==0.23.8
@@ -26,6 +26,7 @@ pytest-mock==3.15.1
2626
pytest-randomly==4.0.1
2727
python-json-logger==2.0.7
2828
sortedcontainers==2.4.0
29+
wrapt==2.0.0
2930
zope-event==5.0
3031
zope-interface==7.2
3132

.riot/requirements/1f9c58a.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1f9c58a.in
6+
#
7+
attrs==25.3.0
8+
coverage[toml]==7.6.1
9+
exceptiongroup==1.3.0
10+
gevent==24.2.1
11+
greenlet==3.1.1
12+
httpretty==1.1.4
13+
hypothesis==6.45.0
14+
importlib-metadata==8.5.0
15+
iniconfig==2.1.0
16+
mock==5.2.0
17+
opentracing==2.4.0
18+
packaging==25.0
19+
pluggy==1.5.0
20+
py-cpuinfo==9.0.0
21+
pyfakefs==5.10.0
22+
pytest==8.3.5
23+
pytest-asyncio==0.23.8
24+
pytest-benchmark==4.0.0
25+
pytest-cov==5.0.0
26+
pytest-mock==3.14.1
27+
pytest-randomly==3.15.0
28+
python-json-logger==2.0.7
29+
sortedcontainers==2.4.0
30+
tomli==2.3.0
31+
typing-extensions==4.13.2
32+
wrapt==1.17.3
33+
zipp==3.20.2
34+
zope-event==5.0
35+
zope-interface==7.2
36+
37+
# The following packages are considered to be unsafe in a requirements file:
38+
setuptools==75.3.2

.riot/requirements/2b85fce.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

.riot/requirements/319942e.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.13
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/319942e.in
6+
#
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
9+
gevent==25.9.1
10+
greenlet==3.2.4
11+
httpretty==1.1.4
12+
hypothesis==6.45.0
13+
iniconfig==2.3.0
14+
mock==5.2.0
15+
opentracing==2.4.0
16+
packaging==25.0
17+
pluggy==1.6.0
18+
py-cpuinfo==9.0.0
19+
pyfakefs==5.10.0
20+
pygments==2.19.2
21+
pytest==8.4.2
22+
pytest-asyncio==0.23.8
23+
pytest-benchmark==5.1.0
24+
pytest-cov==7.0.0
25+
pytest-mock==3.15.1
26+
pytest-randomly==4.0.1
27+
python-json-logger==2.0.7
28+
sortedcontainers==2.4.0
29+
wrapt==1.17.3
30+
zope-event==5.0
31+
zope-interface==7.2
32+
33+
# The following packages are considered to be unsafe in a requirements file:
34+
setuptools==80.9.0

.riot/requirements/4de151d.txt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/4de151d.in
6+
#
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
9+
exceptiongroup==1.3.0
10+
gevent==25.9.1
11+
greenlet==3.2.4
12+
httpretty==1.1.4
13+
hypothesis==6.45.0
14+
iniconfig==2.3.0
15+
mock==5.2.0
16+
opentracing==2.4.0
17+
packaging==25.0
18+
pluggy==1.6.0
19+
py-cpuinfo==9.0.0
20+
pyfakefs==5.10.0
21+
pygments==2.19.2
22+
pytest==8.4.2
23+
pytest-asyncio==0.23.8
24+
pytest-benchmark==5.1.0
25+
pytest-cov==7.0.0
26+
pytest-mock==3.15.1
27+
pytest-randomly==4.0.1
28+
python-json-logger==2.0.7
29+
sortedcontainers==2.4.0
30+
tomli==2.3.0
31+
typing-extensions==4.15.0
32+
wrapt==2.0.0
33+
zope-event==6.0
34+
zope-interface==8.0.1
35+
36+
# The following packages are considered to be unsafe in a requirements file:
37+
setuptools==80.9.0

.riot/requirements/84112c9.txt renamed to .riot/requirements/57b4529.txt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,33 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/84112c9.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/57b4529.in
66
#
7-
attrs==25.3.0
8-
coverage[toml]==7.8.0
9-
gevent==25.4.2
10-
greenlet==3.2.1
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
9+
gevent==25.9.1
10+
greenlet==3.2.4
1111
httpretty==1.1.4
1212
hypothesis==6.45.0
13-
iniconfig==2.1.0
13+
iniconfig==2.3.0
1414
mock==5.2.0
1515
opentracing==2.4.0
1616
packaging==25.0
17-
pluggy==1.5.0
17+
pluggy==1.6.0
1818
py-cpuinfo==9.0.0
19-
pyfakefs==5.8.0
20-
pytest==8.3.5
19+
pyfakefs==5.10.0
20+
pygments==2.19.2
21+
pytest==8.4.2
2122
pytest-asyncio==0.23.8
2223
pytest-benchmark==5.1.0
23-
pytest-cov==6.1.1
24-
pytest-mock==3.14.0
25-
pytest-randomly==3.16.0
24+
pytest-cov==7.0.0
25+
pytest-mock==3.15.1
26+
pytest-randomly==4.0.1
2627
python-json-logger==2.0.7
2728
sortedcontainers==2.4.0
28-
zope-event==5.0
29-
zope-interface==7.2
29+
wrapt==2.0.0
30+
zope-event==6.0
31+
zope-interface==8.0.1
3032

3133
# The following packages are considered to be unsafe in a requirements file:
32-
# setuptools
34+
setuptools==80.9.0

0 commit comments

Comments
 (0)