From 7d9c3d341fc4f8ff8ee1825645de9d5432a15a14 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Mon, 24 Jun 2019 16:13:46 +0100
Subject: [PATCH] Disable tracer if not configured

---
 synapse/config/tracer.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/synapse/config/tracer.py b/synapse/config/tracer.py
index fc6227ad19..388dbfa136 100644
--- a/synapse/config/tracer.py
+++ b/synapse/config/tracer.py
@@ -65,16 +65,26 @@ def init_tracing(config):
         name to the homeserver's.
     """
 
-    jaeger_config = JaegerConfig(
-        config={ 
-            'sampler': {
-                'type': 'const',
-                'param': 1,
+    if config.tracer_config.get("tracer_enabled", False):
+        jaeger_config = JaegerConfig(
+            config={ 
+                'sampler': {
+                    'type': 'const',
+                    'param': 1,
+                },
+                'logging': True,
             },
-            'logging': True,
-        },
-        service_name=config.server_name + "_new",
-        scope_manager=LogContextScopeManager(config),
-    )
+            service_name=config.server_name + "_new",
+            scope_manager=LogContextScopeManager(config),
+        )
+    else: # The tracer is not configured so we instantiate a noop tracer
+        jaeger_config = JaegerConfig(
+            config={
+                'sampler': {
+                    'type': 'const',
+                    'param': 0,
+                }
+            }
+        )
 
     return jaeger_config.initialize_tracer()
\ No newline at end of file