opentracing: use a consistent name for background processes

changelog.d/10135.misc

@@ -0,0 +1 @@
+OpenTracing: use a consistent name for background processes.

synapse/logging/opentracing.py

@@ -337,6 +337,7 @@ def ensure_active_span_inner_2(*args, **kwargs):
 @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
 
 

synapse/metrics/background_process_metrics.py

@@ -204,11 +204,12 @@ async def run():
 
         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: