add monthly active users to phonehome stats (#5252)

* add monthly active users to phonehome stats

changelog.d/5252.feature

@@ -0,0 +1 @@
+Add monthly active users to phonehome stats.

synapse/app/homeserver.py

@@ -541,6 +541,7 @@ def run(hs):
         stats["total_room_count"] = room_count
 
         stats["daily_active_users"] = yield hs.get_datastore().count_daily_users()
+        stats["monthly_active_users"] = yield hs.get_datastore().count_monthly_users()
         stats["daily_active_rooms"] = yield hs.get_datastore().count_daily_active_rooms()
         stats["daily_messages"] = yield hs.get_datastore().count_daily_messages()
 

synapse/storage/__init__.py

@@ -279,10 +279,27 @@ class DataStore(
         """
         Counts the number of users who used this homeserver in the last 24 hours.
         """
-
-        def _count_users(txn):
         yesterday = int(self._clock.time_msec()) - (1000 * 60 * 60 * 24)
+        return self.runInteraction("count_daily_users", self._count_users, yesterday,)
 
+    def count_monthly_users(self):
+        """
+        Counts the number of users who used this homeserver in the last 30 days.
+        Note this method is intended for phonehome metrics only and is different
+        from the mau figure in synapse.storage.monthly_active_users which,
+        amongst other things, includes a 3 day grace period before a user counts.
+        """
+        thirty_days_ago = int(self._clock.time_msec()) - (1000 * 60 * 60 * 24 * 30)
+        return self.runInteraction(
+            "count_monthly_users",
+            self._count_users,
+            thirty_days_ago,
+        )
+
+    def _count_users(self, txn, time_from):
+        """
+        Returns number of users seen in the past time_from period
+        """
         sql = """
             SELECT COALESCE(count(*), 0) FROM (
                 SELECT user_id FROM user_ips
@@ -290,13 +307,10 @@ class DataStore(
                 GROUP BY user_id
             ) u
         """
-
-            txn.execute(sql, (yesterday,))
+        txn.execute(sql, (time_from,))
         count, = txn.fetchone()
         return count
 
-        return self.runInteraction("count_users", _count_users)
-
     def count_r30_users(self):
         """
         Counts the number of 30 day retained users, defined as:-