From d546f2c35c0c06afa20a42659048123298b3b14d Mon Sep 17 00:00:00 2001 From: Maximilien Raulic Date: Mon, 10 Dec 2018 09:30:19 +0100 Subject: [PATCH 1/2] fix(opentracer): fixing context provider imports for scope manager --- ddtrace/opentracer/utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ddtrace/opentracer/utils.py b/ddtrace/opentracer/utils.py index 84638d3c829..51cf2ddd618 100644 --- a/ddtrace/opentracer/utils.py +++ b/ddtrace/opentracer/utils.py @@ -1,4 +1,7 @@ -import ddtrace +import ddtrace.contrib.asyncio +import ddtrace.contrib.gevent + +from ddtrace.provider import DefaultContextProvider def get_context_provider_for_scope_manager(scope_manager): @@ -13,6 +16,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 From cf64bb2b5237acd6acf7e309cf5e50bbc9e5fefd Mon Sep 17 00:00:00 2001 From: Maximilien Raulic Date: Tue, 11 Dec 2018 16:03:22 +0100 Subject: [PATCH 2/2] doc: add comment about the fix made --- ddtrace/opentracer/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ddtrace/opentracer/utils.py b/ddtrace/opentracer/utils.py index 51cf2ddd618..b2309d52a3b 100644 --- a/ddtrace/opentracer/utils.py +++ b/ddtrace/opentracer/utils.py @@ -1,3 +1,5 @@ +# 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