skip

Author: mabdinur

ddtrace/_trace/provider.py

@@ -57,6 +57,7 @@ class DefaultContextProvider(BaseContextProvider):
     """
 
     def __init__(self) -> None:
+        self._otel_enabled = False
         super(DefaultContextProvider, self).__init__()
 
     def _has_active_context(self) -> bool:
@@ -76,7 +77,7 @@ def active(self) -> Optional[ActiveTrace]:
 
         # PERF: type(item) is Span is about the same perf as isinstance(item, Span)
         #       when item is a Span, but slower when item is a Context
-        if type(item) is Span:
+        if type(item) is Span and not self._otel_enabled:
             return self._update_active(item)
         return item
 

ddtrace/internal/opentelemetry/context.py

@@ -14,6 +14,8 @@ class DDRuntimeContext:
     Responsible for converting between OpenTelemetry and Datadog spans. This class is loaded by entrypoint
     when `opentelemetry.context` is imported.
     """
+    def __init__(self):
+        self._ddcontext_provider._otel_enabled = True
 
     def attach(self, otel_context):
         """