From a773e6828cdadf6877c0cbc0fbf277a9f1175e74 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 22 Jul 2024 14:43:28 -0400
Subject: [PATCH] MM-58772 Fix counter metrics not using Date.now (#27702)

---
 .../src/utils/performance_telemetry/reporter.test.ts        | 6 +++---
 webapp/channels/src/utils/performance_telemetry/reporter.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/channels/src/utils/performance_telemetry/reporter.test.ts b/webapp/channels/src/utils/performance_telemetry/reporter.test.ts
index c9dad07815..a8ecd31fed 100644
--- a/webapp/channels/src/utils/performance_telemetry/reporter.test.ts
+++ b/webapp/channels/src/utils/performance_telemetry/reporter.test.ts
@@ -94,7 +94,7 @@ describe('PerformanceReporter', () => {
 
         expect(reporter.handleObservations).toHaveBeenCalled();
 
-        const timestamp = performance.timeOrigin + performance.now();
+        const timestamp = Date.now();
 
         await waitForReport();
 
@@ -113,8 +113,8 @@ describe('PerformanceReporter', () => {
                 },
             ],
         });
-        expect(report.start).toBeGreaterThan(timestamp);
-        expect(report.end).toBeGreaterThan(timestamp);
+        expect(report.start).toBeGreaterThanOrEqual(timestamp);
+        expect(report.end).toBeGreaterThanOrEqual(timestamp);
         expect(report.start).toEqual(report.end);
 
         reporter.disconnect();
diff --git a/webapp/channels/src/utils/performance_telemetry/reporter.ts b/webapp/channels/src/utils/performance_telemetry/reporter.ts
index a75ba4f4e6..e2e0394583 100644
--- a/webapp/channels/src/utils/performance_telemetry/reporter.ts
+++ b/webapp/channels/src/utils/performance_telemetry/reporter.ts
@@ -268,7 +268,7 @@ export default class PerformanceReporter {
     }
 
     private generateReport(histogramMeasures: PerformanceReportMeasure[], counters: Map<string, number>): PerformanceReport {
-        const now = performance.timeOrigin + performance.now();
+        const now = Date.now();
 
         const counterMeasures = this.countersToMeasures(now, counters);
 
@@ -289,7 +289,7 @@ export default class PerformanceReporter {
 
     private getReportStartEnd(now: number, histogramMeasures: PerformanceReportMeasure[], counterMeasures: PerformanceReportMeasure[]): {start: number; end: number} {
         let start = now;
-        let end = performance.timeOrigin;
+        let end = 0;
 
         for (const measure of histogramMeasures) {
             start = Math.min(start, measure.timestamp);