diff --git a/.riot/requirements/1029814.txt b/.riot/requirements/1438a95.txt similarity index 70% rename from .riot/requirements/1029814.txt rename to .riot/requirements/1438a95.txt index da874100b55..fc2e26f35fb 100644 --- a/.riot/requirements/1029814.txt +++ b/.riot/requirements/1438a95.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1029814.in +# pip-compile --no-annotate .riot/requirements/1438a95.in # attrs==23.2.0 certifi==2024.7.4 @@ -16,22 +16,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.25.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 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/a4a20ae.txt b/.riot/requirements/14f0b34.txt similarity index 70% rename from .riot/requirements/a4a20ae.txt rename to .riot/requirements/14f0b34.txt index d81c009507d..85454fec178 100644 --- a/.riot/requirements/a4a20ae.txt +++ b/.riot/requirements/14f0b34.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/a4a20ae.in +# pip-compile --no-annotate .riot/requirements/14f0b34.in # attrs==23.2.0 certifi==2024.7.4 @@ -15,21 +15,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.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 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -39,6 +40,7 @@ sortedcontainers==2.4.0 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/1634a62.txt b/.riot/requirements/196d465.txt similarity index 69% rename from .riot/requirements/1634a62.txt rename to .riot/requirements/196d465.txt index 451ccd33c87..2bc287d7e9f 100644 --- a/.riot/requirements/1634a62.txt +++ b/.riot/requirements/196d465.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1634a62.in +# pip-compile --no-annotate .riot/requirements/196d465.in # attrs==23.2.0 certifi==2024.7.4 @@ -15,22 +15,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.25.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 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/59f93d3.txt b/.riot/requirements/1aa3044.txt similarity index 92% rename from .riot/requirements/59f93d3.txt rename to .riot/requirements/1aa3044.txt index ab14a29f480..7bf52690f10 100644 --- a/.riot/requirements/59f93d3.txt +++ b/.riot/requirements/1aa3044.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/59f93d3.in +# pip-compile --no-annotate .riot/requirements/1aa3044.in # asgiref==3.8.1 attrs==23.2.0 @@ -28,7 +28,7 @@ opentelemetry-util-http==0.19b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/10f03b7.txt b/.riot/requirements/1c47005.txt similarity index 92% rename from .riot/requirements/10f03b7.txt rename to .riot/requirements/1c47005.txt index dd2f5c63898..7be57bbcc0d 100644 --- a/.riot/requirements/10f03b7.txt +++ b/.riot/requirements/1c47005.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/10f03b7.in +# pip-compile --no-annotate .riot/requirements/1c47005.in # asgiref==3.8.1 attrs==23.2.0 @@ -29,7 +29,7 @@ opentelemetry-util-http==0.19b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/4de07e7.txt b/.riot/requirements/1e1ea62.txt similarity index 70% rename from .riot/requirements/4de07e7.txt rename to .riot/requirements/1e1ea62.txt index 07717a4d97d..b3150829b3b 100644 --- a/.riot/requirements/4de07e7.txt +++ b/.riot/requirements/1e1ea62.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/4de07e7.in +# pip-compile --no-annotate .riot/requirements/1e1ea62.in # attrs==23.2.0 certifi==2024.7.4 @@ -15,21 +15,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.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 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -39,6 +40,7 @@ sortedcontainers==2.4.0 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/ea8be54.txt b/.riot/requirements/1fbf1f2.txt similarity index 92% rename from .riot/requirements/ea8be54.txt rename to .riot/requirements/1fbf1f2.txt index 3f6961d2b59..b2acee3ce55 100644 --- a/.riot/requirements/ea8be54.txt +++ b/.riot/requirements/1fbf1f2.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/ea8be54.in +# pip-compile --no-annotate .riot/requirements/1fbf1f2.in # asgiref==3.8.1 attrs==23.2.0 @@ -28,7 +28,7 @@ opentelemetry-util-http==0.19b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/82d4fd1.txt b/.riot/requirements/5be696d.txt similarity index 90% rename from .riot/requirements/82d4fd1.txt rename to .riot/requirements/5be696d.txt index 1b52a5ae242..97812099d87 100644 --- a/.riot/requirements/82d4fd1.txt +++ b/.riot/requirements/5be696d.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/82d4fd1.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5be696d.in # asgiref==3.8.1 attrs==23.2.0 @@ -30,7 +30,7 @@ opentelemetry-util-http==0.19b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/ca367e6.txt b/.riot/requirements/5e63315.txt similarity index 69% rename from .riot/requirements/ca367e6.txt rename to .riot/requirements/5e63315.txt index 2e297ebc4a7..ff4304b6236 100644 --- a/.riot/requirements/ca367e6.txt +++ b/.riot/requirements/5e63315.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/ca367e6.in +# pip-compile --no-annotate .riot/requirements/5e63315.in # attrs==23.2.0 certifi==2024.7.4 @@ -15,22 +15,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.25.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 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/a3e6122.txt b/.riot/requirements/69997b1.txt similarity index 71% rename from .riot/requirements/a3e6122.txt rename to .riot/requirements/69997b1.txt index af94bfa4c44..8646147a375 100644 --- a/.riot/requirements/a3e6122.txt +++ b/.riot/requirements/69997b1.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/a3e6122.in +# pip-compile --no-annotate .riot/requirements/69997b1.in # attrs==23.2.0 certifi==2024.7.4 @@ -16,21 +16,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.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 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -41,6 +42,7 @@ tomli==2.0.1 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/a367077.txt b/.riot/requirements/7c104f7.txt similarity index 70% rename from .riot/requirements/a367077.txt rename to .riot/requirements/7c104f7.txt index 97b163a0065..00f0556139d 100644 --- a/.riot/requirements/a367077.txt +++ b/.riot/requirements/7c104f7.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/a367077.in +# pip-compile --no-annotate .riot/requirements/7c104f7.in # attrs==23.2.0 certifi==2024.7.4 @@ -16,22 +16,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.25.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 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/a16e5c1.txt b/.riot/requirements/85c90b4.txt similarity index 92% rename from .riot/requirements/a16e5c1.txt rename to .riot/requirements/85c90b4.txt index d174ed0e1b0..d79e99702c8 100644 --- a/.riot/requirements/a16e5c1.txt +++ b/.riot/requirements/85c90b4.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/a16e5c1.in +# pip-compile --no-annotate .riot/requirements/85c90b4.in # asgiref==3.8.1 attrs==23.2.0 @@ -30,7 +30,7 @@ opentelemetry-util-http==0.19b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/8dea090.txt b/.riot/requirements/8dea090.txt new file mode 100644 index 00000000000..7f81ab7c9d1 --- /dev/null +++ b/.riot/requirements/8dea090.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/8dea090.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/9b3b6c2.txt b/.riot/requirements/9b3b6c2.txt new file mode 100644 index 00000000000..e53415f4941 --- /dev/null +++ b/.riot/requirements/9b3b6c2.txt @@ -0,0 +1,48 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/9b3b6c2.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/a0f2001.txt b/.riot/requirements/a0f2001.txt new file mode 100644 index 00000000000..0fc05775a5d --- /dev/null +++ b/.riot/requirements/a0f2001.txt @@ -0,0 +1,48 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/a0f2001.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/efe1fdc.txt b/.riot/requirements/a8351f1.txt similarity index 68% rename from .riot/requirements/efe1fdc.txt rename to .riot/requirements/a8351f1.txt index ce45557667f..6cfbaf73268 100644 --- a/.riot/requirements/efe1fdc.txt +++ b/.riot/requirements/a8351f1.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/efe1fdc.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/a8351f1.in # attrs==23.2.0 certifi==2024.7.4 @@ -16,22 +16,22 @@ gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.25.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 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/b1fd8ec.txt b/.riot/requirements/b1fd8ec.txt new file mode 100644 index 00000000000..cd02446f7bf --- /dev/null +++ b/.riot/requirements/b1fd8ec.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/b1fd8ec.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/c3e8b1a.txt b/.riot/requirements/c3e8b1a.txt new file mode 100644 index 00000000000..30d764cdbc5 --- /dev/null +++ b/.riot/requirements/c3e8b1a.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/c3e8b1a.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/14a0494.txt b/.riot/requirements/e20bbeb.txt similarity index 73% rename from .riot/requirements/14a0494.txt rename to .riot/requirements/e20bbeb.txt index 5c27e99a326..6d36ac10b16 100644 --- a/.riot/requirements/14a0494.txt +++ b/.riot/requirements/e20bbeb.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/14a0494.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/e20bbeb.in # attrs==23.2.0 certifi==2024.7.4 @@ -23,15 +23,15 @@ jinja2==3.1.4 markupsafe==2.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 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/1d3d6ad.txt b/.riot/requirements/f19daa4.txt similarity index 74% rename from .riot/requirements/1d3d6ad.txt rename to .riot/requirements/f19daa4.txt index 510891832da..c7c1207667f 100644 --- a/.riot/requirements/1d3d6ad.txt +++ b/.riot/requirements/f19daa4.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1d3d6ad.in +# pip-compile --no-annotate .riot/requirements/f19daa4.in # attrs==23.2.0 certifi==2024.7.4 @@ -23,15 +23,15 @@ jinja2==3.1.4 markupsafe==2.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 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.3.1 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/60a424f.txt b/.riot/requirements/f3b3381.txt similarity index 51% rename from .riot/requirements/60a424f.txt rename to .riot/requirements/f3b3381.txt index 1b6cd80153c..a5c28c7c313 100644 --- a/.riot/requirements/60a424f.txt +++ b/.riot/requirements/f3b3381.txt @@ -2,53 +2,51 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/60a424f.in +# pip-compile --no-annotate .riot/requirements/f3b3381.in # aiosqlite==0.17.0 -attrs==23.2.0 -blinker==1.7.0 +annotated-types==0.7.0 +attrs==24.1.0 +blinker==1.8.2 bytecode==0.15.1 cattrs==22.2.0 -certifi==2024.2.2 +certifi==2024.7.4 charset-normalizer==3.3.2 click==8.1.7 -coverage[toml]==7.4.4 +coverage[toml]==7.6.1 ddsketch==3.0.1 -deprecated==1.2.14 envier==0.5.1 flask==3.0.3 greenlet==3.0.3 hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 +idna==3.7 iniconfig==2.0.0 iso8601==1.1.0 -itsdangerous==2.1.2 -jinja2==3.1.3 +itsdangerous==2.2.0 +jinja2==3.1.4 markupsafe==2.1.5 mock==5.1.0 -opentelemetry-api==1.24.0 opentracing==2.4.0 -packaging==24.0 -peewee==3.17.1 -pluggy==1.4.0 +packaging==24.1 +peewee==3.17.6 +pluggy==1.5.0 pony==0.7.17 -protobuf==5.26.1 +protobuf==5.27.3 pycryptodome==3.20.0 +pydantic==2.8.2 +pydantic-core==2.20.1 pypika-tortoise==0.1.6 -pytest==8.1.1 +pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 pytz==2024.1 -requests==2.31.0 +requests==2.32.3 six==1.16.0 sortedcontainers==2.4.0 -sqlalchemy==2.0.29 -sqlparse==0.4.4 -tortoise-orm==0.20.0 -typing-extensions==4.11.0 -urllib3==2.2.1 -werkzeug==3.0.2 -wrapt==1.16.0 +sqlalchemy==2.0.31 +sqlparse==0.5.1 +tortoise-orm==0.21.5 +typing-extensions==4.12.2 +urllib3==2.2.2 +werkzeug==3.0.3 xmltodict==0.13.0 -zipp==3.18.1 diff --git a/ddtrace/opentelemetry/_trace.py b/ddtrace/opentelemetry/_trace.py index 1ede1cc7ccb..1f15a6dff26 100644 --- a/ddtrace/opentelemetry/_trace.py +++ b/ddtrace/opentelemetry/_trace.py @@ -1,6 +1,7 @@ from contextlib import contextmanager from typing import TYPE_CHECKING +from opentelemetry import version from opentelemetry.context import Context as OtelContext # noqa:F401 from opentelemetry.trace import SpanKind as OtelSpanKind from opentelemetry.trace import Tracer as OtelTracer @@ -18,6 +19,7 @@ if TYPE_CHECKING: + from typing import Dict # noqa:F401 from typing import Iterator # noqa:F401 from typing import Mapping # noqa:F401 from typing import Optional # noqa:F401 @@ -34,6 +36,9 @@ log = get_logger(__name__) +OTEL_VERSION = tuple(int(x) for x in version.__version__.split(".")[:3]) + + class TracerProvider(OtelTracerProvider): """ Entry point of the OpenTelemetry API and provides access to OpenTelemetry compatible Tracers. @@ -44,15 +49,32 @@ def __init__(self) -> None: self._ddtracer = ddtrace.tracer super().__init__() - def get_tracer( - self, - instrumenting_module_name, - instrumenting_library_version=None, - schema_url=None, - ): - # type: (str, Optional[str], Optional[str]) -> OtelTracer - """Returns an opentelemetry compatible Tracer.""" - return Tracer(self._ddtracer) + if OTEL_VERSION >= (1, 26): + # OpenTelemetry 1.26+ has a new get_tracer signature + # https://github.com/open-telemetry/opentelemetry-python/commit/d4e13bdf95190314b0d21a9357f850fa2e6a4cd3 + # The new signature includes an `attributes` parameter which is used by opentelemetry internals. + def get_tracer( + self, + instrumenting_module_name, + instrumenting_library_version=None, + schema_url=None, + attributes=None, + ): + # type: (str, Optional[str], Optional[str], Optional[Dict]) -> OtelTracer + """Returns an opentelemetry compatible Tracer.""" + return Tracer(self._ddtracer) + + else: + + def get_tracer( # type: ignore[misc] + self, + instrumenting_module_name, + instrumenting_library_version=None, + schema_url=None, + ): + # type: (str, Optional[str], Optional[str]) -> OtelTracer + """Returns an opentelemetry compatible Tracer.""" + return Tracer(self._ddtracer) class Tracer(OtelTracer): diff --git a/releasenotes/notes/fix-otel-get-tracer-args-0195cb8c1f7614ac.yaml b/releasenotes/notes/fix-otel-get-tracer-args-0195cb8c1f7614ac.yaml new file mode 100644 index 00000000000..0c9c48d1f75 --- /dev/null +++ b/releasenotes/notes/fix-otel-get-tracer-args-0195cb8c1f7614ac.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + opentelemetry: Resolves an issue where the ``get_tracer`` function would raise a ``TypeError`` when called with the ``attribute`` argument. + This resolves an incompatibility introduced in ``opentelemetry-api==1.26.0``. diff --git a/riotfile.py b/riotfile.py index dc355573e20..daea5188563 100644 --- a/riotfile.py +++ b/riotfile.py @@ -198,7 +198,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "attrs": ">=20", "typing_extensions": latest, "xmltodict": ">=0.12", - "opentelemetry-api": ">=1", "opentracing": ">=2.0.0", "bytecode": latest, "sqlparse": ">=0.2.2", @@ -2289,9 +2288,9 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): pkgs={ "pytest-randomly": latest, "pytest-asyncio": "==0.21.1", - "opentelemetry-api": ["~=1.0.0", "~=1.15.0", latest], - "opentelemetry-instrumentation-flask": "<=0.37b0", - # opentelemetry-instrumentation-flask does not support the latest version of markupsafe + # Ensure we test against version of opentelemetry-api that broke compatibility with ddtrace + "opentelemetry-api": ["~=1.0.0", "~=1.15.0", "~=1.26.0", latest], + "opentelemetry-instrumentation-flask": latest, "markupsafe": "==2.0.1", "flask": latest, "gevent": latest,