summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-02 14:36:05 -0500
committerEric Eastwood <erice@element.io>2022-08-02 14:36:05 -0500
commitba4a46a7fb2cd81ae712da5c406c9c82b8dd7352 (patch)
tree1313ed05c7b8172230a10284763f784e7dcf3b2a
parentAdd changelog (diff)
downloadsynapse-ba4a46a7fb2cd81ae712da5c406c9c82b8dd7352.tar.xz
Seems to (see test_side_by_side_spans)
-rw-r--r--synapse/federation/transport/server/_base.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/federation/transport/server/_base.py b/synapse/federation/transport/server/_base.py

index c9b46111fe..9425106a3f 100644 --- a/synapse/federation/transport/server/_base.py +++ b/synapse/federation/transport/server/_base.py
@@ -357,7 +357,6 @@ class BaseFederationServlet: remote_parent_span_cm = use_span(remote_parent_span, end_on_exit=True) - # TODO: Make sure this works (traces as expected) with remote_parent_span_cm, local_parent_span_cm: if origin and self.RATELIMIT: with ratelimiter.ratelimit(origin) as d: