[APM] Use apmEventClient for querying APM event indices

x-pack/plugins/apm/common/processor_event.ts

@@ -8,4 +8,18 @@ export enum ProcessorEvent {
   transaction = 'transaction',
   error = 'error',
   metric = 'metric',
+  span = 'span',
+  onboarding = 'onboarding',
+  sourcemap = 'sourcemap',
 }
+/**
+ * Processor events that are searchable in the UI via the query bar.
+ *
+ * Some client-sideroutes will define 1 or more processor events that
+ * will be used to fetch the dynamic index pattern for the query bar.
+ */
+
+export type UIProcessorEvent =
+  | ProcessorEvent.transaction
+  | ProcessorEvent.error
+  | ProcessorEvent.metric;

x-pack/plugins/apm/common/projections.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export enum Projection {
+  services = 'services',
+  transactionGroups = 'transactionGroups',
+  traces = 'traces',
+  transactions = 'transactions',
+  metrics = 'metrics',
+  errorGroups = 'errorGroups',
+  serviceNodes = 'serviceNodes',
+  rumOverview = 'rumOverview',
+}

x-pack/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx

@@ -14,7 +14,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 import { useTrackPageview } from '../../../../../observability/public';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { useFetcher } from '../../../hooks/useFetcher';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { callApmApi } from '../../../services/rest/createCallApmApi';
@@ -79,7 +79,7 @@ function ErrorGroupOverview() {
       params: {
         serviceName,
       },
-      projection: PROJECTION.ERROR_GROUPS,
+      projection: Projection.errorGroups,
     };
 
     return config;

x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx

@@ -13,7 +13,7 @@ import {
 } from '@elastic/eui';
 import { useTrackPageview } from '../../../../../observability/public';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { RumDashboard } from './RumDashboard';
 import { ServiceNameFilter } from '../../shared/LocalUIFilters/ServiceNameFilter';
 import { useUrlParams } from '../../../hooks/useUrlParams';
@@ -28,7 +28,7 @@ export function RumOverview() {
   const localUIFiltersConfig = useMemo(() => {
     const config: React.ComponentProps<typeof LocalUIFilters> = {
       filterNames: ['transactionUrl', 'location', 'device', 'os', 'browser'],
-      projection: PROJECTION.RUM_OVERVIEW,
+      projection: Projection.rumOverview,
     };
 
     return config;

x-pack/plugins/apm/public/components/app/ServiceMetrics/index.tsx

@@ -16,7 +16,7 @@ import { useServiceMetricCharts } from '../../../hooks/useServiceMetricCharts';
 import { MetricsChart } from '../../shared/charts/MetricsChart';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
 
 interface ServiceMetricsProps {
@@ -36,7 +36,7 @@ export function ServiceMetrics({ agentName }: ServiceMetricsProps) {
         serviceName,
         serviceNodeName,
       },
-      projection: PROJECTION.METRICS,
+      projection: Projection.metrics,
       showCount: false,
     }),
     [serviceName, serviceNodeName]

x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx

@@ -15,7 +15,7 @@ import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import { UNIDENTIFIED_SERVICE_NODES_LABEL } from '../../../../common/i18n';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { ManagedTable, ITableColumn } from '../../shared/ManagedTable';
@@ -46,7 +46,7 @@ function ServiceNodeOverview() {
       params: {
         serviceName,
       },
-      projection: PROJECTION.SERVICE_NODES,
+      projection: Projection.serviceNodes,
     }),
     [serviceName]
   );

x-pack/plugins/apm/public/components/app/ServiceOverview/index.tsx

@@ -15,7 +15,7 @@ import { NoServicesMessage } from './NoServicesMessage';
 import { ServiceList } from './ServiceList';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { useTrackPageview } from '../../../../../observability/public';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 
@@ -88,7 +88,7 @@ export function ServiceOverview() {
   const localFiltersConfig: React.ComponentProps<typeof LocalUIFilters> = useMemo(
     () => ({
       filterNames: ['host', 'agentName'],
-      projection: PROJECTION.SERVICES,
+      projection: Projection.services,
     }),
     []
   );

x-pack/plugins/apm/public/components/app/TraceOverview/index.tsx

@@ -11,7 +11,7 @@ import { TraceList } from './TraceList';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { useTrackPageview } from '../../../../../observability/public';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { APIReturnType } from '../../../services/rest/createCallApmApi';
 
 type TracesAPIResponse = APIReturnType<'/api/apm/traces'>;
@@ -48,7 +48,7 @@ export function TraceOverview() {
   const localUIFiltersConfig = useMemo(() => {
     const config: React.ComponentProps<typeof LocalUIFilters> = {
       filterNames: ['transactionResult', 'host', 'containerId', 'podName'],
-      projection: PROJECTION.TRACES,
+      projection: Projection.traces,
     };
 
     return config;

x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx

@@ -27,7 +27,7 @@ import { FETCH_STATUS } from '../../../hooks/useFetcher';
 import { TransactionBreakdown } from '../../shared/TransactionBreakdown';
 import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
 import { useTrackPageview } from '../../../../../observability/public';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { HeightRetainer } from '../../shared/HeightRetainer';
 import { ErroneousTransactionsRateChart } from '../../shared/charts/ErroneousTransactionsRateChart';
@@ -52,7 +52,7 @@ export function TransactionDetails() {
   const localUIFiltersConfig = useMemo(() => {
     const config: React.ComponentProps<typeof LocalUIFilters> = {
       filterNames: ['transactionResult', 'serviceVersion'],
-      projection: PROJECTION.TRANSACTIONS,
+      projection: Projection.transactions,
       params: {
         transactionName,
         transactionType,

x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx

@@ -35,7 +35,7 @@ import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
 import { useTrackPageview } from '../../../../../observability/public';
 import { fromQuery, toQuery } from '../../shared/Links/url_helpers';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { useServiceTransactionTypes } from '../../../hooks/useServiceTransactionTypes';
 import { TransactionTypeFilter } from '../../shared/LocalUIFilters/TransactionTypeFilter';
@@ -103,7 +103,7 @@ export function TransactionOverview() {
         serviceName,
         transactionType,
       },
-      projection: PROJECTION.TRANSACTION_GROUPS,
+      projection: Projection.transactionGroups,
     }),
     [serviceName, transactionType]
   );

x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx

@@ -9,7 +9,7 @@ import { uniqueId, startsWith } from 'lodash';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import { fromQuery, toQuery } from '../Links/url_helpers';
-// @ts-ignore
+// @ts-expect-error
 import { Typeahead } from './Typeahead';
 import { getBoolFilter } from './get_bool_filter';
 import { useLocation } from '../../../hooks/useLocation';

x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx

@@ -17,10 +17,10 @@ import styled from 'styled-components';
 import { LocalUIFilterName } from '../../../../server/lib/ui_filters/local_ui_filters/config';
 import { Filter } from './Filter';
 import { useLocalUIFilters } from '../../../hooks/useLocalUIFilters';
-import { PROJECTION } from '../../../../common/projections/typings';
+import { Projection } from '../../../../common/projections';
 
 interface Props {
-  projection: PROJECTION;
+  projection: Projection;
   filterNames: LocalUIFilterName[];
   params?: Record<string, string | number | boolean | undefined>;
   showCount?: boolean;

x-pack/plugins/apm/public/components/shared/charts/MetricsChart/index.tsx

@@ -7,7 +7,7 @@ import { EuiTitle } from '@elastic/eui';
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { GenericMetricsChart } from '../../../../../server/lib/metrics/transform_metrics_chart';
-// @ts-ignore
+// @ts-expect-error
 import CustomPlot from '../CustomPlot';
 import {
   asDecimal,

x-pack/plugins/apm/public/context/UrlParamsContext/helpers.ts

@@ -7,10 +7,13 @@
 import { compact, pickBy } from 'lodash';
 import datemath from '@elastic/datemath';
 import { IUrlParams } from './types';
-import { ProcessorEvent } from '../../../common/processor_event';
+import {
+  ProcessorEvent,
+  UIProcessorEvent,
+} from '../../../common/processor_event';
 
 interface PathParams {
-  processorEvent?: ProcessorEvent;
+  processorEvent?: UIProcessorEvent;
   serviceName?: string;
   errorGroupId?: string;
   serviceNodeName?: string;

x-pack/plugins/apm/public/context/UrlParamsContext/types.ts

@@ -6,7 +6,7 @@
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LocalUIFilterName } from '../../../server/lib/ui_filters/local_ui_filters/config';
-import { ProcessorEvent } from '../../../common/processor_event';
+import { UIProcessorEvent } from '../../../common/processor_event';
 
 export type IUrlParams = {
   detailTab?: string;
@@ -32,6 +32,6 @@ export type IUrlParams = {
   pageSize?: number;
   serviceNodeName?: string;
   searchTerm?: string;
-  processorEvent?: ProcessorEvent;
+  processorEvent?: UIProcessorEvent;
   traceIdLink?: string;
 } & Partial<Record<LocalUIFilterName, string>>;

x-pack/plugins/apm/public/hooks/useDynamicIndexPattern.ts

@@ -5,10 +5,10 @@
  */
 
 import { useFetcher } from './useFetcher';
-import { ProcessorEvent } from '../../common/processor_event';
+import { UIProcessorEvent } from '../../common/processor_event';
 
 export function useDynamicIndexPattern(
-  processorEvent: ProcessorEvent | undefined
+  processorEvent: UIProcessorEvent | undefined
 ) {
   const { data, status } = useFetcher(
     (callApmApi) => {

x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts

@@ -17,7 +17,7 @@ import {
 import { history } from '../utils/history';
 import { toQuery, fromQuery } from '../components/shared/Links/url_helpers';
 import { removeUndefinedProps } from '../context/UrlParamsContext/helpers';
-import { PROJECTION } from '../../common/projections/typings';
+import { Projection } from '../../common/projections';
 import { pickKeys } from '../../common/utils/pick_keys';
 import { useCallApi } from './useCallApi';
 
@@ -35,7 +35,7 @@ export function useLocalUIFilters({
   filterNames,
   params,
 }: {
-  projection: PROJECTION;
+  projection: Projection;
   filterNames: LocalUIFilterName[];
   params?: Record<string, string | number | boolean | undefined>;
 }) {

x-pack/plugins/apm/public/utils/testHelpers.tsx

@@ -99,10 +99,9 @@ export function expectTextsInDocument(output: any, texts: string[]) {
 }
 
 interface MockSetup {
-  dynamicIndexPattern: any;
   start: number;
   end: number;
-  client: any;
+  apmEventClient: any;
   internalClient: any;
   config: APMConfig;
   uiFiltersES: ESFilter[];
@@ -148,7 +147,7 @@ export async function inspectSearchParams(
   const mockSetup = {
     start: 1528113600000,
     end: 1528977600000,
-    client: { search: spy } as any,
+    apmEventClient: { search: spy } as any,
     internalClient: { search: spy } as any,
     config: new Proxy({}, { get: () => 'myIndex' }) as APMConfig,
     uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }],