tweak function API for topItemsHandler/fetchTopCategories

elastic · Jul 5, 2024 · b09d449 · b09d449
1 parent 6a6a8a8
commit b09d449
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_top_categories.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_top_categories.ts
@@ -15,16 +15,25 @@ import type { AiopsLogRateAnalysisSchema } from '../api/schema';
 
 import { fetchCategories } from './fetch_categories';
 
-export const fetchTopCategories = async (
-  esClient: ElasticsearchClient,
-  params: AiopsLogRateAnalysisSchema,
-  fieldNames: string[],
-  logger: Logger,
+export const fetchTopCategories = async ({
+  esClient,
+  abortSignal,
+  emitError,
+  logger,
+  arguments: args,
+}: {
+  esClient: ElasticsearchClient;
+  logger: Logger;
+  emitError: (m: string) => void;
+  abortSignal?: AbortSignal;
+  arguments: AiopsLogRateAnalysisSchema & {
+    fieldNames: string[];
+    sampleProbability?: number;
+  };
+}) => {
   // The default value of 1 means no sampling will be used
-  sampleProbability: number = 1,
-  emitError: (m: string) => void,
-  abortSignal?: AbortSignal
-) => {
+  const { fieldNames, sampleProbability = 1, ...params } = args;
+
   const categoriesOverall = await fetchCategories(
     esClient,
     params,

diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/top_items_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/top_items_handler.ts
@@ -63,15 +63,17 @@ export const topItemsHandlerFactory =
     // Get categories of text fields
     if (textFieldCandidates.length > 0) {
       topCategories.push(
-        ...(await fetchTopCategories(
+        ...(await fetchTopCategories({
           esClient,
-          requestBody,
-          textFieldCandidates,
           logger,
-          stateHandler.sampleProbability(),
-          responseStream.pushError,
-          abortSignal
-        ))
+          emitError: responseStream.pushError,
+          abortSignal,
+          arguments: {
+            ...requestBody,
+            fieldNames: textFieldCandidates,
+            sampleProbability: stateHandler.sampleProbability(),
+          },
+        }))
       );
 
       if (topCategories.length > 0) {