Skip to content

Commit

Permalink
ci(opentelemetry): pin opentelemetry-api version to unblock tests [ba…
Browse files Browse the repository at this point in the history
…ckport 2.10] (#9938)

Backport 27cd94c from #9932 to 2.10.

Resolves the following failures:
[https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/66676/workflows/fa3470d[…]2a-d3447f3f431a/jobs/4095885/parallel-runs/2?filterBy=FAILED](https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/66676/workflows/fa3470d1-e065-43a1-9a2a-d3447f3f431a/jobs/4095885/parallel-runs/2?filterBy=FAILED)
in ci.

The `opentelemetry-api` broke compatibility with ddtrace in v1.25.0 and
then introduced another breaking change in 1.26.0. This PR ensures the
telemetry test suite uses a stable version of the `opentelemetry-api`.

## 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: Munir Abdinur <[email protected]>
  • Loading branch information
github-actions[bot] and mabdinur authored Jul 25, 2024
1 parent f3a47fb commit 7e39ec5
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 73 deletions.
33 changes: 18 additions & 15 deletions .riot/requirements/15235b0.txt → .riot/requirements/12974a3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,38 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/15235b0.in
# pip-compile --no-annotate .riot/requirements/12974a3.in
#
attrs==23.2.0
certifi==2023.11.17
certifi==2024.7.4
charset-normalizer==3.3.2
click==7.1.2
coverage[toml]==7.4.0
exceptiongroup==1.2.0
coverage[toml]==7.6.0
deprecated==1.2.14
exceptiongroup==1.2.2
flask==1.1.4
gunicorn==21.2.0
gunicorn==22.0.0
httpretty==1.0.5
hypothesis==6.45.0
idna==3.6
importlib-metadata==7.0.1
idna==3.7
importlib-metadata==7.0.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.1.0
opentelemetry-api==1.24.0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
packaging==24.1
pluggy==1.5.0
pytest==8.3.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
requests==2.31.0
requests==2.32.3
sortedcontainers==2.4.0
tomli==2.0.1
urllib3==2.1.0
urllib3==2.2.2
werkzeug==1.0.1
zipp==3.17.0
wrapt==1.16.0
zipp==3.19.2
29 changes: 17 additions & 12 deletions .riot/requirements/1153ad9.txt → .riot/requirements/1677649.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,36 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1153ad9.in
# pip-compile --no-annotate .riot/requirements/1677649.in
#
attrs==23.2.0
certifi==2023.11.17
certifi==2024.7.4
charset-normalizer==3.3.2
click==7.1.2
coverage[toml]==7.4.0
coverage[toml]==7.6.0
deprecated==1.2.14
flask==1.1.4
gunicorn==21.2.0
gunicorn==22.0.0
httpretty==1.0.5
hypothesis==6.45.0
idna==3.6
idna==3.7
importlib-metadata==7.0.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.1.0
opentelemetry-api==1.24.0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
packaging==24.1
pluggy==1.5.0
pytest==8.3.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
requests==2.31.0
requests==2.32.3
sortedcontainers==2.4.0
urllib3==2.1.0
urllib3==2.2.2
werkzeug==1.0.1
wrapt==1.16.0
zipp==3.19.2
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,29 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/427c22a.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/17c4377.in
#
attrs==23.2.0
certifi==2023.11.17
certifi==2024.7.4
charset-normalizer==3.3.2
click==7.1.2
coverage[toml]==7.2.7
exceptiongroup==1.2.0
deprecated==1.2.14
exceptiongroup==1.2.2
flask==1.1.4
gunicorn==21.2.0
gunicorn==22.0.0
httpretty==1.0.5
hypothesis==6.45.0
idna==3.6
idna==3.7
importlib-metadata==6.7.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.1.0
opentelemetry-api==1.22.0
opentracing==2.4.0
packaging==23.2
packaging==24.0
pluggy==1.2.0
pytest==7.4.4
pytest-cov==4.1.0
Expand All @@ -34,4 +36,5 @@ tomli==2.0.1
typing-extensions==4.7.1
urllib3==2.0.7
werkzeug==1.0.1
wrapt==1.16.0
zipp==3.15.0
33 changes: 18 additions & 15 deletions .riot/requirements/135aac0.txt → .riot/requirements/18589ec.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,38 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/135aac0.in
# pip-compile --no-annotate .riot/requirements/18589ec.in
#
attrs==23.2.0
certifi==2023.11.17
certifi==2024.7.4
charset-normalizer==3.3.2
click==7.1.2
coverage[toml]==7.4.0
exceptiongroup==1.2.0
coverage[toml]==7.6.0
deprecated==1.2.14
exceptiongroup==1.2.2
flask==1.1.4
gunicorn==21.2.0
gunicorn==22.0.0
httpretty==1.0.5
hypothesis==6.45.0
idna==3.6
importlib-metadata==7.0.1
idna==3.7
importlib-metadata==7.0.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.1.0
opentelemetry-api==1.24.0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
packaging==24.1
pluggy==1.5.0
pytest==8.3.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
requests==2.31.0
requests==2.32.3
sortedcontainers==2.4.0
tomli==2.0.1
urllib3==2.1.0
urllib3==2.2.2
werkzeug==1.0.1
zipp==3.17.0
wrapt==1.16.0
zipp==3.19.2
31 changes: 18 additions & 13 deletions .riot/requirements/118cb50.txt → .riot/requirements/1a14242.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,38 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/118cb50.in
# pip-compile --no-annotate .riot/requirements/1a14242.in
#
attrs==23.2.0
certifi==2023.11.17
certifi==2024.7.4
charset-normalizer==3.3.2
click==7.1.2
coverage[toml]==7.4.0
exceptiongroup==1.2.0
coverage[toml]==7.6.0
deprecated==1.2.14
exceptiongroup==1.2.2
flask==1.1.4
gunicorn==21.2.0
gunicorn==22.0.0
httpretty==1.0.5
hypothesis==6.45.0
idna==3.6
idna==3.7
importlib-metadata==7.0.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.1.0
opentelemetry-api==1.24.0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
packaging==24.1
pluggy==1.5.0
pytest==8.3.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
requests==2.31.0
requests==2.32.3
sortedcontainers==2.4.0
tomli==2.0.1
urllib3==2.1.0
urllib3==2.2.2
werkzeug==1.0.1
wrapt==1.16.0
zipp==3.19.2
29 changes: 17 additions & 12 deletions .riot/requirements/17a929f.txt → .riot/requirements/5c0475c.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,36 @@
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/17a929f.in
# pip-compile --no-annotate .riot/requirements/5c0475c.in
#
attrs==23.2.0
certifi==2023.11.17
certifi==2024.7.4
charset-normalizer==3.3.2
click==7.1.2
coverage[toml]==7.4.0
coverage[toml]==7.6.0
deprecated==1.2.14
flask==1.1.4
gunicorn==21.2.0
gunicorn==22.0.0
httpretty==1.0.5
hypothesis==6.45.0
idna==3.6
idna==3.7
importlib-metadata==7.0.0
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
markupsafe==1.1.1
mock==5.1.0
opentelemetry-api==1.24.0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
packaging==24.1
pluggy==1.5.0
pytest==8.3.2
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
requests==2.31.0
requests==2.32.3
sortedcontainers==2.4.0
urllib3==2.1.0
urllib3==2.2.2
werkzeug==1.0.1
wrapt==1.16.0
zipp==3.19.2
2 changes: 2 additions & 0 deletions riotfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
"flask": "<=2.2.3",
"httpretty": "<1.1",
"werkzeug": "<2.0",
# FIXME: ddtrace does not support the latest versions of opentelemetry-api
"opentelemetry-api": "<1.25.0",
"pytest-randomly": latest,
"markupsafe": "<2.0",
},
Expand Down

0 comments on commit 7e39ec5

Please sign in to comment.