Always use ProcessorEvent.metric and fix router link in backend popover

smith · smith · commit fa5fdbda0ede · 2021-08-04T08:50:53.000-05:00
diff --git a/x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx
@@ -17,7 +17,7 @@ import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { StatsList } from './stats_list';
 
 export function BackendContents({ nodeData }: ContentsProps) {
-  const { query } = useApmParams('/service-map');
+  const { query } = useApmParams('*/service-map/*');
   const apmRouter = useApmRouter();
   const {
     urlParams: { environment, start, end },
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts
@@ -13,6 +13,7 @@ import {
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_SUM,
 } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
+import { ProcessorEvent } from '../../../common/processor_event';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
@@ -23,14 +24,12 @@ interface Options {
   setup: Setup & SetupTimeRange;
   environment?: string;
   backendName: string;
-  searchAggregatedTransactions: boolean;
 }
 
 export function getServiceMapBackendNodeInfo({
   environment,
   backendName,
   setup,
-  searchAggregatedTransactions,
 }: Options) {
   return withApmSpan('get_service_map_backend_node_stats', async () => {
     const { apmEventClient, start, end } = setup;
@@ -39,11 +38,7 @@ export function getServiceMapBackendNodeInfo({
       'get_service_map_backend_node_stats',
       {
         apm: {
-          events: [
-            getProcessorEventForAggregatedTransactions(
-              searchAggregatedTransactions
-            ),
-          ],
+          events: [ProcessorEvent.metric],
         },
         body: {
           size: 0,
diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts
@@ -126,15 +126,10 @@ const serviceMapBackendNodeRoute = createApmServerRoute({
       query: { environment },
     } = params;
 
-    const searchAggregatedTransactions = await getSearchAggregatedTransactions(
-      setup
-    );
-
     return getServiceMapBackendNodeInfo({
       environment,
       setup,
       backendName,
-      searchAggregatedTransactions,
     });
   },
 });
