summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-06-18 11:43:22 +0100
committerGitHub <noreply@github.com>2021-06-18 11:43:22 +0100
commit91fa9cca99f7cd1ba96baaf3f2c1b5c045dd1a7c (patch)
tree53f8813d658832eac092acec56d431d27fe91c5c /synapse/federation/transport/server.py
parentRemove support for ACME v1 (#10194) (diff)
downloadsynapse-91fa9cca99f7cd1ba96baaf3f2c1b5c045dd1a7c.tar.xz
Expose opentracing trace id in response headers (#10199)
Fixes: #9480
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 16d740cf58..bed47f8abd 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -35,6 +35,7 @@ from synapse.http.servlet import (
     parse_string_from_args,
     parse_strings_from_args,
 )
+from synapse.logging import opentracing
 from synapse.logging.context import run_in_background
 from synapse.logging.opentracing import (
     SynapseTags,
@@ -345,6 +346,8 @@ class BaseFederationServlet:
                 )
 
             with scope:
+                opentracing.inject_response_headers(request.responseHeaders)
+
                 if origin and self.RATELIMIT:
                     with ratelimiter.ratelimit(origin) as d:
                         await d