diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-06-09 11:33:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 11:33:00 +0100 |
commit | 1bf83a191bc2b202db5c85eb972469cb27aefd09 (patch) | |
tree | 39182904b24227830e4f007a716ab472a4ee5fbe /synapse/replication/http/_base.py | |
parent | Add type hints to the federation server transport. (#10080) (diff) | |
download | synapse-1bf83a191bc2b202db5c85eb972469cb27aefd09.tar.xz |
Clean up the interface for injecting opentracing over HTTP (#10143)
* Remove unused helper functions * Clean up the interface for injecting opentracing over HTTP * changelog
Diffstat (limited to 'synapse/replication/http/_base.py')
-rw-r--r-- | synapse/replication/http/_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py index 5685cf2121..2a13026e9a 100644 --- a/synapse/replication/http/_base.py +++ b/synapse/replication/http/_base.py @@ -23,7 +23,8 @@ from prometheus_client import Counter, Gauge from synapse.api.errors import HttpResponseException, SynapseError from synapse.http import RequestTimedOutError -from synapse.logging.opentracing import inject_active_span_byte_dict, trace +from synapse.logging import opentracing +from synapse.logging.opentracing import trace from synapse.util.caches.response_cache import ResponseCache from synapse.util.stringutils import random_string @@ -235,7 +236,7 @@ class ReplicationEndpoint(metaclass=abc.ABCMeta): # Add an authorization header, if configured. if replication_secret: headers[b"Authorization"] = [b"Bearer " + replication_secret] - inject_active_span_byte_dict(headers, None, check_destination=False) + opentracing.inject_header_dict(headers, check_destination=False) try: result = await request_func(uri, data, headers=headers) break |