summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorJorik Schellekens <joriksch@gmail.com>2019-08-22 18:08:07 +0100
committerGitHub <noreply@github.com>2019-08-22 18:08:07 +0100
commit812ed6b0d5b2c682d8032fc83e3041a9da93f670 (patch)
tree86017ab212eebc5d61fa7eb2a8d606e729c83f50 /synapse/http
parentRevert "Do not send consent notices if "no-consent-required" is set" (diff)
downloadsynapse-812ed6b0d5b2c682d8032fc83e3041a9da93f670.tar.xz
Opentracing across workers (#5771)
Propagate opentracing contexts across workers


Also includes some Convenience modifications to opentracing for servlets, notably:
- Add boolean to skip the whitelisting check on inject
  extract methods. - useful when injecting into carriers
  locally. Otherwise we'd always have to include our
  own servername and whitelist our servername
- start_active_span_from_request instead of header
- Add boolean to decide whether to extract context
  from a request to a servlet
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/servlet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py
index fd07bf7b8e..c186b31f59 100644
--- a/synapse/http/servlet.py
+++ b/synapse/http/servlet.py
@@ -300,7 +300,7 @@ class RestServlet(object):
                     http_server.register_paths(
                         method,
                         patterns,
-                        trace_servlet(servlet_classname, method_handler),
+                        trace_servlet(servlet_classname)(method_handler),
                         servlet_classname,
                     )