[ML] Remove 'async' from variable names.

elastic · Sep 6, 2021 · 1656d8d · 1656d8d
1 parent e96aed9
commit 1656d8d
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 106 deletions.
diff --git a/x-pack/plugins/apm/common/search_strategies/latency_correlations/types.ts b/x-pack/plugins/apm/common/search_strategies/latency_correlations/types.ts
@@ -39,7 +39,7 @@ export function isLatencyCorrelations(
   );
 }
 
-export interface AsyncSearchProviderProgress {
+export interface LatencyCorrelationSearchServiceProgress {
   started: number;
   loadedHistogramStepsize: number;
   loadedOverallHistogram: number;

diff --git a/...ions_correlations/async_search_service.ts → ...ansactions_correlations_search_service.ts b/...ions_correlations/async_search_service.ts → ...ansactions_correlations_search_service.ts
@@ -22,18 +22,18 @@ import type {
   FailedTransactionsCorrelationsRawResponse,
 } from '../../../../common/search_strategies/failed_transactions_correlations/types';
 import type { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
-import { asyncSearchServiceLogProvider } from '../async_search_service_log';
+import { searchServiceLogProvider } from '../search_service_log';
 import {
   fetchFailedTransactionsCorrelationPValues,
   fetchTransactionDurationFieldCandidates,
 } from '../queries';
-import type { AsyncSearchServiceProvider } from '../search_strategy_provider';
+import type { SearchServiceProvider } from '../search_strategy_provider';
 
-import { asyncFailedTransactionsCorrelationsSearchServiceStateProvider } from './async_search_service_state';
+import { failedTransactionsCorrelationsSearchServiceStateProvider } from './failed_transactions_correlations_search_service_state';
 
 import { ERROR_CORRELATION_THRESHOLD } from '../constants';
 
-export type FailedTransactionsCorrelationsAsyncSearchServiceProvider = AsyncSearchServiceProvider<
+export type FailedTransactionsCorrelationsSearchServiceProvider = SearchServiceProvider<
   FailedTransactionsCorrelationsParams,
   FailedTransactionsCorrelationsRawResponse
 >;
@@ -43,15 +43,15 @@ export type FailedTransactionsCorrelationsSearchStrategy = ISearchStrategy<
   IKibanaSearchResponse<FailedTransactionsCorrelationsRawResponse>
 >;
 
-export const failedTransactionsCorrelationsAsyncSearchServiceProvider: FailedTransactionsCorrelationsAsyncSearchServiceProvider = (
+export const failedTransactionsCorrelationsSearchServiceProvider: FailedTransactionsCorrelationsSearchServiceProvider = (
   esClient: ElasticsearchClient,
   getApmIndices: () => Promise<ApmIndicesConfig>,
   searchServiceParams: FailedTransactionsCorrelationsParams,
   includeFrozen: boolean
 ) => {
-  const { addLogMessage, getLogMessages } = asyncSearchServiceLogProvider();
+  const { addLogMessage, getLogMessages } = searchServiceLogProvider();
 
-  const state = asyncFailedTransactionsCorrelationsSearchServiceStateProvider();
+  const state = failedTransactionsCorrelationsSearchServiceStateProvider();
 
   async function fetchErrorCorrelations() {
     try {

diff --git a/...orrelations/async_search_service_state.ts → ...ions_correlations_search_service_state.ts b/...orrelations/async_search_service_state.ts → ...ions_correlations_search_service_state.ts
@@ -12,7 +12,7 @@ interface Progress {
   loadedFieldCandidates: number;
   loadedFailedTransactionsCorrelations: number;
 }
-export const asyncFailedTransactionsCorrelationsSearchServiceStateProvider = () => {
+export const failedTransactionsCorrelationsSearchServiceStateProvider = () => {
   let ccsWarning = false;
   function setCcsWarning(d: boolean) {
     ccsWarning = d;
@@ -90,6 +90,6 @@ export const asyncFailedTransactionsCorrelationsSearchServiceStateProvider = ()
   };
 };
 
-export type AsyncSearchServiceState = ReturnType<
-  typeof asyncFailedTransactionsCorrelationsSearchServiceStateProvider
+export type FailedTransactionsCorrelationsSearchServiceState = ReturnType<
+  typeof failedTransactionsCorrelationsSearchServiceStateProvider
 >;
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/index.ts b/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/index.ts
@@ -6,7 +6,7 @@
  */
 
 export {
-  failedTransactionsCorrelationsAsyncSearchServiceProvider,
-  FailedTransactionsCorrelationsAsyncSearchServiceProvider,
+  failedTransactionsCorrelationsSearchServiceProvider,
+  FailedTransactionsCorrelationsSearchServiceProvider,
   FailedTransactionsCorrelationsSearchStrategy,
-} from './async_search_service';
+} from './failed_transactions_correlations_search_service';
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/index.ts b/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/index.ts
@@ -6,7 +6,7 @@
  */
 
 export {
-  latencyCorrelationsAsyncSearchServiceProvider,
-  LatencyCorrelationsAsyncSearchServiceProvider,
+  latencyCorrelationsSearchServiceProvider,
+  LatencyCorrelationsSearchServiceProvider,
   LatencyCorrelationsSearchStrategy,
-} from './async_search_service';
+} from './latency_correlations_search_service';
diff --git a/...ency_correlations/async_search_service.ts → ...ns/latency_correlations_search_service.ts b/...ency_correlations/async_search_service.ts → ...ns/latency_correlations_search_service.ts
@@ -32,12 +32,12 @@ import {
   fetchTransactionDurationRanges,
 } from '../queries';
 import { computeExpectationsAndRanges } from '../utils';
-import { asyncSearchServiceLogProvider } from '../async_search_service_log';
-import type { AsyncSearchServiceProvider } from '../search_strategy_provider';
+import { searchServiceLogProvider } from '../search_service_log';
+import type { SearchServiceProvider } from '../search_strategy_provider';
 
-import { asyncSearchServiceStateProvider } from './async_search_service_state';
+import { latencyCorrelationsSearchServiceStateProvider } from './latency_correlations_search_service_state';
 
-export type LatencyCorrelationsAsyncSearchServiceProvider = AsyncSearchServiceProvider<
+export type LatencyCorrelationsSearchServiceProvider = SearchServiceProvider<
   LatencyCorrelationsParams,
   LatencyCorrelationsRawResponse
 >;
@@ -47,15 +47,15 @@ export type LatencyCorrelationsSearchStrategy = ISearchStrategy<
   IKibanaSearchResponse<LatencyCorrelationsRawResponse>
 >;
 
-export const latencyCorrelationsAsyncSearchServiceProvider: LatencyCorrelationsAsyncSearchServiceProvider = (
+export const latencyCorrelationsSearchServiceProvider: LatencyCorrelationsSearchServiceProvider = (
   esClient: ElasticsearchClient,
   getApmIndices: () => Promise<ApmIndicesConfig>,
   searchServiceParams: LatencyCorrelationsParams,
   includeFrozen: boolean
 ) => {
-  const { addLogMessage, getLogMessages } = asyncSearchServiceLogProvider();
+  const { addLogMessage, getLogMessages } = searchServiceLogProvider();
 
-  const state = asyncSearchServiceStateProvider();
+  const state = latencyCorrelationsSearchServiceStateProvider();
 
   async function fetchCorrelations() {
     let params:

diff --git a/...ations/async_search_service_state.test.ts → ...correlations_search_service_state.test.ts b/...ations/async_search_service_state.test.ts → ...correlations_search_service_state.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { asyncSearchServiceStateProvider } from './async_search_service_state';
+import { latencyCorrelationsSearchServiceStateProvider } from './latency_correlations_search_service_state';
 
-describe('async search service', () => {
-  describe('asyncSearchServiceStateProvider', () => {
+describe('search service', () => {
+  describe('latencyCorrelationsSearchServiceStateProvider', () => {
     it('initializes with default state', () => {
-      const state = asyncSearchServiceStateProvider();
+      const state = latencyCorrelationsSearchServiceStateProvider();
       const defaultState = state.getState();
       const defaultProgress = state.getOverallProgress();
 
@@ -30,7 +30,7 @@ describe('async search service', () => {
     });
 
     it('returns updated state', () => {
-      const state = asyncSearchServiceStateProvider();
+      const state = latencyCorrelationsSearchServiceStateProvider();
 
       state.setCcsWarning(true);
       state.setError(new Error('the-error-message'));

diff --git a/...orrelations/async_search_service_state.ts → ...ency_correlations_search_service_state.ts b/...orrelations/async_search_service_state.ts → ...ency_correlations_search_service_state.ts
@@ -7,11 +7,11 @@
 
 import type { HistogramItem } from '../../../../common/search_strategies/types';
 import type {
-  AsyncSearchProviderProgress,
+  LatencyCorrelationSearchServiceProgress,
   LatencyCorrelation,
 } from '../../../../common/search_strategies/latency_correlations/types';
 
-export const asyncSearchServiceStateProvider = () => {
+export const latencyCorrelationsSearchServiceStateProvider = () => {
   let ccsWarning = false;
   function setCcsWarning(d: boolean) {
     ccsWarning = d;
@@ -45,7 +45,7 @@ export const asyncSearchServiceStateProvider = () => {
     percentileThresholdValue = d;
   }
 
-  let progress: AsyncSearchProviderProgress = {
+  let progress: LatencyCorrelationSearchServiceProgress = {
     started: Date.now(),
     loadedHistogramStepsize: 0,
     loadedOverallHistogram: 0,
@@ -63,7 +63,7 @@ export const asyncSearchServiceStateProvider = () => {
     );
   }
   function setProgress(
-    d: Partial<Omit<AsyncSearchProviderProgress, 'started'>>
+    d: Partial<Omit<LatencyCorrelationSearchServiceProgress, 'started'>>
   ) {
     progress = {
       ...progress,
@@ -109,6 +109,6 @@ export const asyncSearchServiceStateProvider = () => {
   };
 };
 
-export type AsyncSearchServiceState = ReturnType<
-  typeof asyncSearchServiceStateProvider
+export type LatencyCorrelationsSearchServiceState = ReturnType<
+  typeof latencyCorrelationsSearchServiceStateProvider
 >;
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_field_value_pairs.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_field_value_pairs.test.ts
@@ -10,8 +10,8 @@ import type { estypes } from '@elastic/elasticsearch';
 import type { ElasticsearchClient } from 'src/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
-import { asyncSearchServiceLogProvider } from '../async_search_service_log';
-import { asyncSearchServiceStateProvider } from '../latency_correlations/async_search_service_state';
+import { searchServiceLogProvider } from '../search_service_log';
+import { latencyCorrelationsSearchServiceStateProvider } from '../latency_correlations/latency_correlations_search_service_state';
 
 import {
   fetchTransactionDurationFieldValuePairs,
@@ -62,8 +62,8 @@ describe('query_field_value_pairs', () => {
         search: esClientSearchMock,
       } as unknown) as ElasticsearchClient;
 
-      const { addLogMessage, getLogMessages } = asyncSearchServiceLogProvider();
-      const state = asyncSearchServiceStateProvider();
+      const { addLogMessage, getLogMessages } = searchServiceLogProvider();
+      const state = latencyCorrelationsSearchServiceStateProvider();
 
       const resp = await fetchTransactionDurationFieldValuePairs(
         esClientMock,

diff --git a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_field_value_pairs.ts b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_field_value_pairs.ts
@@ -14,8 +14,8 @@ import type {
   SearchStrategyParams,
 } from '../../../../common/search_strategies/types';
 
-import type { AsyncSearchServiceLog } from '../async_search_service_log';
-import type { AsyncSearchServiceState } from '../latency_correlations/async_search_service_state';
+import type { SearchServiceLog } from '../search_service_log';
+import type { LatencyCorrelationsSearchServiceState } from '../latency_correlations/latency_correlations_search_service_state';
 import { TERMS_SIZE } from '../constants';
 
 import { getQueryWithParams } from './get_query_with_params';
@@ -44,7 +44,7 @@ const fetchTransactionDurationFieldTerms = async (
   esClient: ElasticsearchClient,
   params: SearchStrategyParams,
   fieldName: string,
-  addLogMessage: AsyncSearchServiceLog['addLogMessage']
+  addLogMessage: SearchServiceLog['addLogMessage']
 ): Promise<FieldValuePair[]> => {
   try {
     const resp = await esClient.search(getTermsAggRequest(params, fieldName));
@@ -93,8 +93,8 @@ export const fetchTransactionDurationFieldValuePairs = async (
   esClient: ElasticsearchClient,
   params: SearchStrategyParams,
   fieldCandidates: string[],
-  state: AsyncSearchServiceState,
-  addLogMessage: AsyncSearchServiceLog['addLogMessage']
+  state: LatencyCorrelationsSearchServiceState,
+  addLogMessage: SearchServiceLog['addLogMessage']
 ): Promise<FieldValuePair[]> => {
   let fieldValuePairsProgress = 1;
 

diff --git a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histograms_generator.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histograms_generator.test.ts
@@ -10,8 +10,8 @@ import type { estypes } from '@elastic/elasticsearch';
 import type { ElasticsearchClient } from 'src/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
-import { asyncSearchServiceLogProvider } from '../async_search_service_log';
-import { asyncSearchServiceStateProvider } from '../latency_correlations/async_search_service_state';
+import { searchServiceLogProvider } from '../search_service_log';
+import { latencyCorrelationsSearchServiceStateProvider } from '../latency_correlations/latency_correlations_search_service_state';
 
 import { fetchTransactionDurationHistograms } from './query_histograms_generator';
 
@@ -50,8 +50,8 @@ describe('query_histograms_generator', () => {
         search: esClientSearchMock,
       } as unknown) as ElasticsearchClient;
 
-      const state = asyncSearchServiceStateProvider();
-      const { addLogMessage, getLogMessages } = asyncSearchServiceLogProvider();
+      const state = latencyCorrelationsSearchServiceStateProvider();
+      const { addLogMessage, getLogMessages } = searchServiceLogProvider();
 
       let loadedHistograms = 0;
       const items = [];
@@ -104,8 +104,8 @@ describe('query_histograms_generator', () => {
         search: esClientSearchMock,
       } as unknown) as ElasticsearchClient;
 
-      const state = asyncSearchServiceStateProvider();
-      const { addLogMessage, getLogMessages } = asyncSearchServiceLogProvider();
+      const state = latencyCorrelationsSearchServiceStateProvider();
+      const { addLogMessage, getLogMessages } = searchServiceLogProvider();
 
       let loadedHistograms = 0;
       const items = [];

diff --git a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histograms_generator.ts b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histograms_generator.ts
@@ -14,8 +14,8 @@ import type {
   SearchStrategyParams,
 } from '../../../../common/search_strategies/types';
 
-import type { AsyncSearchServiceLog } from '../async_search_service_log';
-import type { AsyncSearchServiceState } from '../latency_correlations/async_search_service_state';
+import type { SearchServiceLog } from '../search_service_log';
+import type { LatencyCorrelationsSearchServiceState } from '../latency_correlations/latency_correlations_search_service_state';
 import { CORRELATION_THRESHOLD, KS_TEST_THRESHOLD } from '../constants';
 
 import { getPrioritizedFieldValuePairs } from './get_prioritized_field_value_pairs';
@@ -24,9 +24,9 @@ import { fetchTransactionDurationRanges } from './query_ranges';
 
 export async function* fetchTransactionDurationHistograms(
   esClient: ElasticsearchClient,
-  addLogMessage: AsyncSearchServiceLog['addLogMessage'],
+  addLogMessage: SearchServiceLog['addLogMessage'],
   params: SearchStrategyParams,
-  state: AsyncSearchServiceState,
+  state: LatencyCorrelationsSearchServiceState,
   expectations: number[],
   ranges: estypes.AggregationsAggregationRange[],
   fractions: number[],

diff --git a/x-pack/plugins/apm/server/lib/search_strategies/register_search_strategies.ts b/x-pack/plugins/apm/server/lib/search_strategies/register_search_strategies.ts
@@ -11,8 +11,8 @@ import { APM_SEARCH_STRATEGIES } from '../../../common/search_strategies/constan
 
 import type { ApmIndicesConfig } from '../settings/apm_indices/get_apm_indices';
 
-import { failedTransactionsCorrelationsAsyncSearchServiceProvider } from './failed_transactions_correlations';
-import { latencyCorrelationsAsyncSearchServiceProvider } from './latency_correlations';
+import { failedTransactionsCorrelationsSearchServiceProvider } from './failed_transactions_correlations';
+import { latencyCorrelationsSearchServiceProvider } from './latency_correlations';
 import { searchStrategyProvider } from './search_strategy_provider';
 
 export const registerSearchStrategies = (
@@ -23,7 +23,7 @@ export const registerSearchStrategies = (
   registerSearchStrategy(
     APM_SEARCH_STRATEGIES.APM_LATENCY_CORRELATIONS,
     searchStrategyProvider(
-      latencyCorrelationsAsyncSearchServiceProvider,
+      latencyCorrelationsSearchServiceProvider,
       getApmIndices,
       includeFrozen
     )
@@ -32,7 +32,7 @@ export const registerSearchStrategies = (
   registerSearchStrategy(
     APM_SEARCH_STRATEGIES.APM_FAILED_TRANSACTIONS_CORRELATIONS,
     searchStrategyProvider(
-      failedTransactionsCorrelationsAsyncSearchServiceProvider,
+      failedTransactionsCorrelationsSearchServiceProvider,
       getApmIndices,
       includeFrozen
     )

diff --git a/...rategies/async_search_service_log.test.ts → ...rch_strategies/search_service_log.test.ts b/...rategies/async_search_service_log.test.ts → ...rch_strategies/search_service_log.test.ts
@@ -6,11 +6,11 @@
  */
 
 import {
-  asyncSearchServiceLogProvider,
+  searchServiceLogProvider,
   currentTimeAsString,
-} from './async_search_service_log';
+} from './search_service_log';
 
-describe('async search service', () => {
+describe('search service', () => {
   describe('currentTimeAsString', () => {
     it('returns the current time as a string', () => {
       const mockDate = new Date(1392202800000);
@@ -25,9 +25,9 @@ describe('async search service', () => {
     });
   });
 
-  describe('asyncSearchServiceLogProvider', () => {
+  describe('searchServiceLogProvider', () => {
     it('adds and retrieves messages from the log', async () => {
-      const { addLogMessage, getLogMessages } = asyncSearchServiceLogProvider();
+      const { addLogMessage, getLogMessages } = searchServiceLogProvider();
 
       const mockDate = new Date(1392202800000);
       // @ts-ignore ignore the mockImplementation callback error

diff --git a/...ch_strategies/async_search_service_log.ts → ...b/search_strategies/search_service_log.ts b/...ch_strategies/async_search_service_log.ts → ...b/search_strategies/search_service_log.ts
@@ -13,7 +13,7 @@ interface LogMessage {
 
 export const currentTimeAsString = () => new Date().toISOString();
 
-export const asyncSearchServiceLogProvider = () => {
+export const searchServiceLogProvider = () => {
   const log: LogMessage[] = [];
 
   function addLogMessage(message: string, error?: string) {
@@ -31,6 +31,4 @@ export const asyncSearchServiceLogProvider = () => {
   return { addLogMessage, getLogMessages };
 };
 
-export type AsyncSearchServiceLog = ReturnType<
-  typeof asyncSearchServiceLogProvider
->;
+export type SearchServiceLog = ReturnType<typeof searchServiceLogProvider>;