diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-01 17:38:07 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-01 17:38:07 -0500 |
| commit | 8e902b858d2618c06279178c9e592aa22535d721 (patch) | |
| tree | 7a35efead0cbc9ae8d4c56ab4177f688f9961c34 | |
| parent | Implement start_active_span_from_edu for OTEL (diff) | |
| download | synapse-8e902b858d2618c06279178c9e592aa22535d721.tar.xz | |
Remove what's left of scopemanager
| -rw-r--r-- | synapse/logging/context.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/synapse/logging/context.py b/synapse/logging/context.py index ed10a4674e..6dd1fa525c 100644 --- a/synapse/logging/context.py +++ b/synapse/logging/context.py @@ -46,7 +46,6 @@ from twisted.internet import defer, threads from twisted.python.threadpool import ThreadPool if TYPE_CHECKING: - from synapse.logging.scopecontextmanager import _LogContextScope from synapse.types import ISynapseReactor logger = logging.getLogger(__name__) @@ -221,14 +220,13 @@ LoggingContextOrSentinel = Union["LoggingContext", "_Sentinel"] class _Sentinel: """Sentinel to represent the root context""" - __slots__ = ["previous_context", "finished", "request", "scope", "tag"] + __slots__ = ["previous_context", "finished", "request", "tag"] def __init__(self) -> None: # Minimal set for compatibility with LoggingContext self.previous_context = None self.finished = False self.request = None - self.scope = None self.tag = None def __str__(self) -> str: @@ -281,7 +279,6 @@ class LoggingContext: "finished", "request", "tag", - "scope", ] def __init__( @@ -302,7 +299,6 @@ class LoggingContext: self.main_thread = get_thread_id() self.request = None self.tag = "" - self.scope: Optional["_LogContextScope"] = None # keep track of whether we have hit the __exit__ block for this context # (suggesting that the the thing that created the context thinks it should @@ -315,9 +311,6 @@ class LoggingContext: # we track the current request_id self.request = self.parent_context.request - # we also track the current scope: - self.scope = self.parent_context.scope - if request is not None: # the request param overrides the request from the parent context self.request = request |