diff options
Diffstat (limited to 'synapse/storage/end_to_end_keys.py')
| -rw-r--r-- | synapse/storage/end_to_end_keys.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index 38db90c47e..92d191958d 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -115,7 +115,6 @@ class EndToEndKeyWorkerStore(SQLBaseStore): opentracing.log_kv(result) return result - @opentracing.trace_defered_function @defer.inlineCallbacks def get_e2e_one_time_keys(self, user_id, device_id, key_ids): """Retrieve a number of one-time keys for a user @@ -131,10 +130,6 @@ class EndToEndKeyWorkerStore(SQLBaseStore): key_id) to json string for key """ - opentracing.set_tag("user_id", user_id) - opentracing.set_tag("device_id", device_id) - opentracing.set_tag("key_ids", key_ids) - rows = yield self._simple_select_many_batch( table="e2e_one_time_keys_json", column="key_id", @@ -143,10 +138,11 @@ class EndToEndKeyWorkerStore(SQLBaseStore): keyvalues={"user_id": user_id, "device_id": device_id}, desc="add_e2e_one_time_keys_check", ) - - defer.returnValue( - {(row["algorithm"], row["key_id"]): row["key_json"] for row in rows} + result = {(row["algorithm"], row["key_id"]): row["key_json"] for row in rows} + opentracing.log_kv( + {"message": "Fetched one time keys for user", "one_time_keys": result} ) + defer.returnValue(result) @defer.inlineCallbacks def add_e2e_one_time_keys(self, user_id, device_id, time_now, new_keys): @@ -161,7 +157,6 @@ class EndToEndKeyWorkerStore(SQLBaseStore): (algorithm, key_id, key json) """ - @opentracing.trace_function def _add_e2e_one_time_keys(txn): opentracing.set_tag("user_id", user_id) opentracing.set_tag("device_id", device_id) @@ -221,7 +216,6 @@ class EndToEndKeyStore(EndToEndKeyWorkerStore, SQLBaseStore): or the keys were already in the database. """ - @opentracing.trace_function def _set_e2e_device_keys_txn(txn): opentracing.set_tag("user_id", user_id) opentracing.set_tag("device_id", device_id) @@ -241,7 +235,7 @@ class EndToEndKeyStore(EndToEndKeyWorkerStore, SQLBaseStore): new_key_json = encode_canonical_json(device_keys).decode("utf-8") if old_key_json == new_key_json: - opentracing.log_kv({"event", "key already stored"}) + opentracing.log_kv({"Message", "Device key already stored."}) return False self._simple_upsert_txn( @@ -250,7 +244,7 @@ class EndToEndKeyStore(EndToEndKeyWorkerStore, SQLBaseStore): keyvalues={"user_id": user_id, "device_id": device_id}, values={"ts_added_ms": time_now, "key_json": new_key_json}, ) - + opentracing.log_kv({"message": "Device keys stored."}) return True return self.runInteraction("set_e2e_device_keys", _set_e2e_device_keys_txn) |