Revert change to .finally()

elastic · Jan 22, 2021 · 9deda89 · 9deda89
1 parent 8d295b9
commit 9deda89
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
@@ -15,7 +15,13 @@ export function cancelEsRequestOnAbort<T extends TransportRequestPromise<any>>(
     promise.abort();
   });
 
-  promise.finally(() => subscription.unsubscribe());
+  // using .catch() here means unsubscribe will be called
+  // after it has thrown an error, so we use .then(onSuccess, onFailure)
+  // syntax
+  promise.then(
+    () => subscription.unsubscribe(),
+    () => subscription.unsubscribe()
+  );
 
   return promise;
 }