From 689b5ee72fe2ff6226c2afc5b209889f772f0819 Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Fri, 10 Mar 2023 12:27:08 +0100
Subject: [PATCH] Change default stats reporting endpoint (#3007)

It's the same instance we report to, only using the subdomain.
---
 dendrite-sample.yaml          | 2 +-
 setup/config/config_global.go | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dendrite-sample.yaml b/dendrite-sample.yaml
index 39be8d8b8..6b3ea74f2 100644
--- a/dendrite-sample.yaml
+++ b/dendrite-sample.yaml
@@ -95,7 +95,7 @@ global:
   # We use this information to understand how Dendrite is being used in the wild.
   report_stats:
     enabled: false
-    endpoint: https://matrix.org/report-usage-stats/push
+    endpoint: https://panopticon.matrix.org/push
 
   # Server notices allows server admins to send messages to all users on the server.
   server_notices:
diff --git a/setup/config/config_global.go b/setup/config/config_global.go
index ed980afaa..7d3ab6a40 100644
--- a/setup/config/config_global.go
+++ b/setup/config/config_global.go
@@ -319,10 +319,15 @@ type ReportStats struct {
 
 func (c *ReportStats) Defaults() {
 	c.Enabled = false
-	c.Endpoint = "https://matrix.org/report-usage-stats/push"
+	c.Endpoint = "https://panopticon.matrix.org/push"
 }
 
 func (c *ReportStats) Verify(configErrs *ConfigErrors) {
+	// We prefer to hit panopticon (https://github.com/matrix-org/panopticon) directly over
+	// the "old" matrix.org endpoint.
+	if c.Endpoint == "https://matrix.org/report-usage-stats/push" {
+		c.Endpoint = "https://panopticon.matrix.org/push"
+	}
 	if c.Enabled {
 		checkNotEmpty(configErrs, "global.report_stats.endpoint", c.Endpoint)
 	}