From e7b70e272f4c07dc61733cb40b997f837f0ea50e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 26 Nov 2018 23:53:35 +0000
Subject: [PATCH] Fix jaeger over federation

---
 synapse/federation/transport/server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 9f1a3ee538..6af0832511 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -257,8 +257,8 @@ class BaseFederationServlet(object):
             """
             try:
                 carrier = {}
-                for key, value in six.iteritems(request.headers):
-                    carrier[key] = value
+                for key, value in request.requestHeaders.getAllRawHeaders():
+                    carrier[key.decode("ascii")] = value[0].decode("ascii")
                 parent_ctx = self.tracer.extract(
                     format=opentracing.Format.HTTP_HEADERS, carrier=carrier
                 )