diff options
| author | Jorik Schellekens <joriks@matrix.org> | 2019-06-28 17:09:25 +0100 |
|---|---|---|
| committer | Jorik Schellekens <joriks@matrix.org> | 2019-07-23 15:59:23 +0100 |
| commit | d876cda7253cbf05deb0f0c8a3baab68f0c19f20 (patch) | |
| tree | 07c981dc32d21762fc919df0e214598ccfa40cf0 | |
| parent | Fix e2e bugs (diff) | |
| download | synapse-d876cda7253cbf05deb0f0c8a3baab68f0c19f20.tar.xz | |
Trace more e2e stuff and less e2e stuff
| -rw-r--r-- | synapse/handlers/e2e_room_keys.py | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/room_keys.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py index 06837bb126..07724d1c4a 100644 --- a/synapse/handlers/e2e_room_keys.py +++ b/synapse/handlers/e2e_room_keys.py @@ -271,7 +271,6 @@ class E2eRoomKeysHandler(object): ) return new_version - @trace_defered_function @defer.inlineCallbacks def get_version_info(self, user_id, version=None): """Get the info about a given version of the user's backup diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py index 10dec96208..34ab74d3a4 100644 --- a/synapse/rest/client/v2_alpha/room_keys.py +++ b/synapse/rest/client/v2_alpha/room_keys.py @@ -23,6 +23,10 @@ from synapse.http.servlet import ( parse_json_object_from_request, parse_string, ) +from synapse.util.tracerutils import ( + TracerUtil, + trace_defered_function_using_operation_name, +) from ._base import client_patterns @@ -311,6 +315,7 @@ class RoomKeysVersionServlet(RestServlet): self.auth = hs.get_auth() self.e2e_room_keys_handler = hs.get_e2e_room_keys_handler() + @trace_defered_function_using_operation_name("get_room_keys_version") @defer.inlineCallbacks def on_GET(self, request, version): """ |