Split metric registration from refresh, use existing prometheus metrics for stats

src/lib/features/instance-stats/instance-stats-service.test.ts

@@ -4,11 +4,16 @@ import createStores from '../../../test/fixtures/store';
 import VersionService from '../../services/version-service';
 import { createFakeGetActiveUsers } from './getActiveUsers';
 import { createFakeGetProductionChanges } from './getProductionChanges';
-
+import { registerPrometheusMetrics } from '../../metrics';
+import { register } from 'prom-client';
+import type { IClientInstanceStore } from '../../types';
 let instanceStatsService: InstanceStatsService;
 let versionService: VersionService;
+let clientInstanceStore: IClientInstanceStore;
 
 beforeEach(() => {
+    register.clear();
+
     const config = createTestConfig();
     const stores = createStores();
     versionService = new VersionService(
@@ -17,6 +22,7 @@ beforeEach(() => {
         createFakeGetActiveUsers(),
         createFakeGetProductionChanges(),
     );
+    clientInstanceStore = stores.clientInstanceStore;
     instanceStatsService = new InstanceStatsService(
         stores,
         config,
@@ -25,20 +31,25 @@ beforeEach(() => {
         createFakeGetProductionChanges(),
     );
 
-    jest.spyOn(instanceStatsService, 'refreshAppCountSnapshot');
+    registerPrometheusMetrics(
-    jest.spyOn(instanceStatsService, 'getLabeledAppCounts');
+        config,
+        stores,
+        undefined as unknown as string,
+        config.eventBus,
+        instanceStatsService,
+    );
+
+    jest.spyOn(clientInstanceStore, 'getDistinctApplicationsCount');
     jest.spyOn(instanceStatsService, 'getStats');
 
-    // validate initial state without calls to these methods
-    expect(instanceStatsService.refreshAppCountSnapshot).toHaveBeenCalledTimes(
-        0,
-    );
     expect(instanceStatsService.getStats).toHaveBeenCalledTimes(0);
 });
 
 test('get snapshot should not call getStats', async () => {
-    await instanceStatsService.refreshAppCountSnapshot();
+    await instanceStatsService.dbMetrics.refreshDbMetrics();
-    expect(instanceStatsService.getLabeledAppCounts).toHaveBeenCalledTimes(1);
+    expect(
+        clientInstanceStore.getDistinctApplicationsCount,
+    ).toHaveBeenCalledTimes(3);
     expect(instanceStatsService.getStats).toHaveBeenCalledTimes(0);
 
     // subsequent calls to getStatsSnapshot don't call getStats
@@ -51,12 +62,11 @@ test('get snapshot should not call getStats', async () => {
         ]);
     }
     // after querying the stats snapshot no call to getStats should be issued
-    expect(instanceStatsService.getLabeledAppCounts).toHaveBeenCalledTimes(1);
+    expect(
+        clientInstanceStore.getDistinctApplicationsCount,
+    ).toHaveBeenCalledTimes(3);
 });
 
 test('before the snapshot is refreshed we can still get the appCount', async () => {
-    expect(instanceStatsService.refreshAppCountSnapshot).toHaveBeenCalledTimes(
-        0,
-    );
     expect(instanceStatsService.getAppCountSnapshot('7d')).toBeUndefined();
 });

src/lib/features/instance-stats/instance-stats-service.ts

@@ -29,6 +29,7 @@ import { CUSTOM_ROOT_ROLE_TYPE } from '../../util';
 import type { GetActiveUsers } from './getActiveUsers';
 import type { ProjectModeCount } from '../project/project-store';
 import type { GetProductionChanges } from './getProductionChanges';
+import { DbMetricsMonitor } from '../../metrics-gauge';
 
 export type TimeRange = 'allTime' | '30d' | '7d';
 
@@ -115,6 +116,8 @@ export class InstanceStatsService {
 
     private featureStrategiesReadModel: IFeatureStrategiesReadModel;
 
+    dbMetrics: DbMetricsMonitor;
+
     constructor(
         {
             featureToggleStore,
@@ -178,37 +181,20 @@ export class InstanceStatsService {
         this.clientMetricsStore = clientMetricsStoreV2;
         this.flagResolver = flagResolver;
         this.featureStrategiesReadModel = featureStrategiesReadModel;
+        this.dbMetrics = new DbMetricsMonitor({ getLogger });
     }
 
-    async refreshAppCountSnapshot(): Promise<
+    async fromPrometheus(
-        Partial<{ [key in TimeRange]: number }>
+        name: string,
-    > {
+        labels?: Record<string, string | number>,
-        try {
+    ): Promise<number> {
-            this.appCount = await this.getLabeledAppCounts();
+        return (await this.dbMetrics.findValue(name, labels)) ?? 0;
-            return this.appCount;
-        } catch (error) {
-            this.logger.warn(
-                'Unable to retrieve statistics. This will be retried',
-                error,
-            );
-            return {
-                '7d': 0,
-                '30d': 0,
-                allTime: 0,
-            };
-        }
     }
 
     getProjectModeCount(): Promise<ProjectModeCount[]> {
         return this.projectStore.getProjectModeCounts();
     }
 
-    getToggleCount(): Promise<number> {
-        return this.featureToggleStore.count({
-            archived: false,
-        });
-    }
-
     getArchivedToggleCount(): Promise<number> {
         return this.featureToggleStore.count({
             archived: true,
@@ -263,7 +249,7 @@ export class InstanceStatsService {
             maxConstraintValues,
             maxConstraints,
         ] = await Promise.all([
-            this.getToggleCount(),
+            this.fromPrometheus('feature_toggles_total'),
             this.getArchivedToggleCount(),
             this.userStore.count(),
             this.userStore.countServiceAccounts(),
@@ -280,7 +266,7 @@ export class InstanceStatsService {
             this.strategyStore.count(),
             this.hasSAML(),
             this.hasOIDC(),
-            this.appCount ? this.appCount : this.refreshAppCountSnapshot(),
+            this.clientAppCounts(),
             this.eventStore.deprecatedFilteredCount({
                 type: FEATURES_EXPORTED,
             }),
@@ -329,20 +315,19 @@ export class InstanceStatsService {
             maxConstraints: maxConstraints?.count ?? 0,
         };
     }
-
+    async clientAppCounts(): Promise<Partial<{ [key in TimeRange]: number }>> {
-    async getLabeledAppCounts(): Promise<
+        this.appCount = {
-        Partial<{ [key in TimeRange]: number }>
+            '7d': await this.fromPrometheus('client_apps_total', {
-    > {
+                range: '7d',
-        const [t7d, t30d, allTime] = await Promise.all([
+            }),
-            this.clientInstanceStore.getDistinctApplicationsCount(7),
+            '30d': await this.fromPrometheus('client_apps_total', {
-            this.clientInstanceStore.getDistinctApplicationsCount(30),
+                range: '30d',
-            this.clientInstanceStore.getDistinctApplicationsCount(),
+            }),
-        ]);
+            allTime: await this.fromPrometheus('client_apps_total', {
-        return {
+                range: 'allTime',
-            '7d': t7d,
+            }),
-            '30d': t30d,
-            allTime,
         };
+        return this.appCount;
     }
 
     getAppCountSnapshot(range: TimeRange): number | undefined {

src/lib/metrics-gauge.ts

@@ -64,10 +64,11 @@ export class DbMetricsMonitor {
     }
 
     refreshDbMetrics = async () => {
-        const tasks = Array.from(this.updaters.values()).map(
+        const tasks = Array.from(this.updaters.entries()).map(
-            (updater) => updater.task,
+            ([name, updater]) => ({ name, task: updater.task }),
         );
-        for (const task of tasks) {
+        for (const { name, task } of tasks) {
+            this.log.debug(`Refreshing metric ${name}`);
             await task();
         }
     };

src/lib/metrics.test.ts

@@ -212,6 +212,7 @@ test('should collect metrics for function timings', async () => {
 });
 
 test('should collect metrics for feature flag size', async () => {
+    await statsService.dbMetrics.refreshDbMetrics();
     const metrics = await prometheusRegister.metrics();
     expect(metrics).toMatch(/feature_toggles_total\{version="(.*)"\} 0/);
 });
@@ -222,7 +223,7 @@ test('should collect metrics for archived feature flag size', async () => {
 });
 
 test('should collect metrics for total client apps', async () => {
-    await statsService.refreshAppCountSnapshot();
+    await statsService.dbMetrics.refreshDbMetrics();
     const metrics = await prometheusRegister.metrics();
     expect(metrics).toMatch(/client_apps_total\{range="(.*)"\} 0/);
 });

src/test/e2e/api/admin/instance-admin.e2e.test.ts

@@ -6,6 +6,7 @@ import {
 import getLogger from '../../../fixtures/no-logger';
 import type { IUnleashStores } from '../../../../lib/types';
 import { ApiTokenType } from '../../../../lib/types/models/api-token';
+import { registerPrometheusMetrics } from '../../../../lib/metrics';
 
 let app: IUnleashTest;
 let db: ITestDb;
@@ -26,6 +27,14 @@ beforeAll(async () => {
         },
         db.rawDatabase,
     );
+
+    registerPrometheusMetrics(
+        app.config,
+        stores,
+        undefined as unknown as string,
+        app.config.eventBus,
+        app.services.instanceStatsService,
+    );
 });
 
 afterAll(async () => {
@@ -39,6 +48,8 @@ test('should return instance statistics', async () => {
         createdByUserId: 9999,
     });
 
+    await app.services.instanceStatsService.dbMetrics.refreshDbMetrics();
+
     return app.request
         .get('/api/admin/instance-admin/statistics')
         .expect('Content-Type', /json/)