From 37a650c27060d24e8ea6a3423b0c89d765f82c30 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Wed, 26 Jun 2019 11:18:48 +0100
Subject: [PATCH] Inclue worker name in service_name

---
 synapse/config/tracer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synapse/config/tracer.py b/synapse/config/tracer.py
index 3c14196b92..cc22e68dea 100644
--- a/synapse/config/tracer.py
+++ b/synapse/config/tracer.py
@@ -66,13 +66,15 @@ def init_tracing(config):
         name to the homeserver's.
     """
 
+    name = config.worker_name if config.worker_name else "master"
+
     if config.tracer_config.get("tracer_enabled", False):
         TracerUtil.set_homeserver_whitelist(
             config.tracer_config["homeserver_whitelist"]
         )
         jaeger_config = JaegerConfig(
             config={"sampler": {"type": "const", "param": 1}, "logging": True},
-            service_name=config.server_name,
+            service_name="{} {}".format(config.server_name, name),
             scope_manager=LogContextScopeManager(config),
         )
     else:  # The tracer is not configured so we instantiate a noop tracer