Fix sending opentracing contexts to remote servers (#12555)

matrix-org · Apr 26, 2022 · c48ab37 · c48ab37
1 parent ee1601e
commit c48ab37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/changelog.d/12555.bugfix b/changelog.d/12555.bugfix
@@ -0,0 +1 @@
+Fix sending opentracing contexts to whitelisted remote servers with device lists updates. Broken in v1.58.0rc1.
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py
@@ -1776,7 +1776,17 @@ async def get_uncoverted_outbound_room_pokes(
 
         def get_uncoverted_outbound_room_pokes_txn(txn):
             txn.execute(sql, (limit,))
-            return txn.fetchall()
+
+            return [
+                (
+                    user_id,
+                    device_id,
+                    room_id,
+                    stream_id,
+                    db_to_json(opentracing_context),
+                )
+                for user_id, device_id, room_id, stream_id, opentracing_context in txn
+            ]
 
         return await self.db_pool.runInteraction(
             "get_uncoverted_outbound_room_pokes", get_uncoverted_outbound_room_pokes_txn