[APM] Remove duplicated logic in getIsUsingTransactionEvents (elastic…

…#126080)
kibanamachine · Feb 22, 2022 · 67a38e6 · 67a38e6
1 parent be4caac
commit 67a38e6
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts b/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
@@ -6,11 +6,11 @@
  */
 
 import { getSearchAggregatedTransactions } from '.';
-import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
 import { Setup } from '../setup_request';
 import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { APMEventClient } from '../create_es_client/create_apm_event_client';
+import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
 
 export async function getIsUsingTransactionEvents({
   setup: { config, apmEventClient },
@@ -23,20 +23,6 @@ export async function getIsUsingTransactionEvents({
   start?: number;
   end?: number;
 }): Promise<boolean> {
-  const searchAggregatedTransactions = config.searchAggregatedTransactions;
-
-  if (
-    searchAggregatedTransactions === SearchAggregatedTransactionSetting.never
-  ) {
-    return false;
-  }
-  if (
-    !kuery &&
-    searchAggregatedTransactions === SearchAggregatedTransactionSetting.always
-  ) {
-    return false;
-  }
-
   const searchesAggregatedTransactions = await getSearchAggregatedTransactions({
     config,
     start,
@@ -45,7 +31,11 @@ export async function getIsUsingTransactionEvents({
     kuery,
   });
 
-  if (!searchesAggregatedTransactions) {
+  if (
+    !searchesAggregatedTransactions &&
+    config.searchAggregatedTransactions !==
+      SearchAggregatedTransactionSetting.never
+  ) {
     // if no aggregrated transactions, check if any transactions at all
     return await getHasTransactions({
       start,