From 0e8c35c8e8cda4fdcd370edbe4d9da220df60547 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Mon, 15 Jul 2019 15:23:33 +0100
Subject: [PATCH] A little extra device_list tracing

---
 synapse/handlers/device.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 9bd42ed819..878296da78 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -597,16 +597,25 @@ class DeviceListEduUpdater(object):
                     # eventually become consistent.
                     return
                 except FederationDeniedError as e:
+                    opentracing.set_tag("error", True)
+                    opentracing.log_kv({"reason": "FederationDeniedError"})
                     logger.info(e)
                     return
-                except Exception:
+                except Exception as e:
                     # TODO: Remember that we are now out of sync and try again
                     # later
+                    opentracing.set_tag("error", True)
+                    opentracing.log_kv(
+                        {
+                            "message": "Exception raised by federation request",
+                            "exception": e,
+                        }
+                    )
                     logger.exception(
                         "Failed to handle device list update for %s", user_id
                     )
                     return
-
+                opentracing.log_kv({"result": result})
                 stream_id = result["stream_id"]
                 devices = result["devices"]