Handle TypeError from opentelemetry.context.contextvars_context in de…

…tach
hyoinandout · Aug 29, 2024 · 1dadd33 · 1dadd33
1 parent 889f7df
commit 1dadd33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py
@@ -152,6 +152,8 @@ def detach(token: object) -> None:
     """
     try:
         _RUNTIME_CONTEXT.detach(token)
+    except TypeError:
+        logger.exception("Expected an instance of Token, got None")
     except Exception:  # pylint: disable=broad-exception-caught
         logger.exception("Failed to detach context")
 

diff --git a/opentelemetry-api/src/opentelemetry/context/contextvars_context.py b/opentelemetry-api/src/opentelemetry/context/contextvars_context.py
@@ -47,7 +47,10 @@ def detach(self, token: object) -> None:
         Args:
             token: A reference to a previous Context.
         """
-        self._current_context.reset(token)  # type: ignore
+        try:
+            self._current_context.reset(token)
+        except TypeError:
+            raise TypeError
 
 
 __all__ = ["ContextVarsRuntimeContext"]