[APM] Include error documents in fallback query for services (elastic…

…#123554)

Co-authored-by: Kibana Machine <[email protected]>

x-pack/plugins/apm/server/routes/services/get_services/get_services_from_metric_documents.ts → x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts

@@ -16,7 +16,7 @@ import { environmentQuery } from '../../../../common/utils/environment_query';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { Setup } from '../../../lib/helpers/setup_request';
 
-export async function getServicesFromMetricDocuments({
+export async function getServicesFromErrorAndMetricDocuments({
   environment,
   setup,
   maxNumServices,
@@ -34,10 +34,10 @@ export async function getServicesFromMetricDocuments({
   const { apmEventClient } = setup;
 
   const response = await apmEventClient.search(
-    'get_services_from_metric_documents',
+    'get_services_from_error_and_metric_documents',
     {
       apm: {
-        events: [ProcessorEvent.metric],
+        events: [ProcessorEvent.metric, ProcessorEvent.error],
       },
       body: {
         size: 0,

x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts

@@ -9,7 +9,7 @@ import { Logger } from '@kbn/logging';
 import { withApmSpan } from '../../../utils/with_apm_span';
 import { Setup } from '../../../lib/helpers/setup_request';
 import { getHealthStatuses } from './get_health_statuses';
-import { getServicesFromMetricDocuments } from './get_services_from_metric_documents';
+import { getServicesFromErrorAndMetricDocuments } from './get_services_from_error_and_metric_documents';
 import { getServiceTransactionStats } from './get_service_transaction_stats';
 import { mergeServiceStats } from './merge_service_stats';
 
@@ -45,19 +45,22 @@ export async function getServicesItems({
       end,
     };
 
-    const [transactionStats, servicesFromMetricDocuments, healthStatuses] =
-      await Promise.all([
-        getServiceTransactionStats(params),
-        getServicesFromMetricDocuments(params),
-        getHealthStatuses(params).catch((err) => {
-          logger.error(err);
-          return [];
-        }),
-      ]);
+    const [
+      transactionStats,
+      servicesFromErrorAndMetricDocuments,
+      healthStatuses,
+    ] = await Promise.all([
+      getServiceTransactionStats(params),
+      getServicesFromErrorAndMetricDocuments(params),
+      getHealthStatuses(params).catch((err) => {
+        logger.error(err);
+        return [];
+      }),
+    ]);
 
     return mergeServiceStats({
       transactionStats,
-      servicesFromMetricDocuments,
+      servicesFromErrorAndMetricDocuments,
       healthStatuses,
     });
   });

x-pack/plugins/apm/server/routes/services/get_services/merge_service_stats.test.ts

@@ -40,7 +40,7 @@ describe('mergeServiceStats', () => {
             throughput: 4,
           }),
         ],
-        servicesFromMetricDocuments: [
+        servicesFromErrorAndMetricDocuments: [
           {
             environments: ['production'],
             serviceName: 'opbeans-java',
@@ -86,7 +86,7 @@ describe('mergeServiceStats', () => {
             environments: ['staging'],
           }),
         ],
-        servicesFromMetricDocuments: [
+        servicesFromErrorAndMetricDocuments: [
           {
             environments: ['production'],
             serviceName: 'opbeans-java',
@@ -128,7 +128,7 @@ describe('mergeServiceStats', () => {
             environments: ['staging'],
           }),
         ],
-        servicesFromMetricDocuments: [],
+        servicesFromErrorAndMetricDocuments: [],
         healthStatuses: [
           {
             healthStatus: ServiceHealthStatus.healthy,
@@ -158,7 +158,7 @@ describe('mergeServiceStats', () => {
             environments: ['staging'],
           }),
         ],
-        servicesFromMetricDocuments: [
+        servicesFromErrorAndMetricDocuments: [
           {
             environments: ['production'],
             serviceName: 'opbeans-java',

x-pack/plugins/apm/server/routes/services/get_services/merge_service_stats.ts

@@ -8,27 +8,28 @@ import { uniq } from 'lodash';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
 import { joinByKey } from '../../../../common/utils/join_by_key';
 import { getHealthStatuses } from './get_health_statuses';
-import { getServicesFromMetricDocuments } from './get_services_from_metric_documents';
+import { getServicesFromErrorAndMetricDocuments } from './get_services_from_error_and_metric_documents';
 import { getServiceTransactionStats } from './get_service_transaction_stats';
 
 export function mergeServiceStats({
   transactionStats,
-  servicesFromMetricDocuments,
+  servicesFromErrorAndMetricDocuments,
   healthStatuses,
 }: {
   transactionStats: Awaited<ReturnType<typeof getServiceTransactionStats>>;
-  servicesFromMetricDocuments: Awaited<
-    ReturnType<typeof getServicesFromMetricDocuments>
+  servicesFromErrorAndMetricDocuments: Awaited<
+    ReturnType<typeof getServicesFromErrorAndMetricDocuments>
   >;
   healthStatuses: Awaited<ReturnType<typeof getHealthStatuses>>;
 }) {
   const foundServiceNames = transactionStats.map(
     ({ serviceName }) => serviceName
   );
 
-  const servicesWithOnlyMetricDocuments = servicesFromMetricDocuments.filter(
-    ({ serviceName }) => !foundServiceNames.includes(serviceName)
-  );
+  const servicesWithOnlyMetricDocuments =
+    servicesFromErrorAndMetricDocuments.filter(
+      ({ serviceName }) => !foundServiceNames.includes(serviceName)
+    );
 
   const allServiceNames = foundServiceNames.concat(
     servicesWithOnlyMetricDocuments.map(({ serviceName }) => serviceName)
@@ -43,7 +44,7 @@ export function mergeServiceStats({
   return joinByKey(
     asMutableArray([
       ...transactionStats,
-      ...servicesFromMetricDocuments,
+      ...servicesFromErrorAndMetricDocuments,
       ...matchedHealthStatuses,
     ] as const),
     'serviceName',

x-pack/test/apm_api_integration/tests/services/top_services.spec.ts

@@ -64,6 +64,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       const transactionInterval = range.interval('1s');
       const metricInterval = range.interval('30s');
 
+      const errorInterval = range.interval('5s');
+
       const multipleEnvServiceProdInstance = apm
         .service('multiple-env-service', 'production', 'go')
         .instance('multiple-env-service-production');
@@ -76,6 +78,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         .service('metric-only-service', 'production', 'java')
         .instance('metric-only-production');
 
+      const errorOnlyInstance = apm
+        .service('error-only-service', 'production', 'java')
+        .instance('error-only-production');
+
       const config = {
         multiple: {
           prod: {
@@ -132,6 +138,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               .timestamp(timestamp)
               .serialize(),
           ]),
+          ...errorInterval
+            .rate(1)
+            .flatMap((timestamp) => [
+              ...errorOnlyInstance.error('Foo').timestamp(timestamp).serialize(),
+            ]),
         ]);
       });
 
@@ -185,6 +196,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           const serviceNames = response.body.items.map((item) => item.serviceName);
 
           expect(serviceNames).to.contain('metric-only-service');
+
+          expect(serviceNames).to.contain('error-only-service');
         });
       });