Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Don't accept opentracing data from clients. #5715

Merged
merged 2 commits into from
Jul 19, 2019
Merged

Don't accept opentracing data from clients. #5715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca68b7
Don't accept opentracing data from clients.
JorikSchellekens Jul 18, 2019
bac546b
newsfile
JorikSchellekens Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5715.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Don't accept opentracing data from clients.
3 changes: 1 addition & 2 deletions synapse/logging/opentracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down