Example of straighening projections out

sorenlouv · sorenlouv · commit b1b3211e9fc8 · 2020-06-28T13:44:15.000+02:00
diff --git a/x-pack/plugins/apm/common/projections/services.ts b/x-pack/plugins/apm/common/projections/services.ts
@@ -4,23 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupUIFilters,
-  SetupTimeRange,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../server/lib/helpers/setup_request';
 import { SERVICE_NAME, PROCESSOR_EVENT } from '../elasticsearch_fieldnames';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { rangeFilter } from '../utils/range_filter';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ApmIndicesConfig } from '../../server/lib/settings/apm_indices/get_apm_indices';
+import { ESFilter } from '../../typings/elasticsearch';
 
 export function getServicesProjection({
-  setup,
+  start,
+  end,
+  uiFiltersES,
+  indices,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  start: number;
+  end: number;
+  uiFiltersES: ESFilter[];
+  indices: ApmIndicesConfig;
 }) {
-  const { start, end, uiFiltersES, indices } = setup;
-
   return {
     index: [
       indices['apm_oss.metricsIndices'],
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -10,7 +10,6 @@ import {
   SERVICE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { getServicesProjection } from '../../../common/projections/services';
-import { mergeProjection } from '../../../common/projections/util/merge_projection';
 import { PromiseReturnType } from '../../../typings/common';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { transformServiceMapResponses } from './transform_service_map_responses';
@@ -76,21 +75,17 @@ async function getServicesData(options: IEnvOptions) {
     setup: { ...setup, uiFiltersES: [] },
   });
 
-  const { filter } = projection.body.query.bool;
+  const serviceNameFilter = options.serviceName
+    ? [{ term: { [SERVICE_NAME]: options.serviceName } }]
+    : [];
 
-  const params = mergeProjection(projection, {
+  const params = {
     body: {
+      index: projection.index,
       size: 0,
       query: {
         bool: {
-          ...projection.body.query.bool,
-          filter: options.serviceName
-            ? filter.concat({
-                term: {
-                  [SERVICE_NAME]: options.serviceName,
-                },
-              })
-            : filter,
+          filter: [...projection.body.query.bool.filter, ...serviceNameFilter],
         },
       },
       aggs: {
@@ -109,7 +104,7 @@ async function getServicesData(options: IEnvOptions) {
         },
       },
     },
-  });
+  };
 
   const { client } = setup;
 
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
@@ -4,36 +4,48 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { mergeProjection } from '../../../../common/projections/util/merge_projection';
+import { ESFilter } from '../../../../typings/elasticsearch';
 import {
   PROCESSOR_EVENT,
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
   TRANSACTION_DURATION,
 } from '../../../../common/elasticsearch_fieldnames';
 import { PromiseReturnType } from '../../../../typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
 import { getServicesProjection } from '../../../../common/projections/services';
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
+import { ESClient } from '../../helpers/es_client';
 
 export type ServiceListAPIResponse = PromiseReturnType<typeof getServicesItems>;
-export async function getServicesItems(
-  setup: Setup & SetupTimeRange & SetupUIFilters
-) {
-  const { start, end, client } = setup;
-
-  const projection = getServicesProjection({ setup });
+export async function getServicesItems({
+  start,
+  end,
+  uiFiltersES,
+  indices,
+  client,
+}: {
+  start: number;
+  end: number;
+  uiFiltersES: ESFilter[];
+  indices: ApmIndicesConfig;
+  client: ESClient;
+}) {
+  const projection = getServicesProjection({
+    start,
+    end,
+    uiFiltersES,
+    indices,
+  });
 
-  const params = mergeProjection(projection, {
+  const params = {
     body: {
+      index: projection.index,
       size: 0,
+      query: projection.body.query,
       aggs: {
         services: {
           terms: {
-            ...projection.body.aggs.services.terms,
+            field: projection.body.aggs.services.terms.field,
             size: 500,
           },
           aggs: {
@@ -53,7 +65,7 @@ export async function getServicesItems(
         },
       },
     },
-  });
+  };
 
   const resp = await client.search(params);
   const aggs = resp.aggregations;
