2 files changed, 7 insertions, 3 deletions
diff --git a/changelog.d/12554.bugfix b/changelog.d/12554.bugfix
new file mode 100644
index 0000000000..48c1146db5
--- /dev/null
+++ b/changelog.d/12554.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse 1.58.0rc1 where the main process could consume excessive amounts of CPU and memory handling sentry logging failures.
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 3c0fc756d4..319836da2b 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -683,9 +683,12 @@ class DeviceHandler(DeviceWorkerHandler):
                             self.federation_sender.send_device_messages(
                                 host, immediate=False
                             )
-                            log_kv(
-                                {"message": "sent device update to host", "host": host}
-                            )
+                            # TODO: when called, this isn't in a logging context.
+                            # This leads to log spam, sentry event spam, and massive
+                            # memory usage. See #12552.
+                            # log_kv(
+                            #     {"message": "sent device update to host", "host": host}
+                            # )
 
                     if current_stream_id != stream_id:
                         # Clear the set of hosts we've already sent to as we're