From 467d14f28a824f8dc8c6b037a7a165598cdf780c Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 16 Sep 2020 14:19:36 -0600
Subject: [PATCH] Make sure getOpsMetrics$ only replays lastest value

---
 .../server/metrics/metrics_service.test.ts    | 19 +++++++++++++++++++
 src/core/server/metrics/metrics_service.ts    |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/server/metrics/metrics_service.test.ts b/src/core/server/metrics/metrics_service.test.ts
index 269931d0e33ad..384a56c8dba94 100644
--- a/src/core/server/metrics/metrics_service.test.ts
+++ b/src/core/server/metrics/metrics_service.test.ts
@@ -106,6 +106,25 @@ describe('MetricsService', () => {
         `"#setup() needs to be run first"`
       );
     });
+
+    it('emits the last value on each getOpsMetrics$ call', async () => {
+      const firstMetrics = { metric: 'first' };
+      const secondMetrics = { metric: 'second' };
+      mockOpsCollector.collect
+        .mockResolvedValueOnce(firstMetrics)
+        .mockResolvedValueOnce(secondMetrics);
+
+      await metricsService.setup({ http: httpMock });
+      const { getOpsMetrics$ } = await metricsService.start();
+
+      const firstEmission = getOpsMetrics$().pipe(take(1)).toPromise();
+      jest.advanceTimersByTime(testInterval);
+      expect(await firstEmission).toEqual({ metric: 'first' });
+
+      const secondEmission = getOpsMetrics$().pipe(take(1)).toPromise();
+      jest.advanceTimersByTime(testInterval);
+      expect(await secondEmission).toEqual({ metric: 'second' });
+    });
   });
 
   describe('#stop', () => {
diff --git a/src/core/server/metrics/metrics_service.ts b/src/core/server/metrics/metrics_service.ts
index d4696b3aa9aaf..ab58a75d49a98 100644
--- a/src/core/server/metrics/metrics_service.ts
+++ b/src/core/server/metrics/metrics_service.ts
@@ -37,7 +37,7 @@ export class MetricsService
   private readonly logger: Logger;
   private metricsCollector?: OpsMetricsCollector;
   private collectInterval?: NodeJS.Timeout;
-  private metrics$ = new ReplaySubject<OpsMetrics>();
+  private metrics$ = new ReplaySubject<OpsMetrics>(1);
   private service?: InternalMetricsServiceSetup;
 
   constructor(private readonly coreContext: CoreContext) {