From 4241a106739b91092bf39cdc407c0971c256390c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 15 Jun 2020 16:42:21 +0100
Subject: [PATCH] Fix "There was no active span when trying to log." error
 (#7698)

---
 changelog.d/7698.bugfix    | 1 +
 synapse/handlers/device.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/7698.bugfix

diff --git a/changelog.d/7698.bugfix b/changelog.d/7698.bugfix
new file mode 100644
index 000000000..32de7459e
--- /dev/null
+++ b/changelog.d/7698.bugfix
@@ -0,0 +1 @@
+Fix logged error during device resync in opentracing. Broke in v1.14.0.
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 83f8fa118..31346b56c 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -691,6 +691,7 @@ class DeviceListUpdater(object):
 
         return False
 
+    @trace
     @defer.inlineCallbacks
     def _maybe_retry_device_resync(self):
         """Retry to resync device lists that are out of sync, except if another retry is