Skip to content

Commit 1dadd33

Browse files
committed
Handle TypeError from opentelemetry.context.contextvars_context in detach
1 parent 889f7df commit 1dadd33

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

opentelemetry-api/src/opentelemetry/context/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ def detach(token: object) -> None:
152152
"""
153153
try:
154154
_RUNTIME_CONTEXT.detach(token)
155+
except TypeError:
156+
logger.exception("Expected an instance of Token, got None")
155157
except Exception: # pylint: disable=broad-exception-caught
156158
logger.exception("Failed to detach context")
157159

opentelemetry-api/src/opentelemetry/context/contextvars_context.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ def detach(self, token: object) -> None:
4747
Args:
4848
token: A reference to a previous Context.
4949
"""
50-
self._current_context.reset(token) # type: ignore
50+
try:
51+
self._current_context.reset(token)
52+
except TypeError:
53+
raise TypeError
5154

5255

5356
__all__ = ["ContextVarsRuntimeContext"]

0 commit comments

Comments
 (0)