Skip to content

[opentracing] Fixing context provider imports for scope manager #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 20, 2018
Merged

[opentracing] Fixing context provider imports for scope manager #771

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d546f2c
fix(opentracer): fixing context provider imports for scope manager
Maximilien-R Dec 10, 2018
b28e739
Merge branch '0.18-dev' into mra/fix-opentracer-scope-manager-imports
brettlangdon Dec 10, 2018
cf64bb2
doc: add comment about the fix made
Maximilien-R Dec 11, 2018
bf445d3
Merge branch '0.19-dev' into mra/fix-opentracer-scope-manager-imports
brettlangdon Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ddtrace/opentracer/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import ddtrace
# DEV: If `asyncio` or `gevent` are unavailable we do not throw an error,
# `context_provider` will just not be set and we'll get an `AttributeError` instead
import ddtrace.contrib.asyncio
import ddtrace.contrib.gevent

from ddtrace.provider import DefaultContextProvider


def get_context_provider_for_scope_manager(scope_manager):
Expand All @@ -13,6 +18,6 @@ def get_context_provider_for_scope_manager(scope_manager):
elif scope_manager_type == "GeventScopeManager":
dd_context_provider = ddtrace.contrib.gevent.context_provider
else:
dd_context_provider = ddtrace.provider.DefaultContextProvider()
dd_context_provider = DefaultContextProvider()

return dd_context_provider