summary refs log tree commit diff
path: root/synapse/logging/opentracing.py
diff options
context:
space:
mode:
authorJorik Schellekens <joriksch@gmail.com>2019-07-19 16:29:57 +0100
committerGitHub <noreply@github.com>2019-07-19 16:29:57 +0100
commit7b8bc618340598623555782c34af862ace5012c3 (patch)
treefd874ae170e9350d9159695fc477fb1310ca9ae1 /synapse/logging/opentracing.py
parentAdd 'rel' attribute to default welcome page. (#5695) (diff)
downloadsynapse-7b8bc618340598623555782c34af862ace5012c3.tar.xz
Don't accept opentracing data from clients. (#5715)
* Don't accept opentracing data from clients.

* newsfile
Diffstat (limited to 'synapse/logging/opentracing.py')
-rw-r--r--synapse/logging/opentracing.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py
index 415040f5ee..56d900080b 100644
--- a/synapse/logging/opentracing.py
+++ b/synapse/logging/opentracing.py
@@ -340,8 +340,7 @@ def trace_servlet(servlet_name, func):
     @wraps(func)
     @defer.inlineCallbacks
     def _trace_servlet_inner(request, *args, **kwargs):
-        with start_active_span_from_context(
-            request.requestHeaders,
+        with start_active_span(
             "incoming-client-request",
             tags={
                 "request_id": request.get_request_id(),