diff options
| author | Jorik Schellekens <joriksch@gmail.com> | 2019-07-19 16:29:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 16:29:57 +0100 |
| commit | 7b8bc618340598623555782c34af862ace5012c3 (patch) | |
| tree | fd874ae170e9350d9159695fc477fb1310ca9ae1 | |
| parent | Add 'rel' attribute to default welcome page. (#5695) (diff) | |
| download | synapse-7b8bc618340598623555782c34af862ace5012c3.tar.xz | |
Don't accept opentracing data from clients. (#5715)
* Don't accept opentracing data from clients. * newsfile
| -rw-r--r-- | changelog.d/5715.misc | 1 | ||||
| -rw-r--r-- | synapse/logging/opentracing.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changelog.d/5715.misc b/changelog.d/5715.misc new file mode 100644 index 0000000000..a77366e0c0 --- /dev/null +++ b/changelog.d/5715.misc @@ -0,0 +1 @@ +Don't accept opentracing data from clients. 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(), |