matrix-org · erikjohnston · Aug 23, 2023 · Aug 16, 2023 · Aug 16, 2023 · Aug 20, 2023
@@ -0,0 +1 @@
+Filter out user agent references to the sliding sync proxy and rust-sdk from the user_daily_visits table to ensure that Element X can be represented fully.
diff --git a/synapse/storage/databases/main/metrics.py b/synapse/storage/databases/main/metrics.py
@@ -411,7 +411,10 @@ def _generate_user_daily_visits(txn: LoggingTransaction) -> None:
                     ON u.user_id = udv.user_id AND u.device_id=udv.device_id
                     INNER JOIN users ON users.name=u.user_id
                     WHERE ? <= last_seen AND last_seen < ?
-                    AND udv.timestamp IS NULL AND users.is_guest=0
+                    AND udv.timestamp IS NULL
+                    AND u.user_agent !='sync-v3-proxy-'
+                    AND u.user_agent !='matrix-rust-sdk'
+                    AND users.is_guest=0
 async def insert_client_ip( 
     self, 
     user_id: str, 
     access_token: str, 
     ip: str, 
     user_agent: str, 
     device_id: Optional[str], 
     now: Optional[int] = None, 
 ) -> None: 
     if not now: 
         now = int(self._clock.time_msec()) 
     key = (user_id, access_token, ip) 
     try: 
         last_seen = self.client_ip_last_seen.get(key) 
     except KeyError: 
         last_seen = None 
     # Rate-limited inserts 
     if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY: 
         return 
     self.client_ip_last_seen.set(key, now) 
     if self._update_on_this_worker: 
         await self.populate_monthly_active_users(user_id) 
         self._batch_row_update[key] = (user_agent, device_id, now) 
     else: 
         # We are not the designated writer-worker, so stream over replication 
         self.hs.get_replication_command_handler().send_user_ip( 
             user_id, access_token, ip, user_agent, device_id, now 
         ) 
 async def insert_client_ip( 
     self, 
     user_id: str, 
     access_token: str, 
     ip: str, 
     user_agent: str, 
     device_id: Optional[str], 
     now: Optional[int] = None, 
 ) -> None: 
     if not now: 
         now = int(self._clock.time_msec()) 
     key = (user_id, access_token, ip) 
  
     try: 
         last_seen = self.client_ip_last_seen.get(key) 
     except KeyError: 
         last_seen = None 
  
     # Rate-limited inserts 
     if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY: 
         return 
  
     self.client_ip_last_seen.set(key, now) 
  
     if self._update_on_this_worker: 
         await self.populate_monthly_active_users(user_id) 
         self._batch_row_update[key] = (user_agent, device_id, now) 
     else: 
         # We are not the designated writer-worker, so stream over replication 
         self.hs.get_replication_command_handler().send_user_ip( 
             user_id, access_token, ip, user_agent, device_id, now 
         ) 
                     AND users.appservice_id IS NULL
                     GROUP BY u.user_id, u.device_id
             """
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Filter out user agent references to the sliding sync proxy and rust-sdk from the user_daily_visits table to ensure that Element X can be represented fully.