Fix prometheus metrics being negative (mixed up start/end)

MadLittleMods · MadLittleMods · commit f7ce80a885af · 2022-08-22T12:59:19.000-05:00
Fix: - #13535 (comment) - #13533 (comment)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -482,7 +482,7 @@ async def try_backfill(domains: List[str]) -> bool:
 
         processing_end_time = self.clock.time_msec()
         backfill_processing_before_timer.observe(
-            (processing_start_time - processing_end_time) / 1000
+            (processing_end_time - processing_start_time) / 1000
         )
 
         success = await try_backfill(likely_domains)
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py
@@ -674,7 +674,7 @@ async def on_GET(
         room_member_count = await make_deferred_yieldable(room_member_count_deferred)
         messsages_response_timer.labels(
             room_size=_RoomSize.from_member_count(room_member_count)
-        ).observe((processing_start_time - processing_end_time) / 1000)
+        ).observe((processing_end_time - processing_start_time) / 1000)
 
         return 200, msgs
 

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ async def try_backfill(domains: List[str]) -> bool:`
`482`	`482`
`483`	`483`	`processing_end_time = self.clock.time_msec()`
`484`	`484`	`backfill_processing_before_timer.observe(`
`485`		`- (processing_start_time - processing_end_time) / 1000`
	`485`	`+ (processing_end_time - processing_start_time) / 1000`
`486`	`486`	`)`
`487`	`487`
`488`	`488`	`success = await try_backfill(likely_domains)`