Don't track restored searches

elastic · Mar 10, 2021 · f59338a · f59338a
1 parent 4d82f94
commit f59338a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/plugins/data/server/search/collectors/usage.ts b/src/plugins/data/server/search/collectors/usage.ts
@@ -8,7 +8,7 @@
 
 import { once, debounce } from 'lodash';
 import type { CoreSetup, Logger } from 'kibana/server';
-import type { IEsSearchResponse } from '../../../common';
+import type { IEsSearchResponse, ISearchOptions } from '../../../common';
 import { isCompleteResponse } from '../../../common';
 import { CollectedUsage } from './register';
 
@@ -79,10 +79,14 @@ export function usageProvider(core: CoreSetup): SearchUsage {
 /**
  * Rxjs observer for easily doing `tap(searchUsageObserver(logger, usage))` in an rxjs chain.
  */
-export function searchUsageObserver(logger: Logger, usage?: SearchUsage) {
+export function searchUsageObserver(
+  logger: Logger,
+  usage?: SearchUsage,
+  { isRestore }: ISearchOptions = {}
+) {
   return {
     next(response: IEsSearchResponse) {
-      if (!isCompleteResponse(response)) return;
+      if (isRestore || !isCompleteResponse(response)) return;
       logger.debug(`trackSearchStatus:next  ${response.rawResponse.took}`);
       usage?.trackSuccess(response.rawResponse.took);
     },

diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -53,6 +53,6 @@ export const esSearchStrategyProvider = (
       }
     };
 
-    return from(search()).pipe(tap(searchUsageObserver(logger, usage)));
+    return from(search()).pipe(tap(searchUsageObserver(logger, usage, options)));
   },
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,6 @@ export const esSearchStrategyProvider = ( @@
           }
         };
-        return from(search()).pipe(tap(searchUsageObserver(logger, usage)));
+        return from(search()).pipe(tap(searchUsageObserver(logger, usage, options)));
       },
     });