chore(slo): refactor transform generators and managers dependency inj…

…ection (#201031)
elastic · Nov 22, 2024 · 2046663 · 2046663
1 parent 455a075
commit 2046663
Show file tree

Hide file tree

Showing 23 changed files with 620 additions and 655 deletions.
diff --git a/x-pack/plugins/observability_solution/slo/server/routes/slo/route.ts b/x-pack/plugins/observability_solution/slo/server/routes/slo/route.ts
@@ -29,7 +29,6 @@ import {
   updateSLOParamsSchema,
 } from '@kbn/slo-schema';
 import { getOverviewParamsSchema } from '@kbn/slo-schema/src/rest_specs/routes/get_overview';
-import type { IndicatorTypes } from '../../domain/models';
 import { executeWithErrorHandler } from '../../errors';
 import {
   CreateSLO,
@@ -60,29 +59,10 @@ import { SloDefinitionClient } from '../../services/slo_definition_client';
 import { getSloSettings, storeSloSettings } from '../../services/slo_settings';
 import { DefaultSummarySearchClient } from '../../services/summary_search_client';
 import { DefaultSummaryTransformGenerator } from '../../services/summary_transform_generator/summary_transform_generator';
-import {
-  ApmTransactionDurationTransformGenerator,
-  ApmTransactionErrorRateTransformGenerator,
-  HistogramTransformGenerator,
-  KQLCustomTransformGenerator,
-  MetricCustomTransformGenerator,
-  SyntheticsAvailabilityTransformGenerator,
-  TimesliceMetricTransformGenerator,
-  TransformGenerator,
-} from '../../services/transform_generators';
+import { createTransformGenerators } from '../../services/transform_generators';
 import { createSloServerRoute } from '../create_slo_server_route';
 import { SLORoutesDependencies } from '../types';
 
-const transformGenerators: Record<IndicatorTypes, TransformGenerator> = {
-  'sli.apm.transactionDuration': new ApmTransactionDurationTransformGenerator(),
-  'sli.apm.transactionErrorRate': new ApmTransactionErrorRateTransformGenerator(),
-  'sli.synthetics.availability': new SyntheticsAvailabilityTransformGenerator(),
-  'sli.kql.custom': new KQLCustomTransformGenerator(),
-  'sli.metric.custom': new MetricCustomTransformGenerator(),
-  'sli.histogram.custom': new HistogramTransformGenerator(),
-  'sli.metric.timeslice': new TimesliceMetricTransformGenerator(),
-};
-
 const assertPlatinumLicense = async (plugins: SLORoutesDependencies['plugins']) => {
   const licensing = await plugins.licensing.start();
   const hasCorrectLicense = (await licensing.getLicense()).hasAtLeast('platinum');
@@ -120,14 +100,18 @@ const createSLORoute = createSloServerRoute({
       getSpaceId(plugins, request),
       dataViews.dataViewsServiceFactory(soClient, esClient),
     ]);
-    const transformManager = new DefaultTransformManager(
-      transformGenerators,
-      scopedClusterClient,
-      logger,
+
+    const transformGenerators = createTransformGenerators(
       spaceId,
       dataViewsService,
       sloContext.isServerless
     );
+
+    const transformManager = new DefaultTransformManager(
+      transformGenerators,
+      scopedClusterClient,
+      logger
+    );
     const summaryTransformManager = new DefaultSummaryTransformManager(
       new DefaultSummaryTransformGenerator(),
       scopedClusterClient,
@@ -168,14 +152,17 @@ const inspectSLORoute = createSloServerRoute({
     const soClient = core.savedObjects.client;
     const repository = new KibanaSavedObjectsSLORepository(soClient, logger);
     const dataViewsService = await dataViews.dataViewsServiceFactory(soClient, esClient);
-    const transformManager = new DefaultTransformManager(
-      transformGenerators,
-      scopedClusterClient,
-      logger,
+
+    const transformGenerators = createTransformGenerators(
       spaceId,
       dataViewsService,
       sloContext.isServerless
     );
+    const transformManager = new DefaultTransformManager(
+      transformGenerators,
+      scopedClusterClient,
+      logger
+    );
     const summaryTransformManager = new DefaultSummaryTransformManager(
       new DefaultSummaryTransformGenerator(),
       scopedClusterClient,
@@ -218,14 +205,17 @@ const updateSLORoute = createSloServerRoute({
     const soClient = core.savedObjects.client;
     const dataViewsService = await dataViews.dataViewsServiceFactory(soClient, esClient);
     const repository = new KibanaSavedObjectsSLORepository(soClient, logger);
-    const transformManager = new DefaultTransformManager(
-      transformGenerators,
-      scopedClusterClient,
-      logger,
+
+    const transformGenerators = createTransformGenerators(
       spaceId,
       dataViewsService,
       sloContext.isServerless
     );
+    const transformManager = new DefaultTransformManager(
+      transformGenerators,
+      scopedClusterClient,
+      logger
+    );
     const summaryTransformManager = new DefaultSummaryTransformManager(
       new DefaultSummaryTransformGenerator(),
       scopedClusterClient,
@@ -271,14 +261,16 @@ const deleteSLORoute = createSloServerRoute({
 
     const dataViewsService = await dataViews.dataViewsServiceFactory(soClient, esClient);
 
+    const transformGenerators = createTransformGenerators(
+      spaceId,
+      dataViewsService,
+      sloContext.isServerless
+    );
     const repository = new KibanaSavedObjectsSLORepository(soClient, logger);
     const transformManager = new DefaultTransformManager(
       transformGenerators,
       scopedClusterClient,
-      logger,
-      spaceId,
-      dataViewsService,
-      sloContext.isServerless
+      logger
     );
 
     const summaryTransformManager = new DefaultSummaryTransformManager(
@@ -346,14 +338,18 @@ const enableSLORoute = createSloServerRoute({
     const esClient = core.elasticsearch.client.asCurrentUser;
     const dataViewsService = await dataViews.dataViewsServiceFactory(soClient, esClient);
     const repository = new KibanaSavedObjectsSLORepository(soClient, logger);
-    const transformManager = new DefaultTransformManager(
-      transformGenerators,
-      scopedClusterClient,
-      logger,
+
+    const transformGenerators = createTransformGenerators(
       spaceId,
       dataViewsService,
       sloContext.isServerless
     );
+
+    const transformManager = new DefaultTransformManager(
+      transformGenerators,
+      scopedClusterClient,
+      logger
+    );
     const summaryTransformManager = new DefaultSummaryTransformManager(
       new DefaultSummaryTransformGenerator(),
       scopedClusterClient,
@@ -388,14 +384,17 @@ const disableSLORoute = createSloServerRoute({
     const esClient = core.elasticsearch.client.asCurrentUser;
     const dataViewsService = await dataViews.dataViewsServiceFactory(soClient, esClient);
     const repository = new KibanaSavedObjectsSLORepository(soClient, logger);
-    const transformManager = new DefaultTransformManager(
-      transformGenerators,
-      scopedClusterClient,
-      logger,
+
+    const transformGenerators = createTransformGenerators(
       spaceId,
       dataViewsService,
       sloContext.isServerless
     );
+    const transformManager = new DefaultTransformManager(
+      transformGenerators,
+      scopedClusterClient,
+      logger
+    );
     const summaryTransformManager = new DefaultSummaryTransformManager(
       new DefaultSummaryTransformGenerator(),
       scopedClusterClient,
@@ -430,14 +429,17 @@ const resetSLORoute = createSloServerRoute({
 
     const dataViewsService = await dataViews.dataViewsServiceFactory(soClient, esClient);
     const repository = new KibanaSavedObjectsSLORepository(soClient, logger);
-    const transformManager = new DefaultTransformManager(
-      transformGenerators,
-      scopedClusterClient,
-      logger,
+
+    const transformGenerators = createTransformGenerators(
       spaceId,
       dataViewsService,
       sloContext.isServerless
     );
+    const transformManager = new DefaultTransformManager(
+      transformGenerators,
+      scopedClusterClient,
+      logger
+    );
     const summaryTransformManager = new DefaultSummaryTransformManager(
       new DefaultSummaryTransformGenerator(),
       scopedClusterClient,

diff --git a/...o/server/services/transform_generators/__snapshots__/synthetics_availability.test.ts.snap b/...o/server/services/transform_generators/__snapshots__/synthetics_availability.test.ts.snap
diff --git a/...n/slo/server/services/transform_generators/__snapshots__/transform_generator.test.ts.snap b/...n/slo/server/services/transform_generators/__snapshots__/transform_generator.test.ts.snap
diff --git a/...bility_solution/slo/server/services/transform_generators/apm_transaction_duration.test.ts b/...bility_solution/slo/server/services/transform_generators/apm_transaction_duration.test.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { dataViewsService } from '@kbn/data-views-plugin/server/mocks';
 import { ALL_VALUE } from '@kbn/slo-schema';
 import { twoMinute } from '../fixtures/duration';
 import {
@@ -13,15 +14,14 @@ import {
   createSLOWithTimeslicesBudgetingMethod,
 } from '../fixtures/slo';
 import { ApmTransactionDurationTransformGenerator } from './apm_transaction_duration';
-import { dataViewsService } from '@kbn/data-views-plugin/server/mocks';
 
-const generator = new ApmTransactionDurationTransformGenerator();
-const spaceId = 'custom-space';
+const SPACE_ID = 'custom-space';
+const generator = new ApmTransactionDurationTransformGenerator(SPACE_ID, dataViewsService);
 
 describe('APM Transaction Duration Transform Generator', () => {
   it('returns the expected transform params with every specified indicator params', async () => {
     const slo = createSLO({ id: 'irrelevant', indicator: createAPMTransactionDurationIndicator() });
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform).toMatchSnapshot();
   });
@@ -31,7 +31,7 @@ describe('APM Transaction Duration Transform Generator', () => {
       id: 'irrelevant',
       indicator: createAPMTransactionDurationIndicator(),
     });
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform).toMatchSnapshot();
   });
@@ -46,7 +46,7 @@ describe('APM Transaction Duration Transform Generator', () => {
         timesliceWindow: twoMinute(),
       },
     });
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform).toMatchSnapshot();
   });
@@ -60,7 +60,7 @@ describe('APM Transaction Duration Transform Generator', () => {
         transactionType: ALL_VALUE,
       }),
     });
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.query).toMatchSnapshot();
   });
@@ -72,7 +72,7 @@ describe('APM Transaction Duration Transform Generator', () => {
         index,
       }),
     });
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.index).toEqual(index);
   });
@@ -84,7 +84,7 @@ describe('APM Transaction Duration Transform Generator', () => {
         filter,
       }),
     });
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.query).toMatchSnapshot();
   });
@@ -99,7 +99,7 @@ describe('APM Transaction Duration Transform Generator', () => {
       }),
     });
 
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.query).toMatchSnapshot();
     expect(transform.pivot?.group_by).toMatchSnapshot();
@@ -115,7 +115,7 @@ describe('APM Transaction Duration Transform Generator', () => {
       }),
     });
 
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.query).toMatchSnapshot();
     expect(transform.pivot?.group_by).toMatchSnapshot();
@@ -131,7 +131,7 @@ describe('APM Transaction Duration Transform Generator', () => {
       }),
     });
 
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.query).toMatchSnapshot();
     expect(transform.pivot?.group_by).toMatchSnapshot();
@@ -147,7 +147,7 @@ describe('APM Transaction Duration Transform Generator', () => {
       }),
     });
 
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     expect(transform.source.query).toMatchSnapshot();
     expect(transform.pivot?.group_by).toMatchSnapshot();
@@ -163,7 +163,7 @@ describe('APM Transaction Duration Transform Generator', () => {
       },
     });
 
-    const transform = await generator.getTransformParams(slo, spaceId, dataViewsService);
+    const transform = await generator.getTransformParams(slo);
 
     // @ts-ignore
     const rangeFilter = transform.source.query.bool.filter.find((f) => 'range' in f);