From 3d672fec51ac2606625e7fe1b5e8a6a9bde66734 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 20 Feb 2019 13:21:44 +0000
Subject: [PATCH 1/2] Fixup generated metrics config

---
 synapse/config/metrics.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py
index 35f107476..f7833053b 100644
--- a/synapse/config/metrics.py
+++ b/synapse/config/metrics.py
@@ -57,6 +57,8 @@ class MetricsConfig(Config):
         # through insecure notification channels if so configured.
         #sentry:
         #    dsn: "..."
+
+        # Whether or not to report anonymized homeserver usage statistics.
         """
 
         if report_stats is None:

From 633e5c933bb0234989302fcfcc2570c4cc76259e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 20 Feb 2019 13:41:43 +0000
Subject: [PATCH 2/2] Newsfile

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

diff --git a/changelog.d/4694.feature b/changelog.d/4694.feature
new file mode 100644
index 000000000..d053ab5a2
--- /dev/null
+++ b/changelog.d/4694.feature
@@ -0,0 +1 @@
+Add basic optional sentry integration