summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-11-26 23:53:35 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-02-13 15:16:03 +0000
commite7b70e272f4c07dc61733cb40b997f837f0ea50e (patch)
treef8d4222fdd4f0a681f7e9d14eced26c31f498070
parentadd basic jaeger support (diff)
downloadsynapse-e7b70e272f4c07dc61733cb40b997f837f0ea50e.tar.xz
Fix jaeger over federation
-rw-r--r--synapse/federation/transport/server.py4
1 files 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
                 )