Onyl clear logcontext if spans should finish

2025-10-01 17:23:01 -05:00
parent 70d0fd310a
commit 4e06a504c4
1 changed files with 3 additions and 1 deletions
--- a/synapse/logging/scopecontextmanager.py
+++ b/synapse/logging/scopecontextmanager.py
@@ -155,7 +155,9 @@ class _LogContextScope(Scope):
        if self._finish_on_close:
            self.span.finish()

-        self.logcontext.scope = None
+            # The tracing scope/span should stick to the logcontext if it's active
+            # so we only clear if we're finishing the span.
+            self.logcontext.scope = None

        if self._enter_logcontext:
            self.logcontext.__exit__(None, None, None)