Skip to content
Snippets Groups Projects
Unverified Commit b2557cbf authored by Richard van der Hoff's avatar Richard van der Hoff Committed by GitHub
Browse files

opentracing: use a consistent name for background processes (#10135)

... otherwise we tend to get a namespace clash between the bg process and the
functions that it calls.
parent beb251e3
No related branches found
No related tags found
No related merge requests found
OpenTracing: use a consistent name for background processes.
......@@ -337,6 +337,7 @@ def ensure_active_span(message, ret=None):
@contextlib.contextmanager
def noop_context_manager(*args, **kwargs):
"""Does exactly what it says on the tin"""
# TODO: replace with contextlib.nullcontext once we drop support for Python 3.6
yield
......
......@@ -204,11 +204,12 @@ def run_as_background_process(desc: str, func, *args, bg_start_span=True, **kwar
with BackgroundProcessLoggingContext(desc, count) as context:
try:
ctx = noop_context_manager()
if bg_start_span:
ctx = start_active_span(
desc, tags={SynapseTags.REQUEST_ID: str(context)}
f"bgproc.{desc}", tags={SynapseTags.REQUEST_ID: str(context)}
)
else:
ctx = noop_context_manager()
with ctx:
return await maybe_awaitable(func(*args, **kwargs))
except Exception:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment