From 3e5f4a40ded0b1b8c2da8dca9df4b03791f8f0c7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Wed, 17 Jul 2019 11:52:27 +0100
Subject: [PATCH] Unbreak json parsing.

---
 synapse/logging/opentracing.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py
index 4f85412631..3374c41591 100644
--- a/synapse/logging/opentracing.py
+++ b/synapse/logging/opentracing.py
@@ -391,13 +391,11 @@ def inject_active_span_text_map(carrier, destination=None):
 
 
 def active_span_context_as_string():
-    if not opentracing:
-        return None
-
     carrier = {}
-    opentracing.tracer.inject(
-        opentracing.tracer.active_span, opentracing.Format.TEXT_MAP, carrier
-    )
+    if opentracing:
+        opentracing.tracer.inject(
+            opentracing.tracer.active_span, opentracing.Format.TEXT_MAP, carrier
+        )
     return json.dumps(carrier)