diff options
| author | Jorik Schellekens <joriks@matrix.org> | 2019-09-05 17:10:10 +0100 |
|---|---|---|
| committer | Jorik Schellekens <joriks@matrix.org> | 2019-09-05 17:10:10 +0100 |
| commit | ba95fe64fafff8705e977a17319851773b5fa41e (patch) | |
| tree | 54c916363c38e089431ca60c8bd7a875dc38ae48 /synapse/replication/http | |
| parent | Nicer replication send trace name (diff) | |
| parent | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... (diff) | |
| download | synapse-joriks/opentracing_trace_sendtime.tar.xz | |
Merge remote-tracking branch 'origin/develop' into joriks/opentracing_trace_sendtime github/joriks/opentracing_trace_sendtime joriks/opentracing_trace_sendtime
Diffstat (limited to 'synapse/replication/http')
| -rw-r--r-- | synapse/replication/http/_base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py index 64f012f5b8..03560c1f0e 100644 --- a/synapse/replication/http/_base.py +++ b/synapse/replication/http/_base.py @@ -213,11 +213,11 @@ class ReplicationEndpoint(object): args = "/".join("(?P<%s>[^/]+)" % (arg,) for arg in url_args) pattern = re.compile("^/_synapse/replication/%s/%s$" % (self.NAME, args)) + handler = trace_servlet(self.__class__.__name__, extract_context=True)(handler) + # We don't let register paths trace this servlet using the default tracing + # options because we wish to extract the context explicitly. http_server.register_paths( - method, - [pattern], - trace_servlet(self.__class__.__name__, extract_context=True)(handler), - self.__class__.__name__, + method, [pattern], handler, self.__class__.__name__, trace=False ) def _cached_handler(self, request, txn_id, **kwargs): |