diff options
| author | Jorik Schellekens <joriksch@gmail.com> | 2019-09-05 14:22:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 14:22:15 +0100 |
| commit | b9cfd3c375c551902093b0dac1df9e0b4d6759cc (patch) | |
| tree | 3079f91034b5a27f2af1b8b500efb7d968b1da1a | |
| parent | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) (diff) | |
| download | synapse-b9cfd3c375c551902093b0dac1df9e0b4d6759cc.tar.xz | |
Fix opentracing contexts missing from outbound replication requests (#5982)
| -rw-r--r-- | changelog.d/5982.bugfix | 1 | ||||
| -rw-r--r-- | synapse/logging/opentracing.py | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/changelog.d/5982.bugfix b/changelog.d/5982.bugfix new file mode 100644 index 0000000000..3ea281a3a0 --- /dev/null +++ b/changelog.d/5982.bugfix @@ -0,0 +1 @@ +Include missing opentracing contexts in outbout replication requests. diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index 256b972aaa..dbf80e2024 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -493,6 +493,11 @@ def inject_active_span_twisted_headers(headers, destination, check_destination=T Args: headers (twisted.web.http_headers.Headers) + destination (str): address of entity receiving the span context. If check_destination + is true the context will only be injected if the destination matches the + opentracing whitelist + check_destination (bool): If false, destination will be ignored and the context + will always be injected. span (opentracing.Span) Returns: @@ -525,6 +530,11 @@ def inject_active_span_byte_dict(headers, destination, check_destination=True): Args: headers (dict) + destination (str): address of entity receiving the span context. If check_destination + is true the context will only be injected if the destination matches the + opentracing whitelist + check_destination (bool): If false, destination will be ignored and the context + will always be injected. span (opentracing.Span) Returns: @@ -537,7 +547,7 @@ def inject_active_span_byte_dict(headers, destination, check_destination=True): here: https://github.com/jaegertracing/jaeger-client-python/blob/master/jaeger_client/constants.py """ - if not whitelisted_homeserver(destination): + if check_destination and not whitelisted_homeserver(destination): return span = opentracing.tracer.active_span @@ -556,9 +566,11 @@ def inject_active_span_text_map(carrier, destination, check_destination=True): Args: carrier (dict) - destination (str): the name of the remote server. The span context - will only be injected if the destination matches the homeserver_whitelist - or destination is None. + destination (str): address of entity receiving the span context. If check_destination + is true the context will only be injected if the destination matches the + opentracing whitelist + check_destination (bool): If false, destination will be ignored and the context + will always be injected. Returns: In-place modification of carrier |