summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-06 09:53:37 +0100
committerErik Johnston <erik@matrix.org>2019-09-06 09:53:37 +0100
commit68f53b7a0e923593750e118dc9cb7842226a8b3c (patch)
treeca42cadddb70cf03448eee510eb555c5e05142da /synapse/http/matrixfederationclient.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentTrace how long it takes for the send trasaction to complete, including retrys... (diff)
downloadsynapse-68f53b7a0e923593750e118dc9cb7842226a8b3c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r--synapse/http/matrixfederationclient.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index 4326e98a28..3f7c93ffcb 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py
@@ -345,7 +345,6 @@ class MatrixFederationHttpClient(object): else: query_bytes = b"" - # Retreive current span scope = start_active_span( "outgoing-federation-request", tags={