unleash-server 5.8.2 → 5.9.0

package/dist/lib/features/metrics/client-metrics/client-metrics-store-v2.js

@@ -0,0 +1,300 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClientMetricsStoreV2 = void 0;
+const notfound_error_1 = __importDefault(require("../../../error/notfound-error"));
+const date_fns_1 = require("date-fns");
+const collapseHourlyMetrics_1 = require("./collapseHourlyMetrics");
+const HOURLY_TABLE = 'client_metrics_env';
+const DAILY_TABLE = 'client_metrics_env_daily';
+const HOURLY_TABLE_VARIANTS = 'client_metrics_env_variants';
+const DAILY_TABLE_VARIANTS = 'client_metrics_env_variants_daily';
+const fromRow = (row) => ({
+    featureName: row.feature_name,
+    appName: row.app_name,
+    environment: row.environment,
+    timestamp: row.timestamp,
+    yes: Number(row.yes),
+    no: Number(row.no),
+});
+const toRow = (metric) => ({
+    feature_name: metric.featureName,
+    app_name: metric.appName,
+    environment: metric.environment,
+    timestamp: (0, date_fns_1.startOfHour)(metric.timestamp),
+    yes: metric.yes,
+    no: metric.no,
+});
+const toVariantRow = (metric) => ({
+    feature_name: metric.featureName,
+    app_name: metric.appName,
+    environment: metric.environment,
+    timestamp: (0, date_fns_1.startOfHour)(metric.timestamp),
+    variant: metric.variant,
+    count: metric.count,
+});
+const variantRowReducer = (acc, tokenRow) => {
+    const { feature_name: featureName, app_name: appName, environment, timestamp, yes, no, variant, count, } = tokenRow;
+    const key = `${featureName}_${appName}_${environment}_${timestamp}_${yes}_${no}`;
+    if (!acc[key]) {
+        acc[key] = {
+            featureName,
+            appName,
+            environment,
+            timestamp,
+            yes: Number(yes),
+            no: Number(no),
+            variants: {},
+        };
+    }
+    if (variant) {
+        acc[key].variants[variant] = count;
+    }
+    return acc;
+};
+const variantRowReducerV2 = (acc, tokenRow) => {
+    const { feature_name: featureName, app_name: appName, environment, timestamp, date, yes, no, variant, count, } = tokenRow;
+    const key = `${featureName}_${appName}_${environment}_${timestamp || date}_${yes}_${no}`;
+    if (!acc[key]) {
+        acc[key] = {
+            featureName,
+            appName,
+            environment,
+            timestamp: timestamp || (0, date_fns_1.endOfDay)(date),
+            yes: Number(yes),
+            no: Number(no),
+            variants: {},
+        };
+    }
+    if (variant) {
+        acc[key].variants[variant] = count;
+    }
+    return acc;
+};
+class ClientMetricsStoreV2 {
+    constructor(db, getLogger, flagResolver) {
+        this.db = db;
+        this.logger = getLogger('client-metrics-store-v2.js');
+        this.flagResolver = flagResolver;
+    }
+    async get(key) {
+        const row = await this.db(HOURLY_TABLE)
+            .where({
+            feature_name: key.featureName,
+            app_name: key.appName,
+            environment: key.environment,
+            timestamp: (0, date_fns_1.startOfHour)(key.timestamp),
+        })
+            .first();
+        if (row) {
+            return fromRow(row);
+        }
+        throw new notfound_error_1.default(`Could not find metric`);
+    }
+    async getAll(query = {}) {
+        const rows = await this.db(HOURLY_TABLE)
+            .select('*')
+            .where(query);
+        return rows.map(fromRow);
+    }
+    async exists(key) {
+        try {
+            await this.get(key);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    async delete(key) {
+        return this.db(HOURLY_TABLE)
+            .where({
+            feature_name: key.featureName,
+            app_name: key.appName,
+            environment: key.environment,
+            timestamp: (0, date_fns_1.startOfHour)(key.timestamp),
+        })
+            .del();
+    }
+    deleteAll() {
+        return this.db(HOURLY_TABLE).del();
+    }
+    destroy() {
+        // Nothing to do!
+    }
+    // this function will collapse metrics before sending it to the database.
+    async batchInsertMetrics(metrics) {
+        if (!metrics || metrics.length === 0) {
+            return;
+        }
+        const rows = (0, collapseHourlyMetrics_1.collapseHourlyMetrics)(metrics).map(toRow);
+        // Sort the rows to avoid deadlocks
+        const sortedRows = rows.sort((a, b) => a.feature_name.localeCompare(b.feature_name) ||
+            a.app_name.localeCompare(b.app_name) ||
+            a.environment.localeCompare(b.environment));
+        // Consider rewriting to SQL batch!
+        const insert = this.db(HOURLY_TABLE)
+            .insert(sortedRows)
+            .toQuery();
+        const query = `${insert.toString()} ON CONFLICT (feature_name, app_name, environment, timestamp) DO UPDATE SET "yes" = "client_metrics_env"."yes" + EXCLUDED.yes, "no" = "client_metrics_env"."no" + EXCLUDED.no`;
+        await this.db.raw(query);
+        const variantRows = (0, collapseHourlyMetrics_1.spreadVariants)(metrics).map(toVariantRow);
+        // Sort the rows to avoid deadlocks
+        const sortedVariantRows = variantRows.sort((a, b) => a.feature_name.localeCompare(b.feature_name) ||
+            a.app_name.localeCompare(b.app_name) ||
+            a.environment.localeCompare(b.environment) ||
+            a.variant.localeCompare(b.variant));
+        if (sortedVariantRows.length > 0) {
+            const insertVariants = this.db(HOURLY_TABLE_VARIANTS)
+                .insert(sortedVariantRows)
+                .toQuery();
+            const variantsQuery = `${insertVariants.toString()} ON CONFLICT (feature_name, app_name, environment, timestamp, variant) DO UPDATE SET "count" = "client_metrics_env_variants"."count" + EXCLUDED.count`;
+            await this.db.raw(variantsQuery);
+        }
+    }
+    async getMetricsForFeatureToggle(featureName, hoursBack = 24) {
+        const rows = await this.db(HOURLY_TABLE)
+            .select([`${HOURLY_TABLE}.*`, 'variant', 'count'])
+            .leftJoin(HOURLY_TABLE_VARIANTS, function () {
+            this.on(`${HOURLY_TABLE_VARIANTS}.feature_name`, `${HOURLY_TABLE}.feature_name`)
+                .on(`${HOURLY_TABLE_VARIANTS}.app_name`, `${HOURLY_TABLE}.app_name`)
+                .on(`${HOURLY_TABLE_VARIANTS}.environment`, `${HOURLY_TABLE}.environment`)
+                .on(`${HOURLY_TABLE_VARIANTS}.timestamp`, `${HOURLY_TABLE}.timestamp`);
+        })
+            .where(`${HOURLY_TABLE}.feature_name`, featureName)
+            .andWhereRaw(`${HOURLY_TABLE}.timestamp >= NOW() - INTERVAL '${hoursBack} hours'`);
+        const tokens = rows.reduce(variantRowReducer, {});
+        return Object.values(tokens);
+    }
+    async getMetricsForFeatureToggleV2(featureName, hoursBack = 24) {
+        const mainTable = hoursBack <= 48 ? HOURLY_TABLE : DAILY_TABLE;
+        const variantsTable = hoursBack <= 48 ? HOURLY_TABLE_VARIANTS : DAILY_TABLE_VARIANTS;
+        const dateTime = hoursBack <= 48 ? 'timestamp' : 'date';
+        const rows = await this.db(mainTable)
+            .select([`${mainTable}.*`, 'variant', 'count'])
+            .leftJoin(variantsTable, function () {
+            this.on(`${variantsTable}.feature_name`, `${mainTable}.feature_name`)
+                .on(`${variantsTable}.app_name`, `${mainTable}.app_name`)
+                .on(`${variantsTable}.environment`, `${mainTable}.environment`)
+                .on(`${variantsTable}.${dateTime}`, `${mainTable}.${dateTime}`);
+        })
+            .where(`${mainTable}.feature_name`, featureName)
+            .andWhereRaw(`${mainTable}.${dateTime} >= NOW() - INTERVAL '${hoursBack} hours'`);
+        const tokens = rows.reduce(variantRowReducerV2, {});
+        return Object.values(tokens);
+    }
+    async getSeenAppsForFeatureToggle(featureName, hoursBack = 24) {
+        return this.db(HOURLY_TABLE)
+            .distinct()
+            .where({ feature_name: featureName })
+            .andWhereRaw(`timestamp >= NOW() - INTERVAL '${hoursBack} hours'`)
+            .pluck('app_name')
+            .orderBy('app_name');
+    }
+    async getSeenTogglesForApp(appName, hoursBack = 24) {
+        return this.db(HOURLY_TABLE)
+            .distinct()
+            .where({ app_name: appName })
+            .andWhereRaw(`timestamp >= NOW() - INTERVAL '${hoursBack} hours'`)
+            .pluck('feature_name')
+            .orderBy('feature_name');
+    }
+    async clearMetrics(hoursAgo) {
+        return this.db(HOURLY_TABLE)
+            .whereRaw(`timestamp <= NOW() - INTERVAL '${hoursAgo} hours'`)
+            .del();
+    }
+    async clearDailyMetrics(daysAgo) {
+        return this.db(DAILY_TABLE)
+            .whereRaw(`date <= CURRENT_DATE - INTERVAL '${daysAgo} days'`)
+            .del();
+    }
+    async countPreviousDayHourlyMetricsBuckets() {
+        const enabledCountQuery = this.db(HOURLY_TABLE)
+            .whereRaw("timestamp >= CURRENT_DATE - INTERVAL '1 day'")
+            .andWhereRaw('timestamp < CURRENT_DATE')
+            .count()
+            .first();
+        const variantCountQuery = this.db(HOURLY_TABLE_VARIANTS)
+            .whereRaw("timestamp >= CURRENT_DATE - INTERVAL '1 day'")
+            .andWhereRaw('timestamp < CURRENT_DATE')
+            .count()
+            .first();
+        const [enabledCount, variantCount] = await Promise.all([
+            enabledCountQuery,
+            variantCountQuery,
+        ]);
+        return {
+            enabledCount: Number(enabledCount?.count || 0),
+            variantCount: Number(variantCount?.count || 0),
+        };
+    }
+    async countPreviousDayMetricsBuckets() {
+        const enabledCountQuery = this.db(DAILY_TABLE)
+            .whereRaw("date >= CURRENT_DATE - INTERVAL '1 day'")
+            .andWhereRaw('date < CURRENT_DATE')
+            .count()
+            .first();
+        const variantCountQuery = this.db(DAILY_TABLE_VARIANTS)
+            .whereRaw("date >= CURRENT_DATE - INTERVAL '1 day'")
+            .andWhereRaw('date < CURRENT_DATE')
+            .count()
+            .first();
+        const [enabledCount, variantCount] = await Promise.all([
+            enabledCountQuery,
+            variantCountQuery,
+        ]);
+        return {
+            enabledCount: Number(enabledCount?.count || 0),
+            variantCount: Number(variantCount?.count || 0),
+        };
+    }
+    // aggregates all hourly metrics from a previous day into daily metrics
+    async aggregateDailyMetrics() {
+        const rawQuery = `
+          INSERT INTO ${DAILY_TABLE} (feature_name, app_name, environment, date, yes, no)
+          SELECT
+              feature_name,
+              app_name,
+              environment,
+              CURRENT_DATE - INTERVAL '1 day' as date,
+              SUM(yes) as yes,
+              SUM(no) as no
+          FROM
+              ${HOURLY_TABLE}
+          WHERE
+              timestamp >= CURRENT_DATE - INTERVAL '1 day'
+              AND timestamp < CURRENT_DATE
+          GROUP BY
+              feature_name, app_name, environment
+          ON CONFLICT (feature_name, app_name, environment, date)
+          DO UPDATE SET yes = EXCLUDED.yes, no = EXCLUDED.no;
+        `;
+        const rawVariantsQuery = `
+          INSERT INTO ${DAILY_TABLE_VARIANTS} (feature_name, app_name, environment, date, variant, count)
+          SELECT
+              feature_name,
+              app_name,
+              environment,
+              CURRENT_DATE - INTERVAL '1 day' as date,
+              variant,
+              SUM(count) as count
+          FROM
+              ${HOURLY_TABLE_VARIANTS}
+          WHERE
+              timestamp >= CURRENT_DATE - INTERVAL '1 day'
+              AND timestamp < CURRENT_DATE
+          GROUP BY
+              feature_name, app_name, environment, variant
+          ON CONFLICT (feature_name, app_name, environment, date, variant)
+          DO UPDATE SET count = EXCLUDED.count;
+        `;
+        // have to be run serially since variants table has FK on yes/no metrics
+        await this.db.raw(rawQuery);
+        await this.db.raw(rawVariantsQuery);
+    }
+}
+exports.ClientMetricsStoreV2 = ClientMetricsStoreV2;
+//# sourceMappingURL=client-metrics-store-v2.js.map

package/dist/lib/features/metrics/client-metrics/client-metrics-store-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics-store-v2.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics-store-v2.ts"],"names":[],"mappings":"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"}

package/dist/lib/features/metrics/client-metrics/client-metrics-store-v2.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=client-metrics-store-v2.test.d.ts.map

package/dist/lib/features/metrics/client-metrics/client-metrics-store-v2.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics-store-v2.test.d.ts","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics-store-v2.test.ts"],"names":[],"mappings":""}

package/dist/lib/features/metrics/client-metrics/client-metrics-store-v2.test.js

@@ -0,0 +1,202 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const database_init_1 = __importDefault(require("../../../../test/e2e/helpers/database-init"));
+const no_logger_1 = __importDefault(require("../../../../test/fixtures/no-logger"));
+const date_fns_1 = require("date-fns");
+let stores;
+let db;
+let clientMetricsStore;
+beforeAll(async () => {
+    db = await (0, database_init_1.default)('client_metrics_aggregation', no_logger_1.default);
+    stores = db.stores;
+    clientMetricsStore = stores.clientMetricsStoreV2;
+});
+afterAll(async () => {
+    await db.destroy();
+});
+beforeEach(async () => {
+    await clientMetricsStore.clearMetrics(0);
+    await clientMetricsStore.clearDailyMetrics(0);
+});
+test('aggregate daily metrics from previous day', async () => {
+    const yesterday = (0, date_fns_1.subDays)(new Date(), 1);
+    await clientMetricsStore.batchInsertMetrics([
+        {
+            appName: 'test',
+            featureName: 'feature',
+            environment: 'development',
+            timestamp: (0, date_fns_1.setHours)(yesterday, 10),
+            no: 0,
+            yes: 1,
+            variants: {
+                a: 1,
+                b: 0,
+            },
+        },
+        {
+            appName: 'test',
+            featureName: 'feature',
+            environment: 'development',
+            timestamp: (0, date_fns_1.setHours)(yesterday, 11),
+            no: 1,
+            yes: 1,
+            variants: {
+                a: 0,
+                b: 1,
+            },
+        },
+    ]);
+    await clientMetricsStore.aggregateDailyMetrics();
+    const hourlyMetrics = await clientMetricsStore.getMetricsForFeatureToggleV2('feature', 48);
+    expect(hourlyMetrics).toMatchObject([
+        {
+            featureName: 'feature',
+            appName: 'test',
+            environment: 'development',
+            timestamp: (0, date_fns_1.startOfHour)((0, date_fns_1.setHours)(yesterday, 10)),
+            yes: 1,
+            no: 0,
+            variants: { a: 1, b: 0 },
+        },
+        {
+            featureName: 'feature',
+            appName: 'test',
+            environment: 'development',
+            timestamp: (0, date_fns_1.startOfHour)((0, date_fns_1.setHours)(yesterday, 11)),
+            yes: 1,
+            no: 1,
+            variants: { a: 0, b: 1 },
+        },
+    ]);
+    const dailyMetrics = await clientMetricsStore.getMetricsForFeatureToggleV2('feature', 49);
+    expect(dailyMetrics).toMatchObject([
+        {
+            featureName: 'feature',
+            appName: 'test',
+            environment: 'development',
+            timestamp: (0, date_fns_1.endOfDay)(yesterday),
+            yes: 2,
+            no: 1,
+            variants: { a: 1, b: 1 },
+        },
+    ]);
+});
+test('clear daily metrics', async () => {
+    const yesterday = (0, date_fns_1.subDays)(new Date(), 1);
+    const twoDaysAgo = (0, date_fns_1.subDays)(new Date(), 2);
+    await clientMetricsStore.batchInsertMetrics([
+        {
+            appName: 'test',
+            featureName: 'feature',
+            environment: 'development',
+            timestamp: yesterday,
+            no: 0,
+            yes: 1,
+            variants: {
+                a: 0,
+                b: 1,
+            },
+        },
+        {
+            appName: 'test',
+            featureName: 'feature',
+            environment: 'development',
+            timestamp: twoDaysAgo,
+            no: 0,
+            yes: 2,
+            variants: {
+                a: 1,
+                b: 1,
+            },
+        },
+    ]);
+    await clientMetricsStore.aggregateDailyMetrics();
+    await clientMetricsStore.clearDailyMetrics(2);
+    const dailyMetrics = await clientMetricsStore.getMetricsForFeatureToggleV2('feature', 49);
+    expect(dailyMetrics).toMatchObject([
+        {
+            featureName: 'feature',
+            appName: 'test',
+            environment: 'development',
+            timestamp: (0, date_fns_1.endOfDay)(yesterday),
+            yes: 1,
+            no: 0,
+            variants: { a: 0, b: 1 },
+        },
+    ]);
+});
+test('clear daily metrics', async () => {
+    const yesterday = (0, date_fns_1.subDays)(new Date(), 1);
+    const twoDaysAgo = (0, date_fns_1.subDays)(new Date(), 2);
+    await clientMetricsStore.batchInsertMetrics([
+        {
+            appName: 'irrelevant',
+            featureName: 'irrelevant',
+            environment: 'irrelevant',
+            timestamp: yesterday,
+            no: 0,
+            yes: 1,
+            variants: {
+                a: 0,
+                b: 1,
+            },
+        },
+        {
+            appName: 'irrelevant',
+            featureName: 'irrelevant',
+            environment: 'irrelevant',
+            timestamp: twoDaysAgo,
+            no: 0,
+            yes: 2,
+            variants: {
+                a: 1,
+                b: 1,
+            },
+        },
+    ]);
+    await clientMetricsStore.aggregateDailyMetrics();
+    await clientMetricsStore.clearDailyMetrics(2);
+    const results = await db.rawDatabase
+        .table('client_metrics_env_daily')
+        .select('*');
+    expect(results.length).toBe(1);
+    const variantResults = await db.rawDatabase
+        .table('client_metrics_env_variants_daily')
+        .select('*');
+    expect(variantResults.length).toBe(2);
+});
+test('count previous day metrics', async () => {
+    const yesterday = (0, date_fns_1.subDays)(new Date(), 1);
+    await clientMetricsStore.batchInsertMetrics([
+        {
+            appName: 'test',
+            featureName: 'feature',
+            environment: 'development',
+            timestamp: (0, date_fns_1.setHours)(yesterday, 10),
+            no: 0,
+            yes: 1,
+            variants: {
+                a: 1,
+                b: 0,
+            },
+        },
+        {
+            appName: 'test',
+            featureName: 'feature',
+            environment: 'development',
+            timestamp: (0, date_fns_1.setHours)(yesterday, 11),
+            no: 1,
+            yes: 1,
+            variants: {
+                a: 0,
+                b: 1,
+            },
+        },
+    ]);
+    const result = await clientMetricsStore.countPreviousDayHourlyMetricsBuckets();
+    expect(result).toMatchObject({ enabledCount: 2, variantCount: 4 });
+});
+//# sourceMappingURL=client-metrics-store-v2.test.js.map

package/dist/lib/features/metrics/client-metrics/client-metrics-store-v2.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics-store-v2.test.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics-store-v2.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/{routes/admin-api → features/metrics/client-metrics}/client-metrics.d.ts

@@ -1,9 +1,9 @@
 import { Request, Response } from 'express';
-import Controller from '../controller';
-import { IUnleashConfig } from '../../types/option';
-import { IUnleashServices } from '../../types';
-import { FeatureUsageSchema } from '../../openapi/spec/feature-usage-schema';
-import { FeatureMetricsSchema } from '../../openapi/spec/feature-metrics-schema';
+import Controller from '../../../routes/controller';
+import { IUnleashConfig } from '../../../types/option';
+import { IUnleashServices } from '../../../types';
+import { FeatureUsageSchema } from '../../../openapi/spec/feature-usage-schema';
+import { FeatureMetricsSchema } from '../../../openapi/spec/feature-metrics-schema';
 interface IName {
     name: string;
 }
@@ -14,8 +14,10 @@ declare class ClientMetricsController extends Controller {
     private logger;
     private metrics;
     private openApiService;
+    private flagResolver;
     private static HOURS_BACK_MIN;
     private static HOURS_BACK_MAX;
+    private static HOURS_BACK_MAX_V2;
     constructor(config: IUnleashConfig, { clientMetricsServiceV2, openApiService, }: Pick<IUnleashServices, 'clientMetricsServiceV2' | 'openApiService'>);
     getRawToggleMetrics(req: Request<any, IName, IHoursBack, any>, res: Response<FeatureMetricsSchema>): Promise<void>;
     getToggleMetricsSummary(req: Request<IName>, res: Response<FeatureUsageSchema>): Promise<void>;

package/dist/lib/features/metrics/client-metrics/client-metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics.d.ts","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAiB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOjE,OAAO,EACH,kBAAkB,EAErB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAEH,oBAAoB,EACvB,MAAM,8CAA8C,CAAC;AAGtD,UAAU,KAAK;IACX,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,cAAM,uBAAwB,SAAQ,UAAU;IAC5C,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,OAAO,CAAyB;IAExC,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,YAAY,CAAmC;IAEvD,OAAO,CAAC,MAAM,CAAC,cAAc,CAAK;IAElC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAM;IAEnC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAW;gBAGvC,MAAM,EAAE,cAAc,EACtB,EACI,sBAAsB,EACtB,cAAc,GACjB,EAAE,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,GAAG,gBAAgB,CAAC;IAkDpE,mBAAmB,CACrB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,EACzC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAeV,uBAAuB,CACzB,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,EACnB,GAAG,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC;IAYhB,OAAO,CAAC,wBAAwB;CAcnC;AAED,eAAe,uBAAuB,CAAC"}

package/dist/lib/features/metrics/client-metrics/client-metrics.e2e.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics.e2e.test.d.ts","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics.e2e.test.ts"],"names":[],"mappings":""}

package/dist/{test/e2e/api/admin → lib/features/metrics/client-metrics}/client-metrics.e2e.test.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const database_init_1 = __importDefault(require("../../helpers/database-init"));
-const test_helper_1 = require("../../helpers/test-helper");
-const no_logger_1 = __importDefault(require("../../../fixtures/no-logger"));
+const database_init_1 = __importDefault(require("../../../../test/e2e/helpers/database-init"));
+const test_helper_1 = require("../../../../test/e2e/helpers/test-helper");
+const no_logger_1 = __importDefault(require("../../../../test/fixtures/no-logger"));
 const date_fns_1 = require("date-fns");
 let app;
 let db;
@@ -22,6 +22,7 @@ beforeAll(async () => {
         experimental: {
             flags: {
                 strictSchemaValidation: true,
+                extendedUsageMetrics: true,
             },
         },
     }, db.rawDatabase);
@@ -129,16 +130,19 @@ test('should support the hoursBack query param for raw metrics', async () => {
         },
     ];
     await db.stores.clientMetricsStoreV2.batchInsertMetrics(metrics);
+    await db.stores.clientMetricsStoreV2.aggregateDailyMetrics();
     const hours1 = await fetchHoursBack(1);
     const hours24 = await fetchHoursBack(24);
     const hours48 = await fetchHoursBack(48);
     const hoursTooFew = await fetchHoursBack(-999);
-    const hoursTooMany = await fetchHoursBack(999);
+    const hoursTooMany = await fetchHoursBack(24 * 31 * 3 + 1); // 3 months + 1 hour
+    const days = await fetchHoursBack(48 + 1); // switch to days after 48 hours
     expect(hours1.data).toHaveLength(1);
     expect(hours24.data).toHaveLength(24);
     expect(hours48.data).toHaveLength(48);
     expect(hoursTooFew.data).toHaveLength(24);
     expect(hoursTooMany.data).toHaveLength(24);
+    expect(days.data).toHaveLength(2); // two days of data
 });
 test('should return toggle summary', async () => {
     const date = new Date();

package/dist/lib/features/metrics/client-metrics/client-metrics.e2e.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics.e2e.test.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics.e2e.test.ts"],"names":[],"mappings":"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"}