Skip to content

Commit 7a9a79c

Browse files
mabdinuravara1986
andauthored
ci(opentelemetry): revert cattrs bump (#7671)
Fixes failing tests by reverting otel requirement bump introduced in: #7667 ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment. - [x] 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) - [x] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [x] This PR doesn't touch any of that. --------- Co-authored-by: Alberto Vara <[email protected]>
1 parent 5fab0c1 commit 7a9a79c

Some content is hidden

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

46 files changed

+997
-1058
lines changed

.riot/requirements/1681302.txt renamed to .riot/requirements/1084483.txt

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,43 @@
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/1681302.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1084483.in
66
#
7-
asgiref==3.7.2
8-
attrs==23.1.0
9-
cattrs==23.1.2
10-
certifi==2023.7.22
7+
asgiref==3.6.0
8+
attrs==22.2.0
9+
certifi==2022.12.7
1110
charset-normalizer==2.1.1
1211
click==7.1.2
13-
coverage[toml]==7.3.2
12+
coverage[toml]==7.2.2
1413
flask==1.1.4
15-
gevent==23.9.1
16-
greenlet==3.0.1
14+
gevent==22.10.2
15+
greenlet==2.0.2
1716
hypothesis==6.45.0
1817
idna==3.4
1918
iniconfig==2.0.0
2019
itsdangerous==1.1.0
2120
jinja2==2.11.3
2221
markupsafe==2.0.1
23-
mock==5.1.0
22+
mock==5.0.1
2423
opentelemetry-api==1.0.0
2524
opentelemetry-instrumentation==0.19b0
2625
opentelemetry-instrumentation-flask==0.19b0
2726
opentelemetry-instrumentation-wsgi==0.19b0
2827
opentelemetry-util-http==0.19b0
2928
opentracing==2.4.0
30-
packaging==23.2
31-
pluggy==1.3.0
32-
pytest==7.4.3
33-
pytest-asyncio==0.21.1
34-
pytest-cov==4.1.0
35-
pytest-mock==3.12.0
29+
packaging==23.0
30+
pluggy==1.0.0
31+
pytest==7.2.2
32+
pytest-asyncio==0.20.3
33+
pytest-cov==4.0.0
34+
pytest-mock==3.10.0
3635
requests==2.28.1
3736
sortedcontainers==2.4.0
38-
urllib3==1.26.18
37+
urllib3==1.26.15
3938
werkzeug==1.0.1
40-
wrapt==1.16.0
41-
zope-event==5.0
42-
zope-interface==6.1
39+
wrapt==1.15.0
40+
zope-event==4.6
41+
zope-interface==5.5.2
4342

4443
# The following packages are considered to be unsafe in a requirements file:
4544
# setuptools

.riot/requirements/687a704.txt renamed to .riot/requirements/10cf573.txt

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,48 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/687a704.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/10cf573.in
66
#
7-
attrs==23.1.0
8-
cattrs==23.1.2
9-
certifi==2023.7.22
7+
attrs==22.2.0
8+
certifi==2022.12.7
109
charset-normalizer==2.1.1
11-
click==8.1.7
12-
coverage[toml]==7.3.2
13-
deprecated==1.2.14
14-
exceptiongroup==1.1.3
10+
click==8.1.3
11+
coverage[toml]==7.2.2
12+
deprecated==1.2.13
13+
exceptiongroup==1.1.1
1514
flask==2.1.3
16-
gevent==23.9.1
17-
greenlet==3.0.1
15+
gevent==22.10.2
16+
greenlet==2.0.2
1817
hypothesis==6.45.0
1918
idna==3.4
20-
importlib-metadata==6.8.0
19+
importlib-metadata==6.0.0
2120
iniconfig==2.0.0
2221
itsdangerous==2.1.2
2322
jinja2==3.1.2
2423
markupsafe==2.0.1
25-
mock==5.1.0
24+
mock==5.0.1
2625
opentelemetry-api==1.8.0
2726
opentelemetry-instrumentation==0.32b0
2827
opentelemetry-instrumentation-flask==0.32b0
2928
opentelemetry-instrumentation-wsgi==0.32b0
3029
opentelemetry-semantic-conventions==0.32b0
3130
opentelemetry-util-http==0.32b0
3231
opentracing==2.4.0
33-
packaging==23.2
34-
pluggy==1.3.0
35-
pytest==7.4.3
36-
pytest-asyncio==0.21.1
37-
pytest-cov==4.1.0
38-
pytest-mock==3.12.0
32+
packaging==23.0
33+
pluggy==1.0.0
34+
pytest==7.2.2
35+
pytest-asyncio==0.20.3
36+
pytest-cov==4.0.0
37+
pytest-mock==3.10.0
3938
requests==2.28.1
4039
sortedcontainers==2.4.0
4140
tomli==2.0.1
42-
typing-extensions==4.8.0
43-
urllib3==1.26.18
41+
urllib3==1.26.15
4442
werkzeug==2.1.2
45-
wrapt==1.16.0
46-
zipp==3.17.0
47-
zope-event==5.0
48-
zope-interface==6.1
43+
wrapt==1.15.0
44+
zipp==3.15.0
45+
zope-event==4.6
46+
zope-interface==5.5.2
4947

5048
# The following packages are considered to be unsafe in a requirements file:
5149
# setuptools

.riot/requirements/11537f3.txt

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11537f3.in
6+
#
7+
attrs==22.2.0
8+
certifi==2022.12.7
9+
charset-normalizer==2.1.1
10+
click==8.1.3
11+
coverage[toml]==7.2.2
12+
deprecated==1.2.13
13+
exceptiongroup==1.1.1
14+
flask==2.1.3
15+
gevent==22.10.2
16+
greenlet==2.0.2
17+
hypothesis==6.45.0
18+
idna==3.4
19+
importlib-metadata==6.0.0
20+
iniconfig==2.0.0
21+
itsdangerous==2.1.2
22+
jinja2==3.1.2
23+
markupsafe==2.0.1
24+
mock==5.0.1
25+
opentelemetry-api==1.15.0
26+
opentelemetry-instrumentation==0.37b0
27+
opentelemetry-instrumentation-flask==0.37b0
28+
opentelemetry-instrumentation-wsgi==0.37b0
29+
opentelemetry-semantic-conventions==0.37b0
30+
opentelemetry-util-http==0.37b0
31+
opentracing==2.4.0
32+
packaging==23.0
33+
pluggy==1.0.0
34+
pytest==7.2.2
35+
pytest-asyncio==0.20.3
36+
pytest-cov==4.0.0
37+
pytest-mock==3.10.0
38+
requests==2.28.1
39+
sortedcontainers==2.4.0
40+
tomli==2.0.1
41+
urllib3==1.26.15
42+
werkzeug==2.1.2
43+
wrapt==1.15.0
44+
zipp==3.15.0
45+
zope-event==4.6
46+
zope-interface==5.5.2
47+
48+
# The following packages are considered to be unsafe in a requirements file:
49+
# setuptools

.riot/requirements/11e4df2.txt

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

.riot/requirements/43b0dad.txt renamed to .riot/requirements/11fcd42.txt

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,45 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/43b0dad.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11fcd42.in
66
#
7-
asgiref==3.7.2
8-
attrs==23.1.0
9-
cattrs==23.1.2
10-
certifi==2023.7.22
7+
asgiref==3.6.0
8+
attrs==22.2.0
9+
certifi==2022.12.7
1110
charset-normalizer==2.1.1
1211
click==7.1.2
13-
coverage[toml]==7.3.2
14-
exceptiongroup==1.1.3
12+
coverage[toml]==7.2.2
13+
exceptiongroup==1.1.1
1514
flask==1.1.4
16-
gevent==23.9.1
17-
greenlet==3.0.1
15+
gevent==22.10.2
16+
greenlet==2.0.2
1817
hypothesis==6.45.0
1918
idna==3.4
2019
iniconfig==2.0.0
2120
itsdangerous==1.1.0
2221
jinja2==2.11.3
2322
markupsafe==2.0.1
24-
mock==5.1.0
23+
mock==5.0.1
2524
opentelemetry-api==1.0.0
2625
opentelemetry-instrumentation==0.19b0
2726
opentelemetry-instrumentation-flask==0.19b0
2827
opentelemetry-instrumentation-wsgi==0.19b0
2928
opentelemetry-util-http==0.19b0
3029
opentracing==2.4.0
31-
packaging==23.2
32-
pluggy==1.3.0
33-
pytest==7.4.3
34-
pytest-asyncio==0.21.1
35-
pytest-cov==4.1.0
36-
pytest-mock==3.12.0
30+
packaging==23.0
31+
pluggy==1.0.0
32+
pytest==7.2.2
33+
pytest-asyncio==0.20.3
34+
pytest-cov==4.0.0
35+
pytest-mock==3.10.0
3736
requests==2.28.1
3837
sortedcontainers==2.4.0
3938
tomli==2.0.1
40-
typing-extensions==4.8.0
41-
urllib3==1.26.18
39+
urllib3==1.26.15
4240
werkzeug==1.0.1
43-
wrapt==1.16.0
44-
zope-event==5.0
45-
zope-interface==6.1
41+
wrapt==1.15.0
42+
zope-event==4.6
43+
zope-interface==5.5.2
4644

4745
# The following packages are considered to be unsafe in a requirements file:
4846
# setuptools

.riot/requirements/1dec12b.txt renamed to .riot/requirements/12b2f26.txt

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,49 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1dec12b.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/12b2f26.in
66
#
7-
attrs==23.1.0
8-
cattrs==23.1.2
9-
certifi==2023.7.22
7+
attrs==22.2.0
8+
certifi==2022.12.7
109
charset-normalizer==2.1.1
11-
click==8.1.7
12-
coverage[toml]==7.2.7
13-
deprecated==1.2.14
14-
exceptiongroup==1.1.3
10+
click==8.1.3
11+
coverage[toml]==7.2.2
12+
deprecated==1.2.13
13+
exceptiongroup==1.1.1
1514
flask==2.1.3
1615
gevent==22.10.2
17-
greenlet==3.0.1
16+
greenlet==2.0.2
1817
hypothesis==6.45.0
1918
idna==3.4
20-
importlib-metadata==6.7.0
19+
importlib-metadata==6.0.0
2120
iniconfig==2.0.0
2221
itsdangerous==2.1.2
2322
jinja2==3.1.2
2423
markupsafe==2.0.1
25-
mock==5.1.0
24+
mock==5.0.1
2625
opentelemetry-api==1.8.0
2726
opentelemetry-instrumentation==0.32b0
2827
opentelemetry-instrumentation-flask==0.32b0
2928
opentelemetry-instrumentation-wsgi==0.32b0
3029
opentelemetry-semantic-conventions==0.32b0
3130
opentelemetry-util-http==0.32b0
3231
opentracing==2.4.0
33-
packaging==23.2
34-
pluggy==1.2.0
35-
pytest==7.4.3
36-
pytest-asyncio==0.21.1
37-
pytest-cov==4.1.0
38-
pytest-mock==3.11.1
32+
packaging==23.0
33+
pluggy==1.0.0
34+
pytest==7.2.2
35+
pytest-asyncio==0.20.3
36+
pytest-cov==4.0.0
37+
pytest-mock==3.10.0
3938
requests==2.28.1
4039
sortedcontainers==2.4.0
4140
tomli==2.0.1
42-
typing-extensions==4.7.1
43-
urllib3==1.26.18
41+
typing-extensions==4.7.0
42+
urllib3==1.26.15
4443
werkzeug==2.1.2
45-
wrapt==1.16.0
44+
wrapt==1.15.0
4645
zipp==3.15.0
47-
zope-event==5.0
48-
zope-interface==6.1
46+
zope-event==4.6
47+
zope-interface==5.5.2
4948

5049
# The following packages are considered to be unsafe in a requirements file:
5150
# setuptools

0 commit comments

Comments
 (0)