From 734cee8df907de0f2f393f21d39268ca1a3fb919 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 26 Apr 2022 15:22:27 +0100
Subject: [PATCH 1/2] Fix sending opentracing contexts to remote servers

This was broken by #12365
---
 synapse/storage/databases/main/devices.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py
index 318e4df376b2..59d223a9008c 100644
--- 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

From b9c64906d7d4675b5ffa89f6cb88546ee6238c6a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 26 Apr 2022 15:23:53 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/12555.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12555.bugfix

diff --git a/changelog.d/12555.bugfix b/changelog.d/12555.bugfix
new file mode 100644
index 000000000000..3c721da1ee4e
--- /dev/null
+++ 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.