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/http/matrixfederationclient.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/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 1998990a14..629373fc47 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -65,13 +65,9 @@ from synapse.http.client import ( read_body_with_max_size, ) from synapse.http.federation.matrix_federation_agent import MatrixFederationAgent +from synapse.logging import opentracing from synapse.logging.context import make_deferred_yieldable -from synapse.logging.opentracing import ( - inject_active_span_byte_dict, - set_tag, - start_active_span, - tags, -) +from synapse.logging.opentracing import set_tag, start_active_span, tags from synapse.types import ISynapseReactor, JsonDict from synapse.util import json_decoder from synapse.util.async_helpers import timeout_deferred @@ -497,7 +493,7 @@ class MatrixFederationHttpClient: # Inject the span into the headers headers_dict = {} # type: Dict[bytes, List[bytes]] - inject_active_span_byte_dict(headers_dict, request.destination) + opentracing.inject_header_dict(headers_dict, request.destination) headers_dict[b"User-Agent"] = [self.version_string_bytes] |