diff options
| author | Erik Johnston <erik@matrix.org> | 2022-08-24 09:58:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 09:58:29 +0100 |
| commit | cbb157548676865793f39b4da0b7f3fa5ee01058 (patch) | |
| tree | 77ff41ddcb9b01938b4efdd109cf90981c86a23e /synapse/rest/client/keys.py | |
| parent | Newsfile (diff) | |
| parent | Instrument `_check_sigs_and_hash_and_fetch` to trace time spent in child conc... (diff) | |
| download | synapse-cbb157548676865793f39b4da0b7f3fa5ee01058.tar.xz | |
Merge branch 'develop' into erikj/less_state_membership github/erikj/less_state_membership erikj/less_state_membership
Diffstat (limited to 'synapse/rest/client/keys.py')
| -rw-r--r-- | synapse/rest/client/keys.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/rest/client/keys.py b/synapse/rest/client/keys.py index eb1b85721f..a395694fa5 100644 --- a/synapse/rest/client/keys.py +++ b/synapse/rest/client/keys.py @@ -26,7 +26,7 @@ from synapse.http.servlet import ( parse_string, ) from synapse.http.site import SynapseRequest -from synapse.logging.opentracing import log_kv, set_tag, trace_with_opname +from synapse.logging.opentracing import log_kv, set_tag from synapse.types import JsonDict, StreamToken from ._base import client_patterns, interactive_auth_handler @@ -71,7 +71,6 @@ class KeyUploadServlet(RestServlet): self.e2e_keys_handler = hs.get_e2e_keys_handler() self.device_handler = hs.get_device_handler() - @trace_with_opname("upload_keys") async def on_POST( self, request: SynapseRequest, device_id: Optional[str] ) -> Tuple[int, JsonDict]: @@ -208,7 +207,9 @@ class KeyChangesServlet(RestServlet): # We want to enforce they do pass us one, but we ignore it and return # changes after the "to" as well as before. - set_tag("to", parse_string(request, "to")) + # + # XXX This does not enforce that "to" is passed. + set_tag("to", str(parse_string(request, "to"))) from_token = await StreamToken.from_string(self.store, from_token_string) |