summary refs log tree commit diff
path: root/synapse/logging/opentracing.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-19 11:47:29 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-19 11:47:29 +0000
commit11d91ee1bcd26289f8df2c5d1fa56768e87d72c3 (patch)
treec12c8c07b94032187a47bc46331ffca1c89a42bb /synapse/logging/opentracing.py
parentAdd 'rel' attribute to default welcome page. (#5695) (diff)
parentDon't accept opentracing data from clients. (#5715) (diff)
downloadsynapse-11d91ee1bcd26289f8df2c5d1fa56768e87d72c3.tar.xz
Don't accept opentracing data from clients. (#5715)
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(),