Skip to content

Commit

Permalink
ci(opentelemetry): pin cattrs and otel-flask-instrumentation (#7682)
Browse files Browse the repository at this point in the history
## 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 <brett.langdon@datadoghq.com>
  • Loading branch information
mabdinur and brettlangdon committed Nov 20, 2023
1 parent f86bfd2 commit ac29fa3
Show file tree
Hide file tree
Showing 36 changed files with 740 additions and 730 deletions.
42 changes: 21 additions & 21 deletions .riot/requirements/12b2f26.txt → .riot/requirements/10cab33.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/12b2f26.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/10cab33.in
#
attrs==22.2.0
certifi==2022.12.7
attrs==23.1.0
certifi==2023.11.17
charset-normalizer==2.1.1
click==8.1.3
coverage[toml]==7.2.2
deprecated==1.2.13
exceptiongroup==1.1.1
click==8.1.7
coverage[toml]==7.2.7
deprecated==1.2.14
exceptiongroup==1.1.3
flask==2.1.3
gevent==22.10.2
greenlet==2.0.2
greenlet==3.0.1
hypothesis==6.45.0
idna==3.4
importlib-metadata==6.0.0
importlib-metadata==6.7.0
iniconfig==2.0.0
itsdangerous==2.1.2
jinja2==3.1.2
markupsafe==2.0.1
mock==5.0.1
mock==5.1.0
opentelemetry-api==1.8.0
opentelemetry-instrumentation==0.32b0
opentelemetry-instrumentation-flask==0.32b0
opentelemetry-instrumentation-wsgi==0.32b0
opentelemetry-semantic-conventions==0.32b0
opentelemetry-util-http==0.32b0
opentracing==2.4.0
packaging==23.0
pluggy==1.0.0
pytest==7.2.2
pytest-asyncio==0.20.3
pytest-cov==4.0.0
pytest-mock==3.10.0
packaging==23.2
pluggy==1.2.0
pytest==7.4.3
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.11.1
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.7.0
urllib3==1.26.15
typing-extensions==4.7.1
urllib3==1.26.18
werkzeug==2.1.2
wrapt==1.15.0
wrapt==1.16.0
zipp==3.15.0
zope-event==4.6
zope-interface==5.5.2
zope-event==5.0
zope-interface==6.1

# The following packages are considered to be unsafe in a requirements file:
# setuptools
44 changes: 22 additions & 22 deletions .riot/requirements/13adabf.txt → .riot/requirements/10cc2a6.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/13adabf.in
# pip-compile --no-annotate .riot/requirements/10cc2a6.in
#
attrs==22.2.0
certifi==2022.12.7
attrs==23.1.0
certifi==2023.11.17
charset-normalizer==2.1.1
click==8.1.3
coverage[toml]==7.2.2
deprecated==1.2.13
exceptiongroup==1.1.1
click==8.1.7
coverage[toml]==7.3.2
deprecated==1.2.14
exceptiongroup==1.1.3
flask==2.1.3
gevent==22.10.2
greenlet==2.0.2
gevent==23.9.1
greenlet==3.0.1
hypothesis==6.45.0
idna==3.4
importlib-metadata==6.0.0
importlib-metadata==6.8.0
iniconfig==2.0.0
itsdangerous==2.1.2
jinja2==3.1.2
markupsafe==2.0.1
mock==5.0.1
mock==5.1.0
opentelemetry-api==1.15.0
opentelemetry-instrumentation==0.37b0
opentelemetry-instrumentation-flask==0.37b0
opentelemetry-instrumentation-wsgi==0.37b0
opentelemetry-semantic-conventions==0.37b0
opentelemetry-util-http==0.37b0
opentracing==2.4.0
packaging==23.0
pluggy==1.0.0
pytest==7.2.2
pytest-asyncio==0.20.3
pytest-cov==4.0.0
pytest-mock==3.10.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.12.0
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
urllib3==1.26.15
urllib3==1.26.18
werkzeug==2.1.2
wrapt==1.15.0
zipp==3.15.0
zope-event==4.6
zope-interface==5.5.2
wrapt==1.16.0
zipp==3.17.0
zope-event==5.0
zope-interface==6.1

# The following packages are considered to be unsafe in a requirements file:
# setuptools
40 changes: 20 additions & 20 deletions .riot/requirements/18b8c7c.txt → .riot/requirements/11a899e.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,46 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/18b8c7c.in
# pip-compile --no-annotate .riot/requirements/11a899e.in
#
attrs==22.2.0
certifi==2022.12.7
attrs==23.1.0
certifi==2023.11.17
charset-normalizer==2.1.1
click==8.1.3
coverage[toml]==7.2.2
deprecated==1.2.13
exceptiongroup==1.1.1
click==8.1.7
coverage[toml]==7.3.2
deprecated==1.2.14
exceptiongroup==1.1.3
flask==2.1.3
gevent==22.10.2
greenlet==2.0.2
gevent==23.9.1
greenlet==3.0.1
hypothesis==6.45.0
idna==3.4
iniconfig==2.0.0
itsdangerous==2.1.2
jinja2==3.1.2
markupsafe==2.0.1
mock==5.0.1
mock==5.1.0
opentelemetry-api==1.11.1
opentelemetry-instrumentation==0.32b0
opentelemetry-instrumentation-flask==0.32b0
opentelemetry-instrumentation-wsgi==0.32b0
opentelemetry-semantic-conventions==0.32b0
opentelemetry-util-http==0.32b0
opentracing==2.4.0
packaging==23.0
pluggy==1.0.0
pytest==7.2.2
pytest-asyncio==0.20.3
pytest-cov==4.0.0
pytest-mock==3.10.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.12.0
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
urllib3==1.26.15
urllib3==1.26.18
werkzeug==2.1.2
wrapt==1.15.0
zope-event==4.6
zope-interface==5.5.2
wrapt==1.16.0
zope-event==5.0
zope-interface==6.1

# The following packages are considered to be unsafe in a requirements file:
# setuptools
40 changes: 20 additions & 20 deletions .riot/requirements/bd9ab6d.txt → .riot/requirements/11efb5e.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/bd9ab6d.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/11efb5e.in
#
asgiref==3.6.0
attrs==22.2.0
certifi==2022.12.7
asgiref==3.7.2
attrs==23.1.0
certifi==2023.11.17
charset-normalizer==2.1.1
click==7.1.2
coverage[toml]==7.2.2
exceptiongroup==1.1.1
coverage[toml]==7.2.7
exceptiongroup==1.1.3
flask==1.1.4
gevent==22.10.2
greenlet==2.0.2
greenlet==3.0.1
hypothesis==6.45.0
idna==3.4
importlib-metadata==6.0.0
importlib-metadata==6.7.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==2.0.1
mock==5.0.1
mock==5.1.0
opentelemetry-api==1.0.0
opentelemetry-instrumentation==0.19b0
opentelemetry-instrumentation-flask==0.19b0
opentelemetry-instrumentation-wsgi==0.19b0
opentelemetry-util-http==0.19b0
opentracing==2.4.0
packaging==23.0
pluggy==1.0.0
pytest==7.2.2
pytest-asyncio==0.20.3
pytest-cov==4.0.0
pytest-mock==3.10.0
packaging==23.2
pluggy==1.2.0
pytest==7.4.3
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.11.1
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.7.0
urllib3==1.26.15
typing-extensions==4.7.1
urllib3==1.26.18
werkzeug==1.0.1
wrapt==1.15.0
wrapt==1.16.0
zipp==3.15.0
zope-event==4.6
zope-interface==5.5.2
zope-event==5.0
zope-interface==6.1

# The following packages are considered to be unsafe in a requirements file:
# setuptools
42 changes: 21 additions & 21 deletions .riot/requirements/4ed0642.txt → .riot/requirements/1435ffd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/4ed0642.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1435ffd.in
#
attrs==22.2.0
certifi==2022.12.7
attrs==23.1.0
certifi==2023.11.17
charset-normalizer==2.1.1
click==8.1.3
coverage[toml]==7.2.2
deprecated==1.2.13
exceptiongroup==1.1.1
click==8.1.7
coverage[toml]==7.2.7
deprecated==1.2.14
exceptiongroup==1.1.3
flask==2.1.3
gevent==22.10.2
greenlet==2.0.2
greenlet==3.0.1
hypothesis==6.45.0
idna==3.4
importlib-metadata==6.0.0
importlib-metadata==6.7.0
iniconfig==2.0.0
itsdangerous==2.1.2
jinja2==3.1.2
markupsafe==2.0.1
mock==5.0.1
mock==5.1.0
opentelemetry-api==1.15.0
opentelemetry-instrumentation==0.37b0
opentelemetry-instrumentation-flask==0.37b0
opentelemetry-instrumentation-wsgi==0.37b0
opentelemetry-semantic-conventions==0.37b0
opentelemetry-util-http==0.37b0
opentracing==2.4.0
packaging==23.0
pluggy==1.0.0
pytest==7.2.2
pytest-asyncio==0.20.3
pytest-cov==4.0.0
pytest-mock==3.10.0
packaging==23.2
pluggy==1.2.0
pytest==7.4.3
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.11.1
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.7.0
urllib3==1.26.15
typing-extensions==4.7.1
urllib3==1.26.18
werkzeug==2.1.2
wrapt==1.15.0
wrapt==1.16.0
zipp==3.15.0
zope-event==4.6
zope-interface==5.5.2
zope-event==5.0
zope-interface==6.1

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

0 comments on commit ac29fa3

Please sign in to comment.