From 6419d95e270c5754755498e7b44d7ec7d376138c Mon Sep 17 00:00:00 2001
From: Zacqary Xeper <zacqary.xeper@elastic.co>
Date: Wed, 1 Jul 2020 14:23:55 -0500
Subject: [PATCH] [Metrics UI] Fix asynchronicity and error handling in
 Snapshot API

---
 .../infra/server/lib/snapshot/snapshot.ts     | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts b/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
index 7dd1c3de5be5b..fda3756ea47a8 100644
--- a/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
+++ b/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
@@ -41,12 +41,13 @@ export class InfraSnapshot {
     // when they have both been completed.
     const timeRangeWithIntervalApplied = await createTimeRangeWithInterval(client, options);
     const optionsWithTimerange = { ...options, timerange: timeRangeWithIntervalApplied };
+
     const groupedNodesPromise = requestGroupedNodes(client, optionsWithTimerange);
     const nodeMetricsPromise = requestNodeMetrics(client, optionsWithTimerange);
-
-    const groupedNodeBuckets = await groupedNodesPromise;
-    const nodeMetricBuckets = await nodeMetricsPromise;
-
+    const [groupedNodeBuckets, nodeMetricBuckets] = await Promise.all([
+      groupedNodesPromise,
+      nodeMetricsPromise,
+    ]);
     return {
       nodes: mergeNodeBuckets(groupedNodeBuckets, nodeMetricBuckets, options),
       interval: timeRangeWithIntervalApplied.interval,
@@ -103,11 +104,12 @@ const requestGroupedNodes = async (
       },
     },
   };
-
-  return await getAllCompositeData<
-    InfraSnapshotAggregationResponse,
-    InfraSnapshotNodeGroupByBucket
-  >(callClusterFactory(client), query, bucketSelector, handleAfterKey);
+  return getAllCompositeData<InfraSnapshotAggregationResponse, InfraSnapshotNodeGroupByBucket>(
+    callClusterFactory(client),
+    query,
+    bucketSelector,
+    handleAfterKey
+  );
 };
 
 const requestNodeMetrics = async (
@@ -154,10 +156,12 @@ const requestNodeMetrics = async (
       },
     },
   };
-  return await getAllCompositeData<
-    InfraSnapshotAggregationResponse,
-    InfraSnapshotNodeMetricsBucket
-  >(callClusterFactory(client), query, bucketSelector, handleAfterKey);
+  return getAllCompositeData<InfraSnapshotAggregationResponse, InfraSnapshotNodeMetricsBucket>(
+    callClusterFactory(client),
+    query,
+    bucketSelector,
+    handleAfterKey
+  );
 };
 
 // buckets can be InfraSnapshotNodeGroupByBucket[] or InfraSnapshotNodeMetricsBucket[]