[8.x] [ECO][Inventory v2] APM changes (#202497) (#204524)

# Backport This will backport the following commits from `main` to `8.x`: - [[ECO][Inventory v2] APM changes (#202497)](#202497)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Cauê Marcondes <[email protected]>
elastic · Dec 17, 2024 · ab308aa · ab308aa
1 parent 4e7bca8
commit ab308aa
Show file tree

Hide file tree

Showing 16 changed files with 249 additions and 488 deletions.
diff --git a/x-pack/plugins/observability_solution/apm/kibana.jsonc b/x-pack/plugins/observability_solution/apm/kibana.jsonc
@@ -39,6 +39,7 @@
       "uiActions",
       "logsDataAccess",
       "savedSearch",
+      "entityManager"
     ],
     "optionalPlugins": [
       "actions",

diff --git a/...bservability_solution/apm/public/components/app/entities/entity_link/entity_link.test.tsx b/...bservability_solution/apm/public/components/app/entities/entity_link/entity_link.test.tsx
@@ -173,7 +173,9 @@ describe('Entity link', () => {
     renderEntityLink({
       isEntityCentricExperienceEnabled: true,
       serviceEntitySummaryMockReturnValue: {
-        serviceEntitySummary: { dataStreamTypes: ['metrics'] } as unknown as ServiceEntitySummary,
+        serviceEntitySummary: {
+          ['data_stream.type']: ['metrics'],
+        } as unknown as ServiceEntitySummary,
         serviceEntitySummaryStatus: FETCH_STATUS.SUCCESS,
       },
       hasApmDataFetcherMockReturnValue: {
@@ -200,7 +202,9 @@ describe('Entity link', () => {
     renderEntityLink({
       isEntityCentricExperienceEnabled: true,
       serviceEntitySummaryMockReturnValue: {
-        serviceEntitySummary: { dataStreamTypes: ['metrics'] } as unknown as ServiceEntitySummary,
+        serviceEntitySummary: {
+          ['data_stream.type']: ['metrics'],
+        } as unknown as ServiceEntitySummary,
         serviceEntitySummaryStatus: FETCH_STATUS.SUCCESS,
       },
       hasApmDataFetcherMockReturnValue: {

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/entities/get_entities.ts b/x-pack/plugins/observability_solution/apm/server/routes/entities/get_entities.ts
diff --git a/...k/plugins/observability_solution/apm/server/routes/entities/get_entity_latest_services.ts b/...k/plugins/observability_solution/apm/server/routes/entities/get_entity_latest_services.ts
diff --git a/...lugins/observability_solution/apm/server/routes/entities/services/get_service_entities.ts b/...lugins/observability_solution/apm/server/routes/entities/services/get_service_entities.ts
diff --git a/.../observability_solution/apm/server/routes/entities/services/get_service_entity_summary.ts b/.../observability_solution/apm/server/routes/entities/services/get_service_entity_summary.ts
@@ -5,28 +5,31 @@
  * 2.0.
  */
 
-import type { EntitiesESClient } from '../../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
+import { SERVICE_NAME, AGENT_NAME, SERVICE_ENVIRONMENT } from '@kbn/apm-types';
+import { BUILT_IN_ENTITY_TYPES, DATA_STREAM_TYPE } from '@kbn/observability-shared-plugin/common';
+import moment from 'moment';
+import type { EntityClient } from '@kbn/entityManager-plugin/server/lib/entity_client';
 import { withApmSpan } from '../../../utils/with_apm_span';
-import { getEntityLatestServices } from '../get_entity_latest_services';
 import { mergeEntities } from '../utils/merge_entities';
-import { MAX_NUMBER_OF_SERVICES } from './get_service_entities';
 
 interface Params {
-  entitiesESClient: EntitiesESClient;
+  entityManagerClient: EntityClient;
   serviceName: string;
   environment: string;
 }
 
-export function getServiceEntitySummary({ entitiesESClient, environment, serviceName }: Params) {
+export function getServiceEntitySummary({ entityManagerClient, environment, serviceName }: Params) {
   return withApmSpan('get_service_entity_summary', async () => {
-    const entityLatestServices = await getEntityLatestServices({
-      entitiesESClient,
-      environment,
-      size: MAX_NUMBER_OF_SERVICES,
-      serviceName,
+    const serviceEntitySummary = await entityManagerClient.v2.searchEntities({
+      start: moment().subtract(15, 'm').toISOString(),
+      end: moment().toISOString(),
+      type: BUILT_IN_ENTITY_TYPES.SERVICE_V2,
+      filters: [`${SERVICE_NAME}: "${serviceName}"`],
+      limit: 1,
+      metadata_fields: [DATA_STREAM_TYPE, AGENT_NAME, SERVICE_ENVIRONMENT],
     });
 
-    const serviceEntity = mergeEntities({ entities: entityLatestServices });
+    const serviceEntity = mergeEntities({ entities: serviceEntitySummary?.entities });
     return serviceEntity[0];
   });
 }
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts b/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts
@@ -6,10 +6,8 @@
  */
 import * as t from 'io-ts';
 import { environmentQuery } from '../../../../common/utils/environment_query';
-import { createEntitiesESClient } from '../../../lib/helpers/create_es_client/create_entities_es_client/create_entities_es_client';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
 import { environmentRt, kueryRt, rangeRt } from '../../default_api_types';
-import { getServiceEntities } from './get_service_entities';
 import { getServiceEntitySummary } from './get_service_entity_summary';
 
 const serviceEntitiesSummaryRoute = createApmServerRoute({
@@ -20,52 +18,20 @@ const serviceEntitiesSummaryRoute = createApmServerRoute({
   }),
   security: { authz: { requiredPrivileges: ['apm'] } },
   async handler(resources) {
-    const { context, params, request } = resources;
-    const coreContext = await context.core;
-
-    const entitiesESClient = await createEntitiesESClient({
-      request,
-      esClient: coreContext.elasticsearch.client.asCurrentUser,
-    });
+    const { params, request, plugins } = resources;
+    const entityManagerStart = await plugins.entityManager.start();
 
+    const entityManagerClient = await entityManagerStart.getScopedClient({ request });
     const { serviceName } = params.path;
     const { environment } = params.query;
 
-    return getServiceEntitySummary({
-      entitiesESClient,
+    const serviceEntitySummary = await getServiceEntitySummary({
+      entityManagerClient,
       serviceName,
       environment,
     });
-  },
-});
-
-const servicesEntitiesRoute = createApmServerRoute({
-  endpoint: 'GET /internal/apm/entities/services',
-  params: t.type({
-    query: t.intersection([environmentRt, kueryRt, rangeRt]),
-  }),
-  security: { authz: { requiredPrivileges: ['apm'] } },
-  async handler(resources) {
-    const { context, params, request } = resources;
-    const coreContext = await context.core;
-
-    const entitiesESClient = await createEntitiesESClient({
-      request,
-      esClient: coreContext.elasticsearch.client.asCurrentUser,
-    });
-
-    const { start, end, kuery, environment } = params.query;
-
-    const services = await getServiceEntities({
-      entitiesESClient,
-      start,
-      end,
-      kuery,
-      environment,
-      logger: resources.logger,
-    });
 
-    return { services };
+    return serviceEntitySummary;
   },
 });
 
@@ -137,7 +103,6 @@ const serviceLogErrorRateTimeseriesRoute = createApmServerRoute({
 });
 
 export const servicesEntitiesRoutesRepository = {
-  ...servicesEntitiesRoute,
   ...serviceLogRateTimeseriesRoute,
   ...serviceLogErrorRateTimeseriesRoute,
   ...serviceEntitiesSummaryRoute,

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/entities/types.ts b/x-pack/plugins/observability_solution/apm/server/routes/entities/types.ts
@@ -4,28 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
+import type { EntityMetadata, EntityV2 } from '@kbn/entities-schema';
 
 export enum EntityType {
   SERVICE = 'service',
 }
 
-export interface EntityLatestServiceRaw {
-  agent: {
-    name: AgentName[];
-  };
-  source_data_stream: {
-    type: string[];
-  };
-  service: {
-    name: string;
-    environment?: string;
-  };
-  entity: Entity;
-}
-
-interface Entity {
-  id: string;
-  last_seen_timestamp: string;
-  identity_fields: string[];
-}
+export type EntityLatestServiceRaw = EntityV2 & EntityMetadata;