From 0da84be674f5b9b2ae910c2cd5155469d3d1c9b8 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 9 Mar 2022 07:57:37 -0500
Subject: [PATCH] [Flaky tests] Metric's server collector's integration tests
 (#127139) (#127263)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 6bcce44082cad684bfcd9040c67e4020c14239b5)

Co-authored-by: Alejandro Fernández Haro <alejandro.haro@elastic.co>
---
 .../server_collector.test.ts                  | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/core/server/metrics/integration_tests/server_collector.test.ts b/src/core/server/metrics/integration_tests/server_collector.test.ts
index b64e7d55560d4..713d3ed1dc96e 100644
--- a/src/core/server/metrics/integration_tests/server_collector.test.ts
+++ b/src/core/server/metrics/integration_tests/server_collector.test.ts
@@ -17,10 +17,7 @@ import { executionContextServiceMock } from '../../execution_context/execution_c
 import { ServerMetricsCollector } from '../collectors/server';
 import { setTimeout as setTimeoutPromise } from 'timers/promises';
 
-const requestWaitDelay = 25;
-
-// FLAKY: https://github.com/elastic/kibana/issues/59234
-describe.skip('ServerMetricsCollector', () => {
+describe('ServerMetricsCollector', () => {
   let server: HttpService;
   let collector: ServerMetricsCollector;
   let hapiServer: HapiServer;
@@ -79,30 +76,32 @@ describe.skip('ServerMetricsCollector', () => {
 
   it('collect disconnects requests infos', async () => {
     const never = new Promise((resolve) => undefined);
-    const hitSubject = new BehaviorSubject(0);
+    const disconnectRequested$ = new Subject(); // Controls the number of requests in the /disconnect endpoint
+    const disconnectAborted$ = new Subject(); // Controls the abort event in the /disconnect endpoint
 
     router.get({ path: '/', validate: false }, async (ctx, req, res) => {
       return res.ok({ body: '' });
     });
     router.get({ path: '/disconnect', validate: false }, async (ctx, req, res) => {
-      hitSubject.next(hitSubject.value + 1);
-      await never;
+      disconnectRequested$.next();
+      req.events.aborted$.subscribe(() => {
+        disconnectAborted$.next();
+      });
+      await never; // Never resolve the request
       return res.ok({ body: '' });
     });
     await server.start();
 
     await sendGet('/');
-    // superTest.get(path).end needs to be called with a callback to actually send the request.
-    const discoReq1 = sendGet('/disconnect').end(() => null);
-    const discoReq2 = sendGet('/disconnect').end(() => null);
-
-    await hitSubject
-      .pipe(
-        filter((count) => count >= 2),
-        take(1)
-      )
-      .toPromise();
-    await delay(requestWaitDelay); // wait for the requests to send
+
+    // Subscribe to expect 2 requests to /disconnect
+    const waitFor2Requests = disconnectRequested$.pipe(take(2)).toPromise();
+
+    const discoReq1 = sendGet('/disconnect').end();
+    const discoReq2 = sendGet('/disconnect').end();
+
+    // Wait for 2 requests to /disconnect
+    await waitFor2Requests;
 
     let metrics = await collector.collect();
     expect(metrics.requests).toEqual(
@@ -113,8 +112,13 @@ describe.skip('ServerMetricsCollector', () => {
       })
     );
 
+    // Subscribe to the aborted$ event
+    const waitFor1stAbort = disconnectAborted$.pipe(take(1)).toPromise();
+
     discoReq1.abort();
-    await delay(requestWaitDelay);
+
+    // Wait for the aborted$ event
+    await waitFor1stAbort;
 
     metrics = await collector.collect();
     expect(metrics.requests).toEqual(
@@ -124,8 +128,13 @@ describe.skip('ServerMetricsCollector', () => {
       })
     );
 
+    // Subscribe to the aborted$ event
+    const waitFor2ndAbort = disconnectAborted$.pipe(take(1)).toPromise();
+
     discoReq2.abort();
-    await delay(requestWaitDelay);
+
+    // Wait for the aborted$ event
+    await waitFor2ndAbort;
 
     metrics = await collector.collect();
     expect(metrics.requests).toEqual(