diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index c83df02a70..4ac9ae4f9d 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -520,6 +520,7 @@ class FederationServer(FederationBase):
     def on_query_user_devices(self, origin, user_id):
         return self.on_query_request("user_devices", user_id)
 
+    @opentracing.trace_defered_function
     @defer.inlineCallbacks
     @log_function
     def on_claim_client_keys(self, origin, content):
@@ -528,6 +529,9 @@ class FederationServer(FederationBase):
             for device_id, algorithm in device_keys.items():
                 query.append((user_id, device_id, algorithm))
 
+        opentracing.log_kv(
+            {"message": "Claiming one time keys.", "user, device pairs": query}
+        )
         results = yield self.store.claim_e2e_one_time_keys(query)
 
         json_result = {}
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py
index 92d191958d..46c915d36e 100644
--- a/synapse/storage/end_to_end_keys.py
+++ b/synapse/storage/end_to_end_keys.py
@@ -275,7 +275,9 @@ class EndToEndKeyStore(EndToEndKeyWorkerStore, SQLBaseStore):
             )
             for user_id, device_id, algorithm, key_id in delete:
                 opentracing.log_kv(
-                    {"message": "executing claim transaction on database"}
+                    {
+                        "message": "Executing claim e2e_one_time_keys transaction on database."
+                    }
                 )
                 txn.execute(sql, (user_id, device_id, algorithm, key_id))
                 opentracing.log_kv(