linting

Author: mabdinur

ddtrace/_trace/provider.py

@@ -35,7 +35,7 @@ def _has_active_context(self) -> bool:
         pass
 
     @abc.abstractmethod
-    def activate(self, ctx: Optional[ActiveTrace]) -> None:
+    def activate(self, ctx: Optional[ActiveTrace]):
         core.dispatch("ddtrace.context_provider.activate", (ctx,))
 
     @abc.abstractmethod

ddtrace/internal/ci_visibility/context.py

@@ -33,14 +33,18 @@ def _has_active_context(self):
         ctx = _DD_CI_CONTEXTVAR.get()
         return ctx is not None
 
-    def activate(self, ctx: ContextTypeValue) -> None:
+    def activate(self, ctx: ContextTypeValue) -> contextvars.Token:
         """Makes the given context active in the current execution."""
-        _DD_CI_CONTEXTVAR.set(ctx)
+        token = _DD_CI_CONTEXTVAR.set(ctx)
         super(DefaultContextProvider, self).activate(ctx)
+        return token
 
     def active(self) -> ContextTypeValue:
         """Returns the active span or context for the current execution."""
         item = _DD_CI_CONTEXTVAR.get()
         if isinstance(item, Span):
             return self._update_active(item)
         return item
+
+    def _deactivate(self, token: contextvars.Token) -> None:
+        _DD_CI_CONTEXTVAR.reset(token)

ddtrace/internal/opentelemetry/context.py

@@ -91,12 +91,18 @@ def detach(self, token):
         """
         Resets the datadog contextvar to the previous active context.
         """
-        self._ddcontext_provider._deactivate(token)
+        if hasattr(self._ddcontext_provider, "_deactivate"):
+            self._ddcontext_provider._deactivate(token)
+        else:
+            log.debug(
+                "Context provider does not support deactivation. " "Active Context: %s, Token: %s",
+                self._ddcontext_provider.active(),
+                token,
+            )
 
     @property
     def _ddcontext_provider(self):
         """
         Get the ddtrace context provider from the global Datadog tracer.
-        This can reterive a default, gevent, or asyncio context provider.
         """
         return ddtracer.context_provider

ddtrace/llmobs/_context.py

@@ -47,14 +47,18 @@ def _update_active(self, span: Span) -> Optional[Span]:
         self.activate(None)
         return None
 
-    def activate(self, ctx: ContextTypeValue) -> None:
+    def activate(self, ctx: ContextTypeValue) -> contextvars.Token:
         """Makes the given context active in the current execution."""
-        _DD_LLMOBS_CONTEXTVAR.set(ctx)
+        token = _DD_LLMOBS_CONTEXTVAR.set(ctx)
         super(DefaultContextProvider, self).activate(ctx)
+        return token
 
     def active(self) -> ContextTypeValue:
         """Returns the active span or context for the current execution."""
         item = _DD_LLMOBS_CONTEXTVAR.get()
         if isinstance(item, Span):
             return self._update_active(item)
         return item
+
+    def _deactivate(self, token: contextvars.Token) -> None:
+        _DD_LLMOBS_CONTEXTVAR.reset(token)