Workaround superagent bug

elastic · Aug 14, 2023 · e264670 · e264670
1 parent 0ef4fb7
commit e264670
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 4 deletions.
diff --git a/src/core/server/integration_tests/http/request.test.ts b/src/core/server/integration_tests/http/request.test.ts
@@ -191,7 +191,16 @@ describe('KibanaRequest', () => {
           // end required to send request
           .end();
 
-        setTimeout(() => incomingRequest.abort(), 50);
+        setTimeout(() => {
+          incomingRequest.abort();
+
+          // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+          // Can be removed once a new version is published and we upgrade.
+          // @ts-expect-error
+          incomingRequest.req.destroyed = false;
+          // @ts-expect-error
+          incomingRequest.req.destroy();
+        }, 50);
         await done;
         expect(nextSpy).toHaveBeenCalledTimes(1);
       });
@@ -227,7 +236,16 @@ describe('KibanaRequest', () => {
           // end required to send request
           .end();
 
-        setTimeout(() => incomingRequest.abort(), 50);
+        setTimeout(() => {
+          incomingRequest.abort();
+
+          // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+          // Can be removed once a new version is published and we upgrade.
+          // @ts-expect-error
+          incomingRequest.req.destroyed = false;
+          // @ts-expect-error
+          incomingRequest.req.destroy();
+        }, 50);
         await done;
         expect(nextSpy).toHaveBeenCalledTimes(1);
       });
@@ -366,7 +384,16 @@ describe('KibanaRequest', () => {
           .get('/')
           // end required to send request
           .end();
-        setTimeout(() => incomingRequest.abort(), 50);
+        setTimeout(() => {
+          incomingRequest.abort();
+
+          // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+          // Can be removed once a new version is published and we upgrade.
+          // @ts-expect-error
+          incomingRequest.req.destroyed = false;
+          // @ts-expect-error
+          incomingRequest.req.destroy();
+        }, 50);
         await done;
         expect(nextSpy).toHaveBeenCalledTimes(1);
       });
@@ -401,7 +428,16 @@ describe('KibanaRequest', () => {
           .send({ foo: 'bar' })
           // end required to send request
           .end();
-        setTimeout(() => incomingRequest.abort(), 50);
+        setTimeout(() => {
+          incomingRequest.abort();
+
+          // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+          // Can be removed once a new version is published and we upgrade.
+          // @ts-expect-error
+          incomingRequest.req.destroyed = false;
+          // @ts-expect-error
+          incomingRequest.req.destroy();
+        }, 50);
         await done;
         expect(nextSpy).toHaveBeenCalledTimes(1);
       });

diff --git a/src/core/server/integration_tests/metrics/server_collector.test.ts b/src/core/server/integration_tests/metrics/server_collector.test.ts
@@ -117,6 +117,12 @@ describe('ServerMetricsCollector', () => {
     const waitFor1stAbort = disconnectAborted$.pipe(take(1)).toPromise();
 
     discoReq1.abort();
+    // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+    // Can be removed once a new version is published and we upgrade.
+    // @ts-expect-error
+    discoReq1.req.destroyed = false;
+    // @ts-expect-error
+    discoReq1.req.destroy();
 
     // Wait for the aborted$ event
     await waitFor1stAbort;
@@ -133,6 +139,12 @@ describe('ServerMetricsCollector', () => {
     const waitFor2ndAbort = disconnectAborted$.pipe(take(1)).toPromise();
 
     discoReq2.abort();
+    // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+    // Can be removed once a new version is published and we upgrade.
+    // @ts-expect-error
+    discoReq2.req.destroyed = false;
+    // @ts-expect-error
+    discoReq2.req.destroy();
 
     // Wait for the aborted$ event
     await waitFor2ndAbort;

diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
@@ -86,6 +86,13 @@ describe('APMEventClient', () => {
           }, 100);
         });
         incomingRequest.abort();
+
+        // Hack to resolve superagent's bug https://github.com/ladjs/superagent/pull/1774
+        // Can be removed once a new version is published and we upgrade.
+        // @ts-expect-error
+        incomingRequest.req.destroyed = false;
+        // @ts-expect-error
+        incomingRequest.req.destroy();
       }, 100);
     });