Skip to content

Commit 8eee423

Browse files
gnufedeavara1986
andauthored
Revert "chore(iast): move inner funcions [backport 2.19] (#11919)" (#12306)
This reverts commit 8c9beec. This should fix #12021 ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --------- Co-authored-by: Alberto Vara <[email protected]>
1 parent aa1fbaa commit 8eee423

File tree

125 files changed

+970
-907
lines changed

Some content is hidden

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

125 files changed

+970
-907
lines changed

.github/workflows/system-tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ jobs:
149149
if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'other'
150150
run: ./run.sh INTEGRATIONS
151151

152-
- name: Run CROSSED_TRACING_LIBRARIES
153-
if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'other'
154-
run: ./run.sh CROSSED_TRACING_LIBRARIES
155-
156152
- name: Run PROFILING
157153
if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'other'
158154
run: |

.riot/requirements/4de03a5.txt renamed to .riot/requirements/11065bb.txt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/4de03a5.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/11065bb.in
66
#
77
arrow==1.3.0
88
asgiref==3.8.1
9-
attrs==24.3.0
9+
attrs==24.2.0
1010
autobahn==23.1.2
1111
automat==24.8.1
1212
backports-zoneinfo==0.2.1
13-
bcrypt==4.2.1
1413
blessed==1.20.0
15-
certifi==2024.12.14
16-
cffi==1.17.1
17-
channels==4.2.0
18-
charset-normalizer==3.4.0
14+
certifi==2024.8.30
15+
cffi==1.17.0
16+
channels==4.1.0
17+
charset-normalizer==3.3.2
1918
constantly==23.10.4
2019
coverage[toml]==7.6.1
21-
cryptography==44.0.0
20+
cryptography==43.0.0
2221
daphne==4.1.2
23-
django==4.2.17
22+
django==4.2.15
2423
django-configurations==2.5.1
2524
django-picklefield==3.2
2625
django-pylibmc==0.6.1
@@ -29,50 +28,51 @@ django-redis==4.5.0
2928
exceptiongroup==1.2.2
3029
hyperlink==21.0.0
3130
hypothesis==6.45.0
32-
idna==3.10
33-
importlib-metadata==8.5.0
31+
idna==3.8
32+
importlib-metadata==8.4.0
3433
incremental==24.7.2
3534
iniconfig==2.0.0
36-
isodate==0.7.2
35+
isodate==0.6.1
3736
lxml==5.3.0
3837
mock==5.1.0
3938
opentracing==2.4.0
40-
packaging==24.2
41-
platformdirs==4.3.6
39+
packaging==24.1
40+
platformdirs==4.2.2
4241
pluggy==1.5.0
43-
psycopg2-binary==2.9.10
44-
pyasn1==0.6.1
45-
pyasn1-modules==0.4.1
42+
psycopg==3.2.1
43+
psycopg2-binary==2.9.9
44+
pyasn1==0.6.0
45+
pyasn1-modules==0.4.0
4646
pycparser==2.22
4747
pylibmc==1.6.3
48-
pyopenssl==24.3.0
49-
pytest==8.3.4
48+
pyopenssl==24.2.1
49+
pytest==8.3.2
5050
pytest-cov==5.0.0
5151
pytest-django[testing]==3.10.0
5252
pytest-mock==3.14.0
5353
pytest-randomly==3.15.0
5454
python-dateutil==2.9.0.post0
5555
python-memcached==1.62
56-
pytz==2024.2
56+
pytz==2024.1
5757
redis==2.10.6
5858
requests==2.32.3
5959
requests-file==2.1.0
6060
requests-toolbelt==1.0.0
61-
service-identity==24.2.0
62-
six==1.17.0
61+
service-identity==24.1.0
62+
six==1.16.0
6363
sortedcontainers==2.4.0
6464
spyne==2.14.0
65-
sqlparse==0.5.3
66-
tomli==2.2.1
67-
twisted[tls]==24.11.0
65+
sqlparse==0.5.1
66+
tomli==2.0.1
67+
twisted[tls]==24.7.0
6868
txaio==23.1.1
69-
types-python-dateutil==2.9.0.20241206
69+
types-python-dateutil==2.9.0.20240821
7070
typing-extensions==4.12.2
71-
urllib3==2.2.3
71+
urllib3==2.2.2
7272
wcwidth==0.2.13
73-
zeep==4.3.1
74-
zipp==3.20.2
75-
zope-interface==7.2
73+
zeep==4.2.1
74+
zipp==3.20.1
75+
zope-interface==7.0.3
7676

7777
# The following packages are considered to be unsafe in a requirements file:
78-
setuptools==75.3.0
78+
setuptools==74.0.0

.riot/requirements/1c5581b.txt renamed to .riot/requirements/16ae097.txt

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1c5581b.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/16ae097.in
66
#
77
arrow==1.3.0
88
asgiref==3.8.1
9-
attrs==24.3.0
9+
attrs==24.2.0
1010
autobahn==24.4.2
1111
automat==24.8.1
12-
bcrypt==4.2.1
1312
blessed==1.20.0
14-
certifi==2024.12.14
15-
cffi==1.17.1
16-
channels==4.2.0
17-
charset-normalizer==3.4.0
13+
certifi==2024.8.30
14+
cffi==1.17.0
15+
channels==4.1.0
16+
charset-normalizer==3.3.2
1817
constantly==23.10.4
19-
coverage[toml]==7.6.9
20-
cryptography==43.0.3
18+
coverage[toml]==7.6.1
19+
cryptography==43.0.0
2120
daphne==4.1.2
22-
django==4.2.17
21+
django==4.2.15
2322
django-configurations==2.5.1
2423
django-picklefield==3.2
2524
django-pylibmc==0.6.1
@@ -28,50 +27,51 @@ django-redis==4.5.0
2827
exceptiongroup==1.2.2
2928
hyperlink==21.0.0
3029
hypothesis==6.45.0
31-
idna==3.10
32-
importlib-metadata==8.5.0
30+
idna==3.8
31+
importlib-metadata==8.4.0
3332
incremental==24.7.2
3433
iniconfig==2.0.0
35-
isodate==0.7.2
34+
isodate==0.6.1
3635
lxml==5.3.0
3736
mock==5.1.0
3837
opentracing==2.4.0
39-
packaging==24.2
40-
platformdirs==4.3.6
38+
packaging==24.1
39+
platformdirs==4.2.2
4140
pluggy==1.5.0
42-
psycopg2-binary==2.9.10
43-
pyasn1==0.6.1
44-
pyasn1-modules==0.4.1
41+
psycopg==3.2.1
42+
psycopg2-binary==2.9.9
43+
pyasn1==0.6.0
44+
pyasn1-modules==0.4.0
4545
pycparser==2.22
4646
pylibmc==1.6.3
47-
pyopenssl==24.3.0
48-
pytest==8.3.4
49-
pytest-cov==6.0.0
47+
pyopenssl==24.2.1
48+
pytest==8.3.2
49+
pytest-cov==5.0.0
5050
pytest-django[testing]==3.10.0
5151
pytest-mock==3.14.0
52-
pytest-randomly==3.16.0
52+
pytest-randomly==3.15.0
5353
python-dateutil==2.9.0.post0
5454
python-memcached==1.62
55-
pytz==2024.2
55+
pytz==2024.1
5656
redis==2.10.6
5757
requests==2.32.3
5858
requests-file==2.1.0
5959
requests-toolbelt==1.0.0
60-
service-identity==24.2.0
61-
six==1.17.0
60+
service-identity==24.1.0
61+
six==1.16.0
6262
sortedcontainers==2.4.0
6363
spyne==2.14.0
64-
sqlparse==0.5.3
65-
tomli==2.2.1
66-
twisted[tls]==24.11.0
64+
sqlparse==0.5.1
65+
tomli==2.0.1
66+
twisted[tls]==24.7.0
6767
txaio==23.1.1
68-
types-python-dateutil==2.9.0.20241206
68+
types-python-dateutil==2.9.0.20240821
6969
typing-extensions==4.12.2
70-
urllib3==2.2.3
70+
urllib3==2.2.2
7171
wcwidth==0.2.13
72-
zeep==4.3.1
73-
zipp==3.21.0
74-
zope-interface==7.2
72+
zeep==4.2.1
73+
zipp==3.20.1
74+
zope-interface==7.0.3
7575

7676
# The following packages are considered to be unsafe in a requirements file:
77-
setuptools==75.6.0
77+
setuptools==74.0.0

.riot/requirements/1f06d17.txt renamed to .riot/requirements/1d3001d.txt

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,72 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1f06d17.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1d3001d.in
66
#
77
arrow==1.3.0
88
asgiref==3.8.1
9-
attrs==24.3.0
9+
attrs==24.2.0
1010
autobahn==24.4.2
1111
automat==24.8.1
12-
bcrypt==4.2.1
1312
blessed==1.20.0
14-
certifi==2024.12.14
15-
cffi==1.17.1
16-
channels==4.2.0
17-
charset-normalizer==3.4.0
13+
certifi==2024.8.30
14+
cffi==1.17.0
15+
channels==4.1.0
16+
charset-normalizer==3.3.2
1817
constantly==23.10.4
19-
coverage[toml]==7.6.9
20-
cryptography==44.0.0
18+
coverage[toml]==7.6.1
19+
cryptography==43.0.0
2120
daphne==4.1.2
22-
django==4.2.17
21+
django==4.2.15
2322
django-configurations==2.5.1
2423
django-picklefield==3.2
2524
django-pylibmc==0.6.1
2625
django-q==1.3.6
2726
django-redis==4.5.0
2827
hyperlink==21.0.0
2928
hypothesis==6.45.0
30-
idna==3.10
29+
idna==3.8
3130
incremental==24.7.2
3231
iniconfig==2.0.0
33-
isodate==0.7.2
32+
isodate==0.6.1
3433
lxml==5.3.0
3534
mock==5.1.0
3635
opentracing==2.4.0
37-
packaging==24.2
38-
platformdirs==4.3.6
36+
packaging==24.1
37+
platformdirs==4.2.2
3938
pluggy==1.5.0
40-
psycopg==3.2.3
41-
psycopg2-binary==2.9.10
42-
pyasn1==0.6.1
43-
pyasn1-modules==0.4.1
39+
psycopg==3.2.1
40+
psycopg2-binary==2.9.9
41+
pyasn1==0.6.0
42+
pyasn1-modules==0.4.0
4443
pycparser==2.22
4544
pylibmc==1.6.3
46-
pyopenssl==24.3.0
47-
pytest==8.3.4
48-
pytest-cov==6.0.0
45+
pyopenssl==24.2.1
46+
pytest==8.3.2
47+
pytest-cov==5.0.0
4948
pytest-django[testing]==3.10.0
5049
pytest-mock==3.14.0
51-
pytest-randomly==3.16.0
50+
pytest-randomly==3.15.0
5251
python-dateutil==2.9.0.post0
5352
python-memcached==1.62
54-
pytz==2024.2
53+
pytz==2024.1
5554
redis==2.10.6
5655
requests==2.32.3
5756
requests-file==2.1.0
5857
requests-toolbelt==1.0.0
59-
service-identity==24.2.0
60-
six==1.17.0
58+
service-identity==24.1.0
59+
six==1.16.0
6160
sortedcontainers==2.4.0
6261
spyne==2.14.0
63-
sqlparse==0.5.3
64-
twisted[tls]==24.11.0
62+
sqlparse==0.5.1
63+
twisted[tls]==24.7.0
6564
txaio==23.1.1
66-
types-python-dateutil==2.9.0.20241206
65+
types-python-dateutil==2.9.0.20240821
6766
typing-extensions==4.12.2
68-
urllib3==2.2.3
67+
urllib3==2.2.2
6968
wcwidth==0.2.13
70-
zeep==4.3.1
71-
zope-interface==7.2
69+
zeep==4.2.1
70+
zope-interface==7.0.3
7271

7372
# The following packages are considered to be unsafe in a requirements file:
74-
setuptools==75.6.0
73+
setuptools==74.0.0

0 commit comments

Comments
 (0)