Skip to content

Commit ac29fa3

Browse files
ci(opentelemetry): pin cattrs and otel-flask-instrumentation (#7682)
## Description Unblocks ci by pinning `otel-flask-instrumentation` to `<0.37b0` and cattrs to `<23.1.0`. ## Motivation The otel entry point is no longer set after [cattrs v23.2.0](https://pypi.org/project/cattrs/23.2.1/) was released: https://github.com/DataDog/dd-trace-py/blob/3aad54003c1f2f2f43680f486f0ac7910f486f77/setup.py#L620 This likely occurred due to errors installing otel dependencies or generating ddtrace package metadata. Bumping all otel tests to use [cattrs<23.2.0](0c14b3a#diff-8c2dff2cbcc0f4fff63050381d4c7546ae7195383ec8f9cc993f8494b77a34c3) resolved this issue. Note - Using``opentelemetry-instrumentation-flask==latest`` causes this new test to fail: https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/50865/workflows/fa93192c-5b97-4624-a920-af07e73ac0f3/jobs/3252732. This PR pins this package to `0.37b0` to unblock ci. ## 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: Brett Langdon <[email protected]>
1 parent f86bfd2 commit ac29fa3

36 files changed

+740
-730
lines changed

.riot/requirements/12b2f26.txt renamed to .riot/requirements/10cab33.txt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,49 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/12b2f26.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/10cab33.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
certifi==2023.11.17
99
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
10+
click==8.1.7
11+
coverage[toml]==7.2.7
12+
deprecated==1.2.14
13+
exceptiongroup==1.1.3
1414
flask==2.1.3
1515
gevent==22.10.2
16-
greenlet==2.0.2
16+
greenlet==3.0.1
1717
hypothesis==6.45.0
1818
idna==3.4
19-
importlib-metadata==6.0.0
19+
importlib-metadata==6.7.0
2020
iniconfig==2.0.0
2121
itsdangerous==2.1.2
2222
jinja2==3.1.2
2323
markupsafe==2.0.1
24-
mock==5.0.1
24+
mock==5.1.0
2525
opentelemetry-api==1.8.0
2626
opentelemetry-instrumentation==0.32b0
2727
opentelemetry-instrumentation-flask==0.32b0
2828
opentelemetry-instrumentation-wsgi==0.32b0
2929
opentelemetry-semantic-conventions==0.32b0
3030
opentelemetry-util-http==0.32b0
3131
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
32+
packaging==23.2
33+
pluggy==1.2.0
34+
pytest==7.4.3
35+
pytest-asyncio==0.21.1
36+
pytest-cov==4.1.0
37+
pytest-mock==3.11.1
3838
requests==2.28.1
3939
sortedcontainers==2.4.0
4040
tomli==2.0.1
41-
typing-extensions==4.7.0
42-
urllib3==1.26.15
41+
typing-extensions==4.7.1
42+
urllib3==1.26.18
4343
werkzeug==2.1.2
44-
wrapt==1.15.0
44+
wrapt==1.16.0
4545
zipp==3.15.0
46-
zope-event==4.6
47-
zope-interface==5.5.2
46+
zope-event==5.0
47+
zope-interface==6.1
4848

4949
# The following packages are considered to be unsafe in a requirements file:
5050
# setuptools

.riot/requirements/13adabf.txt renamed to .riot/requirements/10cc2a6.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,48 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/13adabf.in
5+
# pip-compile --no-annotate .riot/requirements/10cc2a6.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
certifi==2023.11.17
99
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
10+
click==8.1.7
11+
coverage[toml]==7.3.2
12+
deprecated==1.2.14
13+
exceptiongroup==1.1.3
1414
flask==2.1.3
15-
gevent==22.10.2
16-
greenlet==2.0.2
15+
gevent==23.9.1
16+
greenlet==3.0.1
1717
hypothesis==6.45.0
1818
idna==3.4
19-
importlib-metadata==6.0.0
19+
importlib-metadata==6.8.0
2020
iniconfig==2.0.0
2121
itsdangerous==2.1.2
2222
jinja2==3.1.2
2323
markupsafe==2.0.1
24-
mock==5.0.1
24+
mock==5.1.0
2525
opentelemetry-api==1.15.0
2626
opentelemetry-instrumentation==0.37b0
2727
opentelemetry-instrumentation-flask==0.37b0
2828
opentelemetry-instrumentation-wsgi==0.37b0
2929
opentelemetry-semantic-conventions==0.37b0
3030
opentelemetry-util-http==0.37b0
3131
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
32+
packaging==23.2
33+
pluggy==1.3.0
34+
pytest==7.4.3
35+
pytest-asyncio==0.21.1
36+
pytest-cov==4.1.0
37+
pytest-mock==3.12.0
3838
requests==2.28.1
3939
sortedcontainers==2.4.0
4040
tomli==2.0.1
41-
urllib3==1.26.15
41+
urllib3==1.26.18
4242
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
43+
wrapt==1.16.0
44+
zipp==3.17.0
45+
zope-event==5.0
46+
zope-interface==6.1
4747

4848
# The following packages are considered to be unsafe in a requirements file:
4949
# setuptools

.riot/requirements/18b8c7c.txt renamed to .riot/requirements/11a899e.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,46 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/18b8c7c.in
5+
# pip-compile --no-annotate .riot/requirements/11a899e.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
certifi==2023.11.17
99
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
10+
click==8.1.7
11+
coverage[toml]==7.3.2
12+
deprecated==1.2.14
13+
exceptiongroup==1.1.3
1414
flask==2.1.3
15-
gevent==22.10.2
16-
greenlet==2.0.2
15+
gevent==23.9.1
16+
greenlet==3.0.1
1717
hypothesis==6.45.0
1818
idna==3.4
1919
iniconfig==2.0.0
2020
itsdangerous==2.1.2
2121
jinja2==3.1.2
2222
markupsafe==2.0.1
23-
mock==5.0.1
23+
mock==5.1.0
2424
opentelemetry-api==1.11.1
2525
opentelemetry-instrumentation==0.32b0
2626
opentelemetry-instrumentation-flask==0.32b0
2727
opentelemetry-instrumentation-wsgi==0.32b0
2828
opentelemetry-semantic-conventions==0.32b0
2929
opentelemetry-util-http==0.32b0
3030
opentracing==2.4.0
31-
packaging==23.0
32-
pluggy==1.0.0
33-
pytest==7.2.2
34-
pytest-asyncio==0.20.3
35-
pytest-cov==4.0.0
36-
pytest-mock==3.10.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
3737
requests==2.28.1
3838
sortedcontainers==2.4.0
3939
tomli==2.0.1
40-
urllib3==1.26.15
40+
urllib3==1.26.18
4141
werkzeug==2.1.2
42-
wrapt==1.15.0
43-
zope-event==4.6
44-
zope-interface==5.5.2
42+
wrapt==1.16.0
43+
zope-event==5.0
44+
zope-interface==6.1
4545

4646
# The following packages are considered to be unsafe in a requirements file:
4747
# setuptools

.riot/requirements/bd9ab6d.txt renamed to .riot/requirements/11efb5e.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,48 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/bd9ab6d.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/11efb5e.in
66
#
7-
asgiref==3.6.0
8-
attrs==22.2.0
9-
certifi==2022.12.7
7+
asgiref==3.7.2
8+
attrs==23.1.0
9+
certifi==2023.11.17
1010
charset-normalizer==2.1.1
1111
click==7.1.2
12-
coverage[toml]==7.2.2
13-
exceptiongroup==1.1.1
12+
coverage[toml]==7.2.7
13+
exceptiongroup==1.1.3
1414
flask==1.1.4
1515
gevent==22.10.2
16-
greenlet==2.0.2
16+
greenlet==3.0.1
1717
hypothesis==6.45.0
1818
idna==3.4
19-
importlib-metadata==6.0.0
19+
importlib-metadata==6.7.0
2020
iniconfig==2.0.0
2121
itsdangerous==1.1.0
2222
jinja2==2.11.3
2323
markupsafe==2.0.1
24-
mock==5.0.1
24+
mock==5.1.0
2525
opentelemetry-api==1.0.0
2626
opentelemetry-instrumentation==0.19b0
2727
opentelemetry-instrumentation-flask==0.19b0
2828
opentelemetry-instrumentation-wsgi==0.19b0
2929
opentelemetry-util-http==0.19b0
3030
opentracing==2.4.0
31-
packaging==23.0
32-
pluggy==1.0.0
33-
pytest==7.2.2
34-
pytest-asyncio==0.20.3
35-
pytest-cov==4.0.0
36-
pytest-mock==3.10.0
31+
packaging==23.2
32+
pluggy==1.2.0
33+
pytest==7.4.3
34+
pytest-asyncio==0.21.1
35+
pytest-cov==4.1.0
36+
pytest-mock==3.11.1
3737
requests==2.28.1
3838
sortedcontainers==2.4.0
3939
tomli==2.0.1
40-
typing-extensions==4.7.0
41-
urllib3==1.26.15
40+
typing-extensions==4.7.1
41+
urllib3==1.26.18
4242
werkzeug==1.0.1
43-
wrapt==1.15.0
43+
wrapt==1.16.0
4444
zipp==3.15.0
45-
zope-event==4.6
46-
zope-interface==5.5.2
45+
zope-event==5.0
46+
zope-interface==6.1
4747

4848
# The following packages are considered to be unsafe in a requirements file:
4949
# setuptools

.riot/requirements/4ed0642.txt renamed to .riot/requirements/1435ffd.txt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,49 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/4ed0642.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1435ffd.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
certifi==2023.11.17
99
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
10+
click==8.1.7
11+
coverage[toml]==7.2.7
12+
deprecated==1.2.14
13+
exceptiongroup==1.1.3
1414
flask==2.1.3
1515
gevent==22.10.2
16-
greenlet==2.0.2
16+
greenlet==3.0.1
1717
hypothesis==6.45.0
1818
idna==3.4
19-
importlib-metadata==6.0.0
19+
importlib-metadata==6.7.0
2020
iniconfig==2.0.0
2121
itsdangerous==2.1.2
2222
jinja2==3.1.2
2323
markupsafe==2.0.1
24-
mock==5.0.1
24+
mock==5.1.0
2525
opentelemetry-api==1.15.0
2626
opentelemetry-instrumentation==0.37b0
2727
opentelemetry-instrumentation-flask==0.37b0
2828
opentelemetry-instrumentation-wsgi==0.37b0
2929
opentelemetry-semantic-conventions==0.37b0
3030
opentelemetry-util-http==0.37b0
3131
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
32+
packaging==23.2
33+
pluggy==1.2.0
34+
pytest==7.4.3
35+
pytest-asyncio==0.21.1
36+
pytest-cov==4.1.0
37+
pytest-mock==3.11.1
3838
requests==2.28.1
3939
sortedcontainers==2.4.0
4040
tomli==2.0.1
41-
typing-extensions==4.7.0
42-
urllib3==1.26.15
41+
typing-extensions==4.7.1
42+
urllib3==1.26.18
4343
werkzeug==2.1.2
44-
wrapt==1.15.0
44+
wrapt==1.16.0
4545
zipp==3.15.0
46-
zope-event==4.6
47-
zope-interface==5.5.2
46+
zope-event==5.0
47+
zope-interface==6.1
4848

4949
# The following packages are considered to be unsafe in a requirements file:
5050
# setuptools

0 commit comments

Comments
 (0)