Skip to content

Commit

Permalink
fix(opentelemetry): resolve circular imports [bakcport 2.10]
Browse files Browse the repository at this point in the history
  • Loading branch information
mabdinur committed Aug 5, 2024
1 parent 9f88da4 commit 036142a
Show file tree
Hide file tree
Showing 38 changed files with 404 additions and 1,015 deletions.
25 changes: 25 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,28 @@ mypy.ini @DataDog/python-guild @DataDog/apm-core-pyt
.github/CODEOWNERS @DataDog/python-guild @DataDog/apm-core-python
.github/workflows/system-tests.yml @DataDog/python-guild @DataDog/apm-core-python
ddtrace/internal/compat.py @DataDog/python-guild @DataDog/apm-core-python
tests/utils.py @DataDog/python-guild
tests/.suitespec.json @DataDog/python-guild @DataDog/apm-core-python
tests/suitespec.py @DataDog/python-guild @DataDog/apm-core-python

# API SDK
ddtrace/_trace/ @DataDog/apm-sdk-api-python
ddtrace/opentelemetry/ @DataDog/apm-sdk-api-python
ddtrace/internal/opentelemetry @DataDog/apm-sdk-api-python
ddtrace/opentracer/ @DataDog/apm-sdk-api-python
ddtrace/propagation/ @DataDog/apm-sdk-api-python
ddtrace/filters.py @DataDog/apm-sdk-api-python
ddtrace/pin.py @DataDog/apm-sdk-api-python
ddtrace/sampler.py @DataDog/apm-sdk-api-python
ddtrace/sampling_rule.py @DataDog/apm-sdk-api-python
ddtrace/internal/sampling.py @DataDog/apm-sdk-api-python
ddtrace/internal/tracemethods.py @DataDog/apm-sdk-api-python
ddttace/settings/_otel_remapper.py @DataDog/apm-sdk-api-python
tests/integration/test_priority_sampling.py @DataDog/apm-sdk-api-python
tests/integration/test_propagation.py @DataDog/apm-sdk-api-python
tests/test_sampling.py @DataDog/apm-sdk-api-python
tests/test_tracemethods.py @DataDog/apm-sdk-api-python
tests/opentelemetry/ @DataDog/apm-sdk-api-python
tests/tracer/ @DataDog/apm-sdk-api-python
# Override because order matters
tests/tracer/test_ci.py @DataDog/ci-app-libraries
38 changes: 19 additions & 19 deletions .riot/requirements/1029814.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@
#
# pip-compile --no-annotate .riot/requirements/1029814.in
#
attrs==23.1.0
certifi==2023.11.17
attrs==23.2.0
certifi==2024.7.4
charset-normalizer==2.1.1
click==8.1.7
coverage[toml]==7.3.4
coverage[toml]==7.6.0
deprecated==1.2.14
exceptiongroup==1.2.0
exceptiongroup==1.2.2
flask==2.1.3
gevent==23.9.1
greenlet==3.0.2
gevent==24.2.1
greenlet==3.0.3
hypothesis==6.45.0
idna==3.6
importlib-metadata==6.11.0
idna==3.7
importlib-metadata==7.1.0
iniconfig==2.0.0
itsdangerous==2.1.2
jinja2==3.1.2
itsdangerous==2.2.0
jinja2==3.1.4
markupsafe==2.0.1
mock==5.1.0
opentelemetry-api==1.22.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
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
packaging==24.1
pluggy==1.5.0
pytest==8.3.1
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.12.0
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.18
urllib3==1.26.19
werkzeug==2.1.2
wrapt==1.16.0
zipp==3.17.0
zipp==3.19.2
zope-event==5.0
zope-interface==6.1
zope-interface==6.4.post2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
52 changes: 0 additions & 52 deletions .riot/requirements/104cf8b.txt

This file was deleted.

32 changes: 16 additions & 16 deletions .riot/requirements/10f03b7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
#
# pip-compile --no-annotate .riot/requirements/10f03b7.in
#
asgiref==3.7.2
attrs==23.1.0
certifi==2023.11.17
asgiref==3.8.1
attrs==23.2.0
certifi==2024.7.4
charset-normalizer==2.1.1
click==7.1.2
coverage[toml]==7.3.4
exceptiongroup==1.2.0
coverage[toml]==7.6.0
exceptiongroup==1.2.2
flask==1.1.4
gevent==23.9.1
greenlet==3.0.2
gevent==24.2.1
greenlet==3.0.3
hypothesis==6.45.0
idna==3.6
idna==3.7
iniconfig==2.0.0
itsdangerous==1.1.0
jinja2==2.11.3
Expand All @@ -27,22 +27,22 @@ opentelemetry-instrumentation-flask==0.19b0
opentelemetry-instrumentation-wsgi==0.19b0
opentelemetry-util-http==0.19b0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
packaging==24.1
pluggy==1.5.0
pytest==8.3.1
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.12.0
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
typing-extensions==4.9.0
urllib3==1.26.18
typing-extensions==4.12.2
urllib3==1.26.19
werkzeug==1.0.1
wrapt==1.16.0
zope-event==5.0
zope-interface==6.1
zope-interface==6.4.post2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
48 changes: 0 additions & 48 deletions .riot/requirements/11f8ba6.txt

This file was deleted.

50 changes: 0 additions & 50 deletions .riot/requirements/13538ad.txt

This file was deleted.

36 changes: 18 additions & 18 deletions .riot/requirements/14a0494.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
#
# pip-compile --no-annotate .riot/requirements/14a0494.in
#
attrs==23.1.0
certifi==2023.11.17
attrs==23.2.0
certifi==2024.7.4
charset-normalizer==2.1.1
click==8.1.7
coverage[toml]==7.3.4
coverage[toml]==7.6.0
deprecated==1.2.14
exceptiongroup==1.2.0
exceptiongroup==1.2.2
flask==2.1.3
gevent==23.9.1
greenlet==3.0.2
gevent==24.2.1
greenlet==3.0.3
hypothesis==6.45.0
idna==3.6
importlib-metadata==7.0.0
idna==3.7
importlib-metadata==8.2.0
iniconfig==2.0.0
itsdangerous==2.1.2
jinja2==3.1.2
itsdangerous==2.2.0
jinja2==3.1.4
markupsafe==2.0.1
mock==5.1.0
opentelemetry-api==1.15.0
Expand All @@ -29,22 +29,22 @@ opentelemetry-instrumentation-wsgi==0.37b0
opentelemetry-semantic-conventions==0.37b0
opentelemetry-util-http==0.37b0
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
packaging==24.1
pluggy==1.5.0
pytest==8.3.1
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.12.0
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.18
urllib3==1.26.19
werkzeug==2.1.2
wrapt==1.16.0
zipp==3.17.0
zipp==3.19.2
zope-event==5.0
zope-interface==6.1
zope-interface==6.4.post2

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

0 comments on commit 036142a

Please sign in to comment.