Move Elasticsearch type definitions out of APM (elastic#83081)

...and into x-pack.

Also remove `PromiseReturnType` from APM and use the copy in observability everywhere.

All of the additional changes to APM imports are just automatic sorting.

This makes doing elastic#77720 a little easier and removes some implicit circular dependencies for elastic#80508.

Co-authored-by: Dario Gieselaar <dario.gieselaar@elastic.co>
# Conflicts:
#	x-pack/plugins/apm/public/utils/testHelpers.tsx

x-pack/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,
@@ -12,7 +13,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { UIProcessorEvent } from '../../../../common/processor_event';
-import { ESFilter } from '../../../../typings/elasticsearch';
 import { IUrlParams } from '../../../context/UrlParamsContext/types';
 
 export function getBoolFilter({

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

@@ -6,25 +6,25 @@
 
 /* global jest */
 
-import React from 'react';
-import { ReactWrapper, mount, MountRendererProps } from 'enzyme';
+import { render, waitFor } from '@testing-library/react';
+import { mount, MountRendererProps, ReactWrapper } from 'enzyme';
 import enzymeToJson from 'enzyme-to-json';
 import { Location } from 'history';
 import moment from 'moment';
 import { Moment } from 'moment-timezone';
-import { render, waitFor } from '@testing-library/react';
+import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { APMConfig } from '../../server';
-import { PromiseReturnType } from '../../typings/common';
-import { EuiThemeProvider } from '../../../observability/public';
 import {
   ESFilter,
-  ESSearchResponse,
   ESSearchRequest,
-} from '../../typings/elasticsearch';
-import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
+  ESSearchResponse,
+} from '../../../../typings/elasticsearch';
+import { EuiThemeProvider } from '../../../observability/public';
+import { PromiseReturnType } from '../../../observability/typings/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { APMConfig } from '../../server';
 import { UIFilters } from '../../typings/ui_filters';
+import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
 import { UrlParamsProvider } from '../context/UrlParamsContext';
 
 const originalConsoleWarn = console.warn; // eslint-disable-line no-console

x-pack/plugins/apm/scripts/shared/get_es_client.ts

@@ -6,7 +6,10 @@
 
 import { Client } from '@elastic/elasticsearch';
 import { ApiKeyAuth, BasicAuth } from '@elastic/elasticsearch/lib/pool';
-import { ESSearchResponse, ESSearchRequest } from '../../typings/elasticsearch';
+import {
+  ESSearchResponse,
+  ESSearchRequest,
+} from '../../../../typings/elasticsearch';
 
 export type ESClient = ReturnType<typeof getEsClient>;
 

x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts

@@ -9,6 +9,7 @@ import { isEmpty } from 'lodash';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { APMConfig } from '../..';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
 import { AlertingPlugin } from '../../../../alerts/server';
 import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
 import {
@@ -17,7 +18,6 @@ import {
   SERVICE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { ESSearchResponse } from '../../../typings/elasticsearch';
 import { getEnvironmentUiFilterES } from '../helpers/convert_ui_filters/get_environment_ui_filter_es';
 import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';

x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts

@@ -7,21 +7,21 @@
 import { schema } from '@kbn/config-schema';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { getDurationFormatter } from '../../../common/utils/formatters';
-import { ProcessorEvent } from '../../../common/processor_event';
+import { APMConfig } from '../..';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
+import { AlertingPlugin } from '../../../../alerts/server';
 import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
-import { ESSearchResponse } from '../../../typings/elasticsearch';
 import {
   PROCESSOR_EVENT,
+  SERVICE_ENVIRONMENT,
   SERVICE_NAME,
-  TRANSACTION_TYPE,
   TRANSACTION_DURATION,
-  SERVICE_ENVIRONMENT,
+  TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
-import { AlertingPlugin } from '../../../../alerts/server';
-import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
-import { APMConfig } from '../..';
+import { ProcessorEvent } from '../../../common/processor_event';
+import { getDurationFormatter } from '../../../common/utils/formatters';
 import { getEnvironmentUiFilterES } from '../helpers/convert_ui_filters/get_environment_ui_filter_es';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 
 interface RegisterAlertParams {

x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts

@@ -5,25 +5,25 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { isEmpty } from 'lodash';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { isEmpty } from 'lodash';
-import { asDecimalOrInteger } from '../../../common/utils/formatters';
-import { ProcessorEvent } from '../../../common/processor_event';
-import { EventOutcome } from '../../../common/event_outcome';
+import { APMConfig } from '../..';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
+import { AlertingPlugin } from '../../../../alerts/server';
 import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
-import { ESSearchResponse } from '../../../typings/elasticsearch';
 import {
+  EVENT_OUTCOME,
   PROCESSOR_EVENT,
+  SERVICE_ENVIRONMENT,
   SERVICE_NAME,
   TRANSACTION_TYPE,
-  EVENT_OUTCOME,
-  SERVICE_ENVIRONMENT,
 } from '../../../common/elasticsearch_fieldnames';
-import { AlertingPlugin } from '../../../../alerts/server';
-import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
-import { APMConfig } from '../..';
+import { EventOutcome } from '../../../common/event_outcome';
+import { ProcessorEvent } from '../../../common/processor_event';
+import { asDecimalOrInteger } from '../../../common/utils/formatters';
 import { getEnvironmentUiFilterES } from '../helpers/convert_ui_filters/get_environment_ui_filter_es';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 
 interface RegisterAlertParams {

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts

@@ -9,7 +9,7 @@ import { IndicesStatsParams, Client } from 'elasticsearch';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../typings/elasticsearch';
+} from '../../../../../../typings/elasticsearch';
 import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
 import { tasks } from './tasks';
 import { APMDataTelemetry } from '../types';

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts

@@ -5,7 +5,7 @@
  */
 import { ValuesType } from 'utility-types';
 import { flatten, merge, sortBy, sum, pickBy } from 'lodash';
-import { AggregationOptionsByType } from '../../../../typings/elasticsearch/aggregations';
+import { AggregationOptionsByType } from '../../../../../../typings/elasticsearch/aggregations';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { TelemetryTask } from '.';
 import { AGENT_NAMES, RUM_AGENT_NAMES } from '../../../../common/agent_name';

x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts

@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ProcessorEvent } from '../../../../common/processor_event';
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import {
   ERROR_GROUP_ID,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
+import { ProcessorEvent } from '../../../../common/processor_event';
 import { rangeFilter } from '../../../../common/utils/range_filter';
 import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 

x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PromiseReturnType } from '../../../../typings/common';
+import { PromiseReturnType } from '../../../../../observability/typings/common';
 import { Setup, SetupTimeRange } from '../../helpers/setup_request';
-import { getBuckets } from './get_buckets';
 import { BUCKET_TARGET_COUNT } from '../../transactions/constants';
+import { getBuckets } from './get_buckets';
 
 function getBucketSize({ start, end }: SetupTimeRange) {
   return Math.floor((end - start) / BUCKET_TARGET_COUNT);

x-pack/plugins/apm/server/lib/errors/get_error_group.ts

@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ProcessorEvent } from '../../../common/processor_event';
+import { PromiseReturnType } from '../../../../observability/typings/common';
 import {
   ERROR_GROUP_ID,
   SERVICE_NAME,
   TRANSACTION_SAMPLED,
 } from '../../../common/elasticsearch_fieldnames';
-import { PromiseReturnType } from '../../../typings/common';
+import { ProcessorEvent } from '../../../common/processor_event';
 import { rangeFilter } from '../../../common/utils/range_filter';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getTransaction } from '../transactions/get_transaction';

x-pack/plugins/apm/server/lib/errors/get_error_groups.ts

@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { SortOptions } from '../../../../../typings/elasticsearch/aggregations';
+import { PromiseReturnType } from '../../../../observability/typings/common';
 import {
   ERROR_CULPRIT,
   ERROR_EXC_HANDLED,
@@ -12,11 +14,9 @@ import {
   ERROR_GROUP_ID,
   ERROR_LOG_MESSAGE,
 } from '../../../common/elasticsearch_fieldnames';
-import { PromiseReturnType } from '../../../typings/common';
-import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getErrorGroupsProjection } from '../../projections/errors';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import { SortOptions } from '../../../typings/elasticsearch/aggregations';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
 export type ErrorGroupListAPIResponse = PromiseReturnType<
   typeof getErrorGroups

x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import {
   ENVIRONMENT_NOT_DEFINED,
   ENVIRONMENT_ALL,

x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 import { UIFilters } from '../../../../typings/ui_filters';
 import { getEnvironmentUiFilterES } from './get_environment_ui_filter_es';
 import {

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/add_filter_to_exclude_legacy_data.ts

@@ -9,7 +9,7 @@ import { OBSERVER_VERSION_MAJOR } from '../../../../../common/elasticsearch_fiel
 import {
   ESSearchRequest,
   ESFilter,
-} from '../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 
 /*
   Adds a range query to the ES request to exclude legacy data

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts

@@ -14,7 +14,7 @@ import { ProcessorEvent } from '../../../../../common/processor_event';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 import { ApmIndicesConfig } from '../../../settings/apm_indices/get_apm_indices';
 import { addFilterToExcludeLegacyData } from './add_filter_to_exclude_legacy_data';
 import { callClientWithDebug } from '../call_client_with_debug';

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts

@@ -10,7 +10,7 @@ import { ProcessorEvent } from '../../../../../common/processor_event';
 import {
   ESSearchRequest,
   ESFilter,
-} from '../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 import { APMEventESSearchRequest } from '.';
 import {
   ApmIndicesConfig,

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts

@@ -15,7 +15,7 @@ import { APMRequestHandlerContext } from '../../../../routes/typings';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../../typings/elasticsearch';
+} from '../../../../../../../typings/elasticsearch';
 import { callClientWithDebug } from '../call_client_with_debug';
 
 // `type` was deprecated in 7.0

x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { CoreSetup } from 'src/core/server';
-import { PromiseReturnType } from '../../../typings/common';
+import { PromiseReturnType } from '../../../../observability/typings/common';
 
 export type InternalSavedObjectsClient = PromiseReturnType<
   typeof getInternalSavedObjectsClient

x-pack/plugins/apm/server/lib/helpers/setup_request.ts

@@ -4,20 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import moment from 'moment';
 import { Logger } from 'kibana/server';
-import { isActivePlatinumLicense } from '../../../common/service_map';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
-import { KibanaRequest } from '../../../../../../src/core/server';
+import moment from 'moment';
 import { APMConfig } from '../..';
+import { KibanaRequest } from '../../../../../../src/core/server';
+import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
+import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ProcessorEvent } from '../../../common/processor_event';
+import { isActivePlatinumLicense } from '../../../common/service_map';
+import { UIFilters } from '../../../typings/ui_filters';
+import { APMRequestHandlerContext } from '../../routes/typings';
 import {
-  getApmIndices,
   ApmIndicesConfig,
+  getApmIndices,
 } from '../settings/apm_indices/get_apm_indices';
-import { ESFilter } from '../../../typings/elasticsearch';
 import { getEsFilter } from './convert_ui_filters/get_es_filter';
-import { APMRequestHandlerContext } from '../../routes/typings';
-import { ProcessorEvent } from '../../../common/processor_event';
 import {
   APMEventClient,
   createApmEventClient,
@@ -26,7 +27,6 @@ import {
   APMInternalClient,
   createInternalESClient,
 } from './create_es_client/create_internal_es_client';
-import { UIFilters } from '../../../typings/ui_filters';
 
 // Explicitly type Setup to prevent TS initialization errors
 // https://github.com/microsoft/TypeScript/issues/34933

x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts

@@ -9,7 +9,7 @@ import { EventOutcome } from '../../../common/event_outcome';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../typings/elasticsearch/aggregations';
+} from '../../../../../typings/elasticsearch/aggregations';
 import { getTransactionDurationFieldForAggregatedTransactions } from './aggregated_transactions';
 
 export function getOutcomeAggregation({

x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts

@@ -4,15 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Unionize, Overwrite } from 'utility-types';
-import { Setup, SetupTimeRange } from '../helpers/setup_request';
-import { getMetricsDateHistogramParams } from '../helpers/metrics';
-import { ChartBase } from './types';
-import { transformDataToMetricsChart } from './transform_metrics_chart';
+import { Overwrite, Unionize } from 'utility-types';
+import { AggregationOptionsByType } from '../../../../../typings/elasticsearch';
 import { getMetricsProjection } from '../../projections/metrics';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations';
 import { APMEventESSearchRequest } from '../helpers/create_es_client/create_apm_event_client';
+import { getMetricsDateHistogramParams } from '../helpers/metrics';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
+import { transformDataToMetricsChart } from './transform_metrics_chart';
+import { ChartBase } from './types';
 
 type MetricsAggregationMap = Unionize<{
   min: AggregationOptionsByType['min'];

x-pack/plugins/apm/server/lib/metrics/transform_metrics_chart.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { ChartBase } from './types';
-import { ESSearchResponse } from '../../../typings/elasticsearch';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
 import { getVizColorForIndex } from '../../../common/viz_colors';
 import { GenericMetricsRequest } from './fetch_and_transform_metrics';
+import { ChartBase } from './types';
 
 export type GenericMetricsChart = ReturnType<
   typeof transformDataToMetricsChart