From 36b4ad98883442c329f455d0d6ddd54ebf5e1b86 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Mon, 13 Apr 2020 14:06:20 +0200
Subject: [PATCH] [APM] Separate count/retainment telemetry requests (#63225)

Separate count/retainment telemetry requests to make them less prone to timing out.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../collect_data_telemetry/tasks.ts           | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
index 85f233de2086d..e9801272cd57b 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -61,10 +61,10 @@ export const tasks: TelemetryTask[] = [
         return prevJob.then(async data => {
           const { processorEvent, timeRange } = current;
 
-          const response = await search({
+          const totalHitsResponse = await search({
             index: indicesByProcessorEvent[processorEvent],
             body: {
-              size: 1,
+              size: 0,
               query: {
                 bool: {
                   filter: [
@@ -83,25 +83,43 @@ export const tasks: TelemetryTask[] = [
                   ]
                 }
               },
-              sort: {
-                '@timestamp': 'asc'
-              },
-              _source: ['@timestamp'],
               track_total_hits: true
             }
           });
 
-          const event = response.hits.hits[0]?._source as {
-            '@timestamp': number;
-          };
+          const retainmentResponse =
+            timeRange === 'all'
+              ? await search({
+                  index: indicesByProcessorEvent[processorEvent],
+                  body: {
+                    query: {
+                      bool: {
+                        filter: [
+                          { term: { [PROCESSOR_EVENT]: processorEvent } }
+                        ]
+                      }
+                    },
+                    sort: {
+                      '@timestamp': 'asc'
+                    },
+                    _source: ['@timestamp']
+                  }
+                })
+              : null;
+
+          const event = retainmentResponse?.hits.hits[0]?._source as
+            | {
+                '@timestamp': number;
+              }
+            | undefined;
 
           return merge({}, data, {
             counts: {
               [processorEvent]: {
-                [timeRange]: response.hits.total.value
+                [timeRange]: totalHitsResponse.hits.total.value
               }
             },
-            ...(timeRange === 'all' && event
+            ...(event
               ? {
                   retainment: {
                     [processorEvent]: {