Move ui_filters API endpoints

x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx

@@ -25,7 +25,7 @@ export default {
         core: {
           http: {
             get: (endpoint: string) => {
-              if (endpoint === '/api/apm/ui_filters/environments') {
+              if (endpoint === '/api/apm/environments') {
                 return Promise.resolve(['production']);
               } else {
                 return Promise.resolve({

x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts

@@ -10,11 +10,11 @@ import { useHistory } from 'react-router-dom';
 import { LocalUIFilterName } from '../../../../../common/ui_filter';
 import { pickKeys } from '../../../../../common/utils/pick_keys';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LocalUIFiltersAPIResponse } from '../../../../../server/lib/ui_filters/local_ui_filters';
+import { LocalUIFiltersAPIResponse } from '../../../../../server/lib/rum_client/ui_filters/local_ui_filters';
 import {
   localUIFilters,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../server/lib/ui_filters/local_ui_filters/config';
+} from '../../../../../server/lib/rum_client/ui_filters/local_ui_filters/config';
 import {
   fromQuery,
   toQuery,
@@ -72,7 +72,7 @@ export function useLocalUIFilters({
     (callApmApi) => {
       if (shouldFetch && urlParams.start && urlParams.end) {
         return callApmApi({
-          endpoint: `GET /api/apm/ui_filters/local_filters/rumOverview`,
+          endpoint: 'GET /api/apm/rum/local_filters',
           params: {
             query: {
               uiFilters: JSON.stringify(uiFilters),

x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts

@@ -9,7 +9,7 @@ import { Location } from 'history';
 import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
 import { pickKeys } from '../../../common/utils/pick_keys';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { localUIFilterNames } from '../../../server/lib/ui_filters/local_ui_filters/config';
+import { localUIFilterNames } from '../../../server/lib/rum_client/ui_filters/local_ui_filters/config';
 import { toQuery } from '../../components/shared/Links/url_helpers';
 import { TimeRangeComparisonType } from '../../components/shared/time_comparison/get_time_range_comparison';
 import {

x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx

@@ -18,7 +18,7 @@ import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 import { LocalUIFilterName } from '../../../common/ui_filter';
 import { pickKeys } from '../../../common/utils/pick_keys';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { localUIFilterNames } from '../../../server/lib/ui_filters/local_ui_filters/config';
+import { localUIFilterNames } from '../../../server/lib/rum_client/ui_filters/local_ui_filters/config';
 import { UIFilters } from '../../../typings/ui_filters';
 import { useDeepObjectIdentity } from '../../hooks/useDeepObjectIdentity';
 import { getDateRange } from './helpers';

x-pack/plugins/apm/public/hooks/use_environments_fetcher.tsx

@@ -36,7 +36,7 @@ export function useEnvironmentsFetcher({
     (callApmApi) => {
       if (start && end) {
         return callApmApi({
-          endpoint: 'GET /api/apm/ui_filters/environments',
+          endpoint: 'GET /api/apm/environments',
           params: {
             query: {
               start,

x-pack/plugins/apm/server/lib/environments/get_all_environments.ts

@@ -15,6 +15,10 @@ import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_valu
 import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
 import { withApmSpan } from '../../utils/with_apm_span';
 
+/**
+ * This is used for getting *all* environments, and does not filter by range.
+ * It's used in places where we get the list of all possible environments.
+ */
 export async function getAllEnvironments({
   serviceName,
   setup,

x-pack/plugins/apm/server/lib/ui_filters/queries.test.ts → x-pack/plugins/apm/server/lib/environments/get_environments.test.ts

@@ -11,7 +11,7 @@ import {
   inspectSearchParams,
 } from '../../utils/test_helpers';
 
-describe('ui filter queries', () => {
+describe('getEnvironments', () => {
   let mock: SearchParamsMock;
 
   afterEach(() => {

x-pack/plugins/apm/server/lib/ui_filters/get_environments.ts → x-pack/plugins/apm/server/lib/environments/get_environments.ts

@@ -17,6 +17,10 @@ import { withApmSpan } from '../../utils/with_apm_span';
 import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
+/**
+ * This is used for getting the list of environments for the environments selector,
+ * filtered by range.
+ */
 export async function getEnvironments({
   setup,
   serviceName,

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

@@ -11,7 +11,7 @@ import { getEnvironmentUiFilterES } from './get_environment_ui_filter_es';
 import {
   localUIFilters,
   localUIFilterNames,
-} from '../../ui_filters/local_ui_filters/config';
+} from '../../rum_client/ui_filters/local_ui_filters/config';
 import { esKuery } from '../../../../../../../src/plugins/data/server';
 
 export function getEsFilter(uiFilters: UIFilters) {

x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts → x-pack/plugins/apm/server/lib/rum_client/ui_filters/local_ui_filters/config.ts

@@ -5,7 +5,10 @@
  * 2.0.
  */
 
-import { filtersByName, LocalUIFilterName } from '../../../../common/ui_filter';
+import {
+  filtersByName,
+  LocalUIFilterName,
+} from '../../../../../common/ui_filter';
 
 export interface LocalUIFilter {
   name: LocalUIFilterName;

x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts → x-pack/plugins/apm/server/lib/rum_client/ui_filters/local_ui_filters/get_local_filter_query.ts

@@ -6,12 +6,12 @@
  */
 
 import { omit } from 'lodash';
-import { mergeProjection } from '../../../projections/util/merge_projection';
-import { Projection } from '../../../projections/typings';
-import { UIFilters } from '../../../../typings/ui_filters';
-import { getEsFilter } from '../../helpers/convert_ui_filters/get_es_filter';
+import { mergeProjection } from '../../../../projections/util/merge_projection';
+import { Projection } from '../../../../projections/typings';
+import { UIFilters } from '../../../../../typings/ui_filters';
+import { getEsFilter } from '../../../helpers/convert_ui_filters/get_es_filter';
 import { localUIFilters } from './config';
-import { LocalUIFilterName } from '../../../../common/ui_filter';
+import { LocalUIFilterName } from '../../../../../common/ui_filter';
 
 export const getLocalFilterQuery = ({
   uiFilters,

x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts → x-pack/plugins/apm/server/lib/rum_client/ui_filters/local_ui_filters/index.test.ts

@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { getLocalUIFilters } from './';
+import { getLocalUIFilters } from '.';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../utils/test_helpers';
-import { getServicesProjection } from '../../../projections/services';
+} from '../../../../utils/test_helpers';
+import { getServicesProjection } from '../../../../projections/services';
 
-describe('local ui filter queries', () => {
+describe('getLocalUIFilters', () => {
   let mock: SearchParamsMock;
 
   beforeEach(() => {
-    jest.mock('../../helpers/convert_ui_filters/get_es_filter', () => {
+    jest.mock('../../../helpers/convert_ui_filters/get_es_filter', () => {
       return [];
     });
   });

x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts → x-pack/plugins/apm/server/lib/rum_client/ui_filters/local_ui_filters/index.ts

@@ -6,14 +6,14 @@
  */
 
 import { cloneDeep, orderBy } from 'lodash';
-import { UIFilters } from '../../../../typings/ui_filters';
-import { Projection } from '../../../projections/typings';
-import { PromiseReturnType } from '../../../../../observability/typings/common';
+import { UIFilters } from '../../../../../typings/ui_filters';
+import { Projection } from '../../../../projections/typings';
+import { PromiseReturnType } from '../../../../../../observability/typings/common';
 import { getLocalFilterQuery } from './get_local_filter_query';
-import { Setup } from '../../helpers/setup_request';
+import { Setup } from '../../../helpers/setup_request';
 import { localUIFilters } from './config';
-import { LocalUIFilterName } from '../../../../common/ui_filter';
-import { withApmSpan } from '../../../utils/with_apm_span';
+import { LocalUIFilterName } from '../../../../../common/ui_filter';
+import { withApmSpan } from '../../../../utils/with_apm_span';
 
 export type LocalUIFiltersAPIResponse = PromiseReturnType<
   typeof getLocalUIFilters

x-pack/plugins/apm/server/routes/create_apm_api.ts

@@ -11,6 +11,7 @@ import {
   apmIndexPatternTitleRoute,
 } from './index_pattern';
 import { createApi } from './create_api';
+import { environmentsRoute } from './environments';
 import {
   errorDistributionRoute,
   errorGroupsRoute,
@@ -66,10 +67,6 @@ import {
   transactionThroughputChatsRoute,
   transactionGroupsComparisonStatisticsRoute,
 } from './transactions';
-import {
-  rumOverviewLocalFiltersRoute,
-  uiFiltersEnvironmentsRoute,
-} from './ui_filters';
 import { serviceMapRoute, serviceMapServiceNodeRoute } from './service_map';
 import {
   createCustomLinkRoute,
@@ -92,6 +89,7 @@ import {
   rumClientMetricsRoute,
   rumJSErrors,
   rumLongTaskMetrics,
+  rumOverviewLocalFiltersRoute,
   rumPageLoadDistBreakdownRoute,
   rumPageLoadDistributionRoute,
   rumPageViewsTrendRoute,
@@ -113,6 +111,9 @@ const createApmApi = () => {
     .add(dynamicIndexPatternRoute)
     .add(apmIndexPatternTitleRoute)
 
+    // Environments
+    .add(environmentsRoute)
+
     // Errors
     .add(errorDistributionRoute)
     .add(errorGroupsRoute)
@@ -170,9 +171,6 @@ const createApmApi = () => {
     .add(transactionThroughputChatsRoute)
     .add(transactionGroupsComparisonStatisticsRoute)
 
-    // UI filters
-    .add(uiFiltersEnvironmentsRoute)
-
     // Service map
     .add(serviceMapRoute)
     .add(serviceMapServiceNodeRoute)

x-pack/plugins/apm/server/routes/environments.ts

@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as t from 'io-ts';
+import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
+import { setupRequest } from '../lib/helpers/setup_request';
+import { getEnvironments } from '../lib/environments/get_environments';
+import { createRoute } from './create_route';
+import { rangeRt } from './default_api_types';
+
+export const environmentsRoute = createRoute({
+  endpoint: 'GET /api/apm/environments',
+  params: t.type({
+    query: t.intersection([
+      t.partial({
+        serviceName: t.string,
+      }),
+      rangeRt,
+    ]),
+  }),
+  options: { tags: ['access:apm'] },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    const { serviceName } = context.params.query;
+    const searchAggregatedTransactions = await getSearchAggregatedTransactions(
+      setup
+    );
+
+    return getEnvironments({
+      setup,
+      serviceName,
+      searchAggregatedTransactions,
+    });
+  },
+});