fix field value pair error handling

elastic · Nov 8, 2021 · 22f785c · 22f785c
1 parent de63d24
commit 22f785c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/x-pack/plugins/apm/server/lib/correlations/queries/query_field_value_pairs.ts b/x-pack/plugins/apm/server/lib/correlations/queries/query_field_value_pairs.ts
@@ -15,6 +15,8 @@ import type {
 } from '../../../../common/correlations/types';
 import { TERMS_SIZE } from '../../../../common/correlations/constants';
 
+import { splitAllSettledPromises } from '../utils';
+
 import { getQueryWithParams } from './get_query_with_params';
 import { getRequestBase } from './get_request_base';
 
@@ -73,12 +75,14 @@ export const fetchTransactionDurationFieldValuePairs = async (
   esClient: ElasticsearchClient,
   params: CorrelationsParams,
   fieldCandidates: string[]
-): Promise<FieldValuePair[]> => {
-  const responses = await Promise.all(
-    fieldCandidates.map((fieldCandidate) =>
-      fetchTransactionDurationFieldTerms(esClient, params, fieldCandidate)
+): Promise<{ fieldValuePairs: FieldValuePair[]; errors: any[] }> => {
+  const { fulfilled: responses, rejected: errors } = splitAllSettledPromises(
+    await Promise.allSettled(
+      fieldCandidates.map((fieldCandidate) =>
+        fetchTransactionDurationFieldTerms(esClient, params, fieldCandidate)
+      )
     )
   );
 
-  return responses.flat();
+  return { fieldValuePairs: responses.flat(), errors };
 };
diff --git a/x-pack/plugins/apm/server/routes/correlations.ts b/x-pack/plugins/apm/server/routes/correlations.ts
@@ -141,16 +141,18 @@ const fieldValuePairsRoute = createApmServerRoute({
 
     const { fieldCandidates, ...params } = resources.params.body;
 
-    return withApmSpan('get_correlations_field_value_pairs', async () => ({
-      fieldValuePairs: await fetchTransactionDurationFieldValuePairs(
-        esClient,
-        {
-          ...params,
-          index: indices.transaction,
-        },
-        fieldCandidates
-      ),
-    }));
+    return withApmSpan(
+      'get_correlations_field_value_pairs',
+      async () =>
+        await fetchTransactionDurationFieldValuePairs(
+          esClient,
+          {
+            ...params,
+            index: indices.transaction,
+          },
+          fieldCandidates
+        )
+    );
   },
 });