From 43b09c2b95bcf694e75694bbbd60673b081a488c Mon Sep 17 00:00:00 2001
From: Christiane Heiligers <christiane.heiligers@elastic.co>
Date: Sat, 19 Dec 2020 18:26:13 -0700
Subject: [PATCH] Migrates search telemetry usage collector es client from
 legacy to new

---
 .../data/server/search/collectors/fetch.ts    | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/plugins/data/server/search/collectors/fetch.ts b/src/plugins/data/server/search/collectors/fetch.ts
index 344bc18c7b4b66..d59ed74edce104 100644
--- a/src/plugins/data/server/search/collectors/fetch.ts
+++ b/src/plugins/data/server/search/collectors/fetch.ts
@@ -23,24 +23,20 @@ import { SharedGlobalConfig } from 'kibana/server';
 import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
 import { Usage } from './register';
 
-interface SearchTelemetrySavedObject {
-  'search-telemetry': Usage;
-}
-
 export function fetchProvider(config$: Observable<SharedGlobalConfig>) {
-  return async ({ callCluster }: CollectorFetchContext): Promise<Usage> => {
+  return async ({ esClient }: CollectorFetchContext): Promise<Usage> => {
     const config = await config$.pipe(first()).toPromise();
-
-    const response = await callCluster<SearchTelemetrySavedObject>('search', {
-      index: config.kibana.index,
-      body: {
-        query: { term: { type: { value: 'search-telemetry' } } },
+    const { body } = await esClient.search(
+      {
+        index: config.kibana.index,
+        body: {
+          query: { term: { type: { value: 'search-telemetry' } } },
+        },
       },
-      ignore: [404],
-    });
-
-    return response.hits.hits.length
-      ? response.hits.hits[0]._source['search-telemetry']
+      { ignore: [404] }
+    );
+    return body.hits?.hits?.length > 0
+      ? body.hits.hits[0]._source['search-telemetry']
       : {
           successCount: 0,
           errorCount: 0,