unleash-server 5.8.2 → 5.9.0

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

@@ -3,19 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const controller_1 = __importDefault(require("../controller"));
-const permissions_1 = require("../../types/permissions");
-const create_response_schema_1 = require("../../openapi/util/create-response-schema");
-const serialize_dates_1 = require("../../types/serialize-dates");
-const feature_usage_schema_1 = require("../../openapi/spec/feature-usage-schema");
-const feature_metrics_schema_1 = require("../../openapi/spec/feature-metrics-schema");
-const openapi_1 = require("../../openapi");
+const controller_1 = __importDefault(require("../../../routes/controller"));
+const permissions_1 = require("../../../types/permissions");
+const create_response_schema_1 = require("../../../openapi/util/create-response-schema");
+const serialize_dates_1 = require("../../../types/serialize-dates");
+const feature_usage_schema_1 = require("../../../openapi/spec/feature-usage-schema");
+const feature_metrics_schema_1 = require("../../../openapi/spec/feature-metrics-schema");
+const openapi_1 = require("../../../openapi");
 class ClientMetricsController extends controller_1.default {
     constructor(config, { clientMetricsServiceV2, openApiService, }) {
         super(config);
         this.logger = config.getLogger('/admin-api/client-metrics.ts');
         this.metrics = clientMetricsServiceV2;
         this.openApiService = openApiService;
+        this.flagResolver = config.flagResolver;
         this.route({
             method: 'get',
             path: '/features/:name/raw',
@@ -69,13 +70,16 @@ class ClientMetricsController extends controller_1.default {
             return undefined;
         }
         const parsed = Number(param);
-        if (parsed >= ClientMetricsController.HOURS_BACK_MIN &&
-            parsed <= ClientMetricsController.HOURS_BACK_MAX) {
+        const max = this.flagResolver.isEnabled('extendedUsageMetrics')
+            ? ClientMetricsController.HOURS_BACK_MAX_V2
+            : ClientMetricsController.HOURS_BACK_MAX;
+        if (parsed >= ClientMetricsController.HOURS_BACK_MIN && parsed <= max) {
             return parsed;
         }
     }
 }
 ClientMetricsController.HOURS_BACK_MIN = 1;
 ClientMetricsController.HOURS_BACK_MAX = 48;
+ClientMetricsController.HOURS_BACK_MAX_V2 = 24 * 91; // 91 days
 exports.default = ClientMetricsController;
 //# sourceMappingURL=client-metrics.js.map

package/dist/lib/{routes/admin-api → features/metrics/client-metrics}/client-metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/client-metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAKvC,yDAA+C;AAC/C,sFAAiF;AAEjF,iEAA6D;AAC7D,kFAGiD;AACjD,sFAGmD;AACnD,2CAAqD;AAUrD,MAAM,uBAAwB,SAAQ,oBAAU;IAW5C,YACI,MAAsB,EACtB,EACI,sBAAsB,EACtB,cAAc,GACoD;QAEtE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;QAE/D,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,IAAI,CAAC,KAAK,CAAC;YACP,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,IAAI,CAAC,mBAAmB;YACjC,UAAU,EAAE,kBAAI;YAChB,UAAU,EAAE;gBACR,cAAc,CAAC,SAAS,CAAC;oBACrB,WAAW,EAAE,sBAAsB;oBACnC,IAAI,EAAE,CAAC,SAAS,CAAC;oBACjB,OAAO,EAAE,qBAAqB;oBAC9B,WAAW,EACP,iFAAiF;oBACrF,SAAS,EAAE;wBACP,GAAG,EAAE,IAAA,6CAAoB,EAAC,sBAAsB,CAAC;wBACjD,GAAG,IAAA,8BAAoB,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;qBACzC;iBACJ,CAAC;aACL;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC;YACP,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,IAAI,CAAC,uBAAuB;YACrC,UAAU,EAAE,kBAAI;YAChB,UAAU,EAAE;gBACR,cAAc,CAAC,SAAS,CAAC;oBACrB,WAAW,EAAE,wBAAwB;oBACrC,IAAI,EAAE,CAAC,SAAS,CAAC;oBACjB,OAAO,EAAE,6FAA6F;oBACtG,WAAW,EACP,4HAA4H;oBAChI,SAAS,EAAE;wBACP,GAAG,EAAE,IAAA,6CAAoB,EAAC,oBAAoB,CAAC;wBAC/C,GAAG,IAAA,8BAAoB,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;qBACzC;iBACJ,CAAC;aACL;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,GAAyC,EACzC,GAAmC;QAEnC,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,yBAAyB,CACrD,IAAI,EACJ,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAC3C,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,qBAAqB,CACrC,GAAG,EACH,GAAG,EACH,6CAAoB,CAAC,GAAG,EACxB,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAA,gCAAc,EAAC,IAAI,CAAC,EAAE,CACjE,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB,CACzB,GAAmB,EACnB,GAAiC;QAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;QAErE,IAAI,CAAC,cAAc,CAAC,qBAAqB,CACrC,GAAG,EACH,GAAG,EACH,yCAAkB,CAAC,GAAG,EACtB,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAc,EAAC,IAAI,CAAC,EAAE,CAC9D,CAAC;IACN,CAAC;IAEO,wBAAwB,CAAC,KAAc;QAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAE7B,IACI,MAAM,IAAI,uBAAuB,CAAC,cAAc;YAChD,MAAM,IAAI,uBAAuB,CAAC,cAAc,EAClD;YACE,OAAO,MAAM,CAAC;SACjB;IACL,CAAC;;AAxGc,sCAAc,GAAG,CAAC,CAAC;AAEnB,sCAAc,GAAG,EAAE,CAAC;AAyGvC,kBAAe,uBAAuB,CAAC"}
+{"version":3,"file":"client-metrics.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/client-metrics.ts"],"names":[],"mappings":"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"}

package/dist/lib/{util → features/metrics/client-metrics}/collapseHourlyMetrics.d.ts

@@ -1,4 +1,4 @@
-import { IClientMetricsEnv, IClientMetricsEnvVariant } from '../types/stores/client-metrics-store-v2';
+import { IClientMetricsEnv, IClientMetricsEnvVariant } from './client-metrics-store-v2-type';
 export declare const collapseHourlyMetrics: (metrics: IClientMetricsEnv[]) => IClientMetricsEnv[];
 export declare const spreadVariants: (metrics: IClientMetricsEnv[]) => IClientMetricsEnvVariant[];
 //# sourceMappingURL=collapseHourlyMetrics.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"collapseHourlyMetrics.d.ts","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/collapseHourlyMetrics.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EACjB,wBAAwB,EAC3B,MAAM,gCAAgC,CAAC;AA+BxC,eAAO,MAAM,qBAAqB,YACrB,iBAAiB,EAAE,KAC7B,iBAAiB,EAuBnB,CAAC;AAEF,eAAO,MAAM,cAAc,YACd,iBAAiB,EAAE,KAC7B,wBAAwB,EAc1B,CAAC"}

package/dist/lib/features/metrics/client-metrics/collapseHourlyMetrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collapseHourlyMetrics.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/collapseHourlyMetrics.ts"],"names":[],"mappings":";;;AAIA,uCAAuC;AAEvC,MAAM,eAAe,GAAG,CAAC,MAAyB,EAAU,EAAE;IAC1D,OAAO;QACH,MAAM,CAAC,WAAW;QAClB,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,WAAW;QAClB,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE;KAC7B,CAAC,IAAI,EAAE,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACjB,WAAmC,EACnC,YAAoC,EACd,EAAE;IACxB,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;QAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;KAC7D;IAED,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;QAC5B,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;SACnC;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACjC,OAA4B,EACT,EAAE;IACrB,MAAM,OAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;IACrD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACvB,MAAM,YAAY,GAAG;YACjB,GAAG,MAAM;YACT,SAAS,EAAE,IAAA,sBAAW,EAAC,MAAM,CAAC,SAAS,CAAC;SAC3C,CAAC;QACF,MAAM,GAAG,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;SAC/B;aAAM;YACH,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,YAAY,CAChC,MAAM,CAAC,QAAQ,EACf,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,EAAE,CAC9B,CAAC;aACL;SACJ;IACL,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC,CAAC;AAzBW,QAAA,qBAAqB,yBAyBhC;AAEK,MAAM,cAAc,GAAG,CAC1B,OAA4B,EACF,EAAE;IAC5B,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,OAAO,EAAE,CAAC;SACb;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO;YACP,KAAK;SACR,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB"}

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

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

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

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

package/dist/{test/fixtures → lib/features/metrics/client-metrics}/fake-client-metrics-store-v2.d.ts

@@ -1,13 +1,24 @@
 /// <reference types="node" />
 import EventEmitter from 'events';
-import { IClientMetricsEnv, IClientMetricsEnvKey, IClientMetricsStoreV2 } from '../../lib/types/stores/client-metrics-store-v2';
+import { IClientMetricsEnv, IClientMetricsEnvKey, IClientMetricsStoreV2 } from './client-metrics-store-v2-type';
 export default class FakeClientMetricsStoreV2 extends EventEmitter implements IClientMetricsStoreV2 {
     metrics: IClientMetricsEnv[];
     constructor();
     getSeenTogglesForApp(appName: string, hoursBack?: number): Promise<string[]>;
     clearMetrics(hoursBack: number): Promise<void>;
+    clearDailyMetrics(daysBack: number): Promise<void>;
+    countPreviousDayHourlyMetricsBuckets(): Promise<{
+        enabledCount: number;
+        variantCount: number;
+    }>;
+    countPreviousDayMetricsBuckets(): Promise<{
+        enabledCount: number;
+        variantCount: number;
+    }>;
+    aggregateDailyMetrics(): Promise<void>;
     getSeenAppsForFeatureToggle(featureName: string, hoursBack?: number): Promise<string[]>;
     getMetricsForFeatureToggle(featureName: string, hoursBack?: number): Promise<IClientMetricsEnv[]>;
+    getMetricsForFeatureToggleV2(featureName: string, hoursBack?: number): Promise<IClientMetricsEnv[]>;
     batchInsertMetrics(metrics: IClientMetricsEnv[]): Promise<void>;
     get(key: IClientMetricsEnvKey): Promise<IClientMetricsEnv>;
     getAll(query?: Object): Promise<IClientMetricsEnv[]>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"fake-client-metrics-store-v2.d.ts","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/fake-client-metrics-store-v2.ts"],"names":[],"mappings":";AAEA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EACH,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACxB,MAAM,gCAAgC,CAAC;AAExC,MAAM,CAAC,OAAO,OAAO,wBACjB,SAAQ,YACR,YAAW,qBAAqB;IAEhC,OAAO,EAAE,iBAAiB,EAAE,CAAM;;IAMlC,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAGpB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAG9C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAGlD,oCAAoC,IAAI,OAAO,CAAC;QAC5C,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;KACxB,CAAC;IAGF,8BAA8B,IAAI,OAAO,CAAC;QACtC,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;KACxB,CAAC;IAGF,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGtC,2BAA2B,CACvB,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAGpB,0BAA0B,CACtB,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAG/B,4BAA4B,CACxB,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAG/B,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,GAAG,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAG1D,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAGpD,MAAM,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAGnD,MAAM,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,kBAAkB,IAAI,OAAO,CAAC,EAAE,CAAC;IAIjC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC,OAAO,IAAI,IAAI;CAClB"}

package/dist/{test/fixtures → lib/features/metrics/client-metrics}/fake-client-metrics-store-v2.js

@@ -18,12 +18,27 @@ class FakeClientMetricsStoreV2 extends events_1.default {
     clearMetrics(hoursBack) {
         return Promise.resolve();
     }
+    clearDailyMetrics(daysBack) {
+        return Promise.resolve();
+    }
+    countPreviousDayHourlyMetricsBuckets() {
+        return Promise.resolve({ enabledCount: 0, variantCount: 0 });
+    }
+    countPreviousDayMetricsBuckets() {
+        return Promise.resolve({ enabledCount: 0, variantCount: 0 });
+    }
+    aggregateDailyMetrics() {
+        return Promise.resolve();
+    }
     getSeenAppsForFeatureToggle(featureName, hoursBack) {
         throw new Error('Method not implemented.');
     }
     getMetricsForFeatureToggle(featureName, hoursBack) {
         throw new Error('Method not implemented.');
     }
+    getMetricsForFeatureToggleV2(featureName, hoursBack) {
+        throw new Error('Method not implemented.');
+    }
     batchInsertMetrics(metrics) {
         metrics.forEach((m) => this.metrics.push(m));
         return Promise.resolve();

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

@@ -0,0 +1 @@
+{"version":3,"file":"fake-client-metrics-store-v2.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/fake-client-metrics-store-v2.ts"],"names":[],"mappings":";;;;;AAAA,mEAAmE;AACnE,sDAAsD;AACtD,oDAAkC;AAOlC,MAAqB,wBACjB,SAAQ,gBAAY;IAKpB;QACI,KAAK,EAAE,CAAC;QAHZ,YAAO,GAAwB,EAAE,CAAC;QAI9B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IACD,oBAAoB,CAChB,OAAe,EACf,SAAkB;QAElB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,YAAY,CAAC,SAAiB;QAC1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,iBAAiB,CAAC,QAAgB;QAC9B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,oCAAoC;QAIhC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,8BAA8B;QAI1B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,qBAAqB;QACjB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,2BAA2B,CACvB,WAAmB,EACnB,SAAkB;QAElB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,0BAA0B,CACtB,WAAmB,EACnB,SAAkB;QAElB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,4BAA4B,CACxB,WAAmB,EACnB,SAAkB;QAElB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,kBAAkB,CAAC,OAA4B;QAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,GAAG,CAAC,GAAyB;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,CAAC,KAAc;QACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,CAAC,GAAyB;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,CAAC,GAAyB;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM;QACR,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,SAAS;QACX,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,KAAU,CAAC;CACrB;AArFD,2CAqFC"}

package/dist/lib/{services → features/metrics}/client-metrics/metrics-service-v2.d.ts

@@ -1,11 +1,11 @@
-import { IUnleashConfig } from '../../types';
-import { IUnleashStores } from '../../types';
-import { ToggleMetricsSummary } from '../../types/models/metrics';
-import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
-import { IApiUser } from '../../types/api-user';
-import { IUser } from '../../types/user';
-import { LastSeenService } from './last-seen/last-seen-service';
-import { ClientMetricsSchema } from 'lib/openapi';
+import { IUnleashConfig } from '../../../types';
+import { IUnleashStores } from '../../../types';
+import { ToggleMetricsSummary } from '../../../types/models/metrics';
+import { IClientMetricsEnv } from './client-metrics-store-v2-type';
+import { IApiUser } from '../../../types/api-user';
+import { IUser } from '../../../types/user';
+import { LastSeenService } from '../last-seen/last-seen-service';
+import { ClientMetricsSchema } from '../../../../lib/openapi';
 export default class ClientMetricsServiceV2 {
     private config;
     private unsavedMetrics;
@@ -15,6 +15,8 @@ export default class ClientMetricsServiceV2 {
     private logger;
     constructor({ clientMetricsStoreV2 }: Pick<IUnleashStores, 'clientMetricsStoreV2'>, config: IUnleashConfig, lastSeenService: LastSeenService);
     clearMetrics(hoursAgo: number): Promise<void>;
+    clearDailyMetrics(daysAgo: number): Promise<void>;
+    aggregateDailyMetrics(): Promise<void>;
     filterValidToggleNames(toggleNames: string[]): Promise<string[]>;
     registerBulkMetrics(metrics: IClientMetricsEnv[]): Promise<void>;
     registerClientMetrics(data: ClientMetricsSchema, clientIp: string): Promise<void>;
@@ -24,5 +26,6 @@ export default class ClientMetricsServiceV2 {
     resolveMetricsEnvironment(user: IUser | IApiUser, data: {
         environment?: string;
     }): string;
+    resolveUserEnvironment(user: IUser | IApiUser): string;
 }
 //# sourceMappingURL=metrics-service-v2.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"metrics-service-v2.d.ts","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EACH,iBAAiB,EAEpB,MAAM,gCAAgC,CAAC;AAIxC,OAAgB,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAMjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACvC,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,oBAAoB,CAAwB;IAEpD,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,YAAY,CAAkD;IAEtE,OAAO,CAAC,MAAM,CAAS;gBAGnB,EAAE,oBAAoB,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAC,EACtE,MAAM,EAAE,cAAc,EACtB,eAAe,EAAE,eAAe;IAW9B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI7B,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAMjC,qBAAqB;IAuCrB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA0BhE,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhE,qBAAqB,CACvB,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAmCV,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxB,8BAA8B,CAChC,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,oBAAoB,CAAC;IAiC1B,yBAAyB,CAC3B,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,MAAW,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA2D/B,yBAAyB,CACrB,IAAI,EAAE,KAAK,GAAG,QAAQ,EACtB,IAAI,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/B,MAAM;IAWT,sBAAsB,CAAC,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM;CAMzD"}

package/dist/lib/{services → features/metrics}/client-metrics/metrics-service-v2.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const schema_1 = require("./schema");
+const schema_1 = require("../shared/schema");
 const date_fns_1 = require("date-fns");
-const events_1 = require("../../types/events");
-const api_user_1 = __importDefault(require("../../types/api-user"));
-const api_token_1 = require("../../types/models/api-token");
-const collapseHourlyMetrics_1 = require("../../util/collapseHourlyMetrics");
-const time_utils_1 = require("../../util/time-utils");
-const feature_schema_1 = require("../../schema/feature-schema");
+const events_1 = require("../../../types/events");
+const api_user_1 = __importDefault(require("../../../types/api-user"));
+const api_token_1 = require("../../../types/models/api-token");
+const collapseHourlyMetrics_1 = require("./collapseHourlyMetrics");
+const time_utils_1 = require("../../../util/time-utils");
+const feature_schema_1 = require("../../../schema/feature-schema");
 class ClientMetricsServiceV2 {
     constructor({ clientMetricsStoreV2 }, config, lastSeenService) {
         this.unsavedMetrics = [];
@@ -23,6 +23,32 @@ class ClientMetricsServiceV2 {
     async clearMetrics(hoursAgo) {
         return this.clientMetricsStoreV2.clearMetrics(hoursAgo);
     }
+    async clearDailyMetrics(daysAgo) {
+        if (this.flagResolver.isEnabled('extendedUsageMetrics')) {
+            return this.clientMetricsStoreV2.clearDailyMetrics(daysAgo);
+        }
+    }
+    async aggregateDailyMetrics() {
+        if (this.flagResolver.isEnabled('extendedUsageMetrics')) {
+            const { enabledCount: hourlyEnabledCount, variantCount: hourlyVariantCount, } = await this.clientMetricsStoreV2.countPreviousDayHourlyMetricsBuckets();
+            const { enabledCount: dailyEnabledCount, variantCount: dailyVariantCount, } = await this.clientMetricsStoreV2.countPreviousDayMetricsBuckets();
+            const { payload } = this.flagResolver.getVariant('extendedUsageMetrics');
+            const limit = payload?.value && Number.isInteger(parseInt(payload?.value))
+                ? parseInt(payload?.value)
+                : 3600000;
+            const totalHourlyCount = hourlyEnabledCount + hourlyVariantCount;
+            const totalDailyCount = dailyEnabledCount + dailyVariantCount;
+            const previousDayDailyCountCalculated = totalDailyCount > totalHourlyCount / 24; // heuristic
+            if (previousDayDailyCountCalculated) {
+                return;
+            }
+            if (totalHourlyCount > limit) {
+                this.logger.warn(`Skipping previous day metrics aggregation. Too many results. Expected max value: ${limit}, Actual value: ${totalHourlyCount}`);
+                return;
+            }
+            await this.clientMetricsStoreV2.aggregateDailyMetrics();
+        }
+    }
     async filterValidToggleNames(toggleNames) {
         const nameValidations = toggleNames.map((toggleName) => feature_schema_1.nameSchema.validateAsync({ name: toggleName }));
         const badNames = (await Promise.allSettled(nameValidations)).filter((r) => r.status === 'rejected');
@@ -97,8 +123,21 @@ class ClientMetricsServiceV2 {
         };
     }
     async getClientMetricsForToggle(featureName, hoursBack = 24) {
-        const metrics = await this.clientMetricsStoreV2.getMetricsForFeatureToggle(featureName, hoursBack);
-        const hours = (0, time_utils_1.generateHourBuckets)(hoursBack);
+        let hours;
+        let metrics;
+        if (this.flagResolver.isEnabled('extendedUsageMetrics')) {
+            metrics =
+                await this.clientMetricsStoreV2.getMetricsForFeatureToggleV2(featureName, hoursBack);
+            hours =
+                hoursBack > 48
+                    ? (0, time_utils_1.generateDayBuckets)(Math.floor(hoursBack / 24))
+                    : (0, time_utils_1.generateHourBuckets)(hoursBack);
+        }
+        else {
+            metrics =
+                await this.clientMetricsStoreV2.getMetricsForFeatureToggle(featureName, hoursBack);
+            hours = (0, time_utils_1.generateHourBuckets)(hoursBack);
+        }
         const environments = [...new Set(metrics.map((x) => x.environment))];
         const applications = [...new Set(metrics.map((x) => x.appName))].slice(0, 100);
         const result = environments.flatMap((environment) => {
@@ -132,6 +171,12 @@ class ClientMetricsServiceV2 {
         }
         return 'default';
     }
+    resolveUserEnvironment(user) {
+        if (user instanceof api_user_1.default && user.environment !== api_token_1.ALL) {
+            return user.environment;
+        }
+        return 'default';
+    }
 }
 exports.default = ClientMetricsServiceV2;
 //# sourceMappingURL=metrics-service-v2.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../../src/lib/features/metrics/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":";;;;;AAQA,6CAAuD;AACvD,uCAAsC;AACtC,kDAAuD;AACvD,uEAA4D;AAC5D,+DAAsD;AAEtD,mEAAgE;AAEhE,yDAIkC;AAElC,mEAA4D;AAE5D,MAAqB,sBAAsB;IAavC,YACI,EAAE,oBAAoB,EAAgD,EACtE,MAAsB,EACtB,eAAgC;QAb5B,mBAAc,GAAwB,EAAE,CAAC;QAe7C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,uDAAuD,CAC1D,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAgB;QAC/B,OAAO,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACnC,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;SAC/D;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB;QACvB,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE;YACrD,MAAM,EACF,YAAY,EAAE,kBAAkB,EAChC,YAAY,EAAE,kBAAkB,GACnC,GACG,MAAM,IAAI,CAAC,oBAAoB,CAAC,oCAAoC,EAAE,CAAC;YAC3E,MAAM,EACF,YAAY,EAAE,iBAAiB,EAC/B,YAAY,EAAE,iBAAiB,GAClC,GACG,MAAM,IAAI,CAAC,oBAAoB,CAAC,8BAA8B,EAAE,CAAC;YACrE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAC5C,sBAAsB,CACzB,CAAC;YAEF,MAAM,KAAK,GACP,OAAO,EAAE,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACxD,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;gBAC1B,CAAC,CAAC,OAAO,CAAC;YAElB,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;YACjE,MAAM,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;YAC9D,MAAM,+BAA+B,GACjC,eAAe,GAAG,gBAAgB,GAAG,EAAE,CAAC,CAAC,YAAY;YAEzD,IAAI,+BAA+B,EAAE;gBACjC,OAAO;aACV;YACD,IAAI,gBAAgB,GAAG,KAAK,EAAE;gBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,oFAAoF,KAAK,mBAAmB,gBAAgB,EAAE,CACjI,CAAC;gBACF,OAAO;aACV;YACD,MAAM,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,CAAC;SAC3D;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAqB;QAC9C,MAAM,eAAe,GAEf,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACjC,2BAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CACjD,CAAC;QACF,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CACjC,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,yCAAyC,IAAI,CAAC,SAAS,CACnD,QAAQ,CACX,EAAE,CACN,CAAC;YAEF,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC,EAAE;gBAC3D,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAC1B,CAAC,CAAwB,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CACxD,CAAC;gBACF,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;aAClE;SACJ;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAA4B;QAClD,IAAI,CAAC,cAAc,GAAG,IAAA,6CAAqB,EAAC;YACxC,GAAG,IAAI,CAAC,cAAc;YACtB,GAAG,OAAO;SACb,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,IAAyB,EACzB,QAAgB;QAEhB,MAAM,KAAK,GAAG,MAAM,4BAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CACxD,CAAC,IAAI,EAAE,EAAE,CACL,CAAC,CACG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;YACpC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CACtC,CACR,CAAC;QAEF,MAAM,oBAAoB,GACtB,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,OAAO,WAAW,CAAC,MAAM,KAAK,oBAAoB,CAAC,MAAM,wBAAwB,QAAQ,EAAE,CAC9F,CAAC;QAEF,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,MAAM,aAAa,GAAwB,oBAAoB,CAAC,GAAG,CAC/D,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACP,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,SAAS;gBAC3C,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK;gBAC7B,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;gBACxC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC;gBACtC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ;aAChD,CAAC,CACL,CAAC;YACF,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;YAE9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAc,EAAE,KAAK,CAAC,CAAC;SACpD;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,sDAAsD;YACtD,8CAA8C;YAC9C,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,+EAA+E;IAC/E,KAAK,CAAC,8BAA8B,CAChC,WAAmB;QAEnB,MAAM,OAAO,GACT,MAAM,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CACtD,WAAW,EACX,CAAC,CACJ,CAAC;QACN,MAAM,gBAAgB,GAClB,MAAM,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CACvD,WAAW,CACd,CAAC;QAEN,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACjD,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;gBACxB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;gBACvC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;aACxC;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;oBACrB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,EAAE,EAAE,IAAI,CAAC,EAAE;iBACd,CAAC;aACL;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO;YACH,WAAW;YACX,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;YAC5C,gBAAgB;SACnB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,WAAmB,EACnB,YAAoB,EAAE;QAEtB,IAAI,KAAmB,CAAC;QACxB,IAAI,OAA4B,CAAC;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE;YACrD,OAAO;gBACH,MAAM,IAAI,CAAC,oBAAoB,CAAC,4BAA4B,CACxD,WAAW,EACX,SAAS,CACZ,CAAC;YACN,KAAK;gBACD,SAAS,GAAG,EAAE;oBACV,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;oBAChD,CAAC,CAAC,IAAA,gCAAmB,EAAC,SAAS,CAAC,CAAC;SAC5C;aAAM;YACH,OAAO;gBACH,MAAM,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CACtD,WAAW,EACX,SAAS,CACZ,CAAC;YACN,KAAK,GAAG,IAAA,gCAAmB,EAAC,SAAS,CAAC,CAAC;SAC1C;QAED,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAErE,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAClE,CAAC,EACD,GAAG,CACN,CAAC;QAEF,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YAChD,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,CACrC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,WAAW,CACjD,CAAC;YACF,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAChD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CACzC,CAAC;gBACF,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAClC,CAAC,IAAI,EAAE,EAAE,CACL,IAAA,qBAAU,EAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;wBAChD,CAAC,CACR,CAAC;oBACF,OAAO,CACH,MAAM,IAAI;wBACN,SAAS,EAAE,UAAU,CAAC,SAAS;wBAC/B,EAAE,EAAE,CAAC;wBACL,GAAG,EAAE,CAAC;wBACN,OAAO;wBACP,WAAW;wBACX,WAAW;qBACd,CACJ,CAAC;gBACN,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,qBAAU,EAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,yBAAyB,CACrB,IAAsB,EACtB,IAA8B;QAE9B,IAAI,IAAI,YAAY,kBAAO,EAAE;YACzB,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrD,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,sBAAsB,CAAC,IAAsB;QACzC,IAAI,IAAI,YAAY,kBAAO,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;YACrD,OAAO,IAAI,CAAC,WAAW,CAAC;SAC3B;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AApRD,yCAoRC"}

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

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

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

@@ -0,0 +1,271 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const metrics_service_v2_1 = __importDefault(require("./metrics-service-v2"));
+const no_logger_1 = __importDefault(require("../../../../test/fixtures/no-logger"));
+const store_1 = __importDefault(require("../../../../test/fixtures/store"));
+const events_1 = __importDefault(require("events"));
+const last_seen_service_1 = require("../last-seen/last-seen-service");
+const date_fns_1 = require("date-fns");
+function initClientMetrics(flagEnabled = true) {
+    const stores = (0, store_1.default)();
+    const eventBus = new events_1.default();
+    eventBus.emit = jest.fn();
+    const config = {
+        eventBus,
+        getLogger: no_logger_1.default,
+        flagResolver: {
+            isEnabled: () => {
+                return flagEnabled;
+            },
+        },
+    };
+    const lastSeenService = new last_seen_service_1.LastSeenService({
+        lastSeenStore: stores.lastSeenStore,
+        featureToggleStore: stores.featureToggleStore,
+    }, config);
+    lastSeenService.updateLastSeen = jest.fn();
+    const service = new metrics_service_v2_1.default(stores, config, lastSeenService);
+    return { clientMetricsService: service, eventBus, lastSeenService };
+}
+test('process metrics properly', async () => {
+    const { clientMetricsService, eventBus, lastSeenService } = initClientMetrics();
+    await clientMetricsService.registerClientMetrics({
+        appName: 'test',
+        bucket: {
+            start: '1982-07-25T12:00:00.000Z',
+            stop: '2023-07-25T12:00:00.000Z',
+            toggles: {
+                myCoolToggle: {
+                    yes: 25,
+                    no: 42,
+                    variants: {
+                        blue: 6,
+                        green: 15,
+                        red: 46,
+                    },
+                },
+                myOtherToggle: {
+                    yes: 0,
+                    no: 100,
+                },
+            },
+        },
+        environment: 'test',
+    }, '127.0.0.1');
+    expect(eventBus.emit).toHaveBeenCalledTimes(1);
+    expect(lastSeenService.updateLastSeen).toHaveBeenCalledTimes(1);
+});
+test('process metrics properly even when some names are not url friendly, filtering out invalid names when flag is on', async () => {
+    const { clientMetricsService, eventBus, lastSeenService } = initClientMetrics();
+    await clientMetricsService.registerClientMetrics({
+        appName: 'test',
+        bucket: {
+            start: '1982-07-25T12:00:00.000Z',
+            stop: '2023-07-25T12:00:00.000Z',
+            toggles: {
+                'not url friendly ☹': {
+                    yes: 0,
+                    no: 100,
+                },
+            },
+        },
+        environment: 'test',
+    }, '127.0.0.1');
+    // only toggle with a bad name gets filtered out
+    expect(eventBus.emit).not.toHaveBeenCalled();
+    expect(lastSeenService.updateLastSeen).not.toHaveBeenCalled();
+});
+test('process metrics properly even when some names are not url friendly, with default behavior when flag is off', async () => {
+    const { clientMetricsService, eventBus, lastSeenService } = initClientMetrics(false);
+    await clientMetricsService.registerClientMetrics({
+        appName: 'test',
+        bucket: {
+            start: '1982-07-25T12:00:00.000Z',
+            stop: '2023-07-25T12:00:00.000Z',
+            toggles: {
+                'not url friendly ☹': {
+                    yes: 0,
+                    no: 100,
+                },
+            },
+        },
+        environment: 'test',
+    }, '127.0.0.1');
+    expect(eventBus.emit).toHaveBeenCalledTimes(1);
+    expect(lastSeenService.updateLastSeen).toHaveBeenCalledTimes(1);
+});
+test('get daily client metrics for a toggle', async () => {
+    const yesterday = (0, date_fns_1.subDays)(new Date(), 1);
+    const twoDaysAgo = (0, date_fns_1.subDays)(new Date(), 2);
+    const threeDaysAgo = (0, date_fns_1.subDays)(new Date(), 3);
+    const baseData = {
+        featureName: 'feature',
+        appName: 'test',
+        environment: 'development',
+        yes: 0,
+        no: 0,
+    };
+    const clientMetricsStoreV2 = {
+        getMetricsForFeatureToggleV2(featureName, hoursBack) {
+            return Promise.resolve([
+                {
+                    ...baseData,
+                    timestamp: (0, date_fns_1.endOfDay)(yesterday),
+                    yes: 2,
+                    no: 1,
+                    variants: { a: 1, b: 1 },
+                },
+            ]);
+        },
+    };
+    const config = {
+        flagResolver: {
+            isEnabled() {
+                return true;
+            },
+        },
+        getLogger() { },
+    };
+    const lastSeenService = {};
+    const service = new metrics_service_v2_1.default({ clientMetricsStoreV2 }, config, lastSeenService);
+    const metrics = await service.getClientMetricsForToggle('feature', 3 * 24);
+    expect(metrics).toMatchObject([
+        { ...baseData, timestamp: (0, date_fns_1.endOfDay)(threeDaysAgo) },
+        { ...baseData, timestamp: (0, date_fns_1.endOfDay)(twoDaysAgo) },
+        {
+            ...baseData,
+            timestamp: (0, date_fns_1.endOfDay)(yesterday),
+            yes: 2,
+            no: 1,
+            variants: { a: 1, b: 1 },
+        },
+    ]);
+});
+test('get hourly client metrics for a toggle', async () => {
+    const hourAgo = (0, date_fns_1.startOfHour)((0, date_fns_1.subHours)(new Date(), 1));
+    const thisHour = (0, date_fns_1.startOfHour)(new Date());
+    const baseData = {
+        featureName: 'feature',
+        appName: 'test',
+        environment: 'development',
+        yes: 0,
+        no: 0,
+    };
+    const clientMetricsStoreV2 = {
+        getMetricsForFeatureToggleV2(featureName, hoursBack) {
+            return Promise.resolve([
+                {
+                    ...baseData,
+                    timestamp: thisHour,
+                    yes: 2,
+                    no: 1,
+                    variants: { a: 1, b: 1 },
+                },
+            ]);
+        },
+    };
+    const config = {
+        flagResolver: {
+            isEnabled() {
+                return true;
+            },
+        },
+        getLogger() { },
+    };
+    const lastSeenService = {};
+    const service = new metrics_service_v2_1.default({ clientMetricsStoreV2 }, config, lastSeenService);
+    const metrics = await service.getClientMetricsForToggle('feature', 2);
+    expect(metrics).toMatchObject([
+        { ...baseData, timestamp: hourAgo },
+        {
+            ...baseData,
+            timestamp: thisHour,
+            yes: 2,
+            no: 1,
+            variants: { a: 1, b: 1 },
+        },
+    ]);
+});
+const setupMetricsService = ({ enabledCount, variantCount, enabledDailyCount, variantDailyCount, limit, }) => {
+    let aggregationCalled = false;
+    let recordedWarning = '';
+    const clientMetricsStoreV2 = {
+        aggregateDailyMetrics() {
+            aggregationCalled = true;
+            return Promise.resolve();
+        },
+        countPreviousDayHourlyMetricsBuckets() {
+            return { enabledCount, variantCount };
+        },
+        countPreviousDayMetricsBuckets() {
+            return {
+                enabledCount: enabledDailyCount,
+                variantCount: variantDailyCount,
+            };
+        },
+    };
+    const config = {
+        flagResolver: {
+            isEnabled() {
+                return true;
+            },
+            getVariant() {
+                return { payload: { value: limit } };
+            },
+        },
+        getLogger() {
+            return {
+                warn(message) {
+                    recordedWarning = message;
+                },
+            };
+        },
+    };
+    const lastSeenService = {};
+    const service = new metrics_service_v2_1.default({ clientMetricsStoreV2 }, config, lastSeenService);
+    return {
+        service,
+        aggregationCalled: () => aggregationCalled,
+        recordedWarning: () => recordedWarning,
+    };
+};
+test('do not aggregate previous day metrics when metrics already calculated', async () => {
+    const { service, recordedWarning, aggregationCalled } = setupMetricsService({
+        enabledCount: 2,
+        variantCount: 4,
+        enabledDailyCount: 2,
+        variantDailyCount: 4,
+        limit: 6,
+    });
+    await service.aggregateDailyMetrics();
+    expect(recordedWarning()).toBe('');
+    expect(aggregationCalled()).toBe(false);
+});
+test('do not aggregate previous day metrics when metrics count is below limit', async () => {
+    const { service, recordedWarning, aggregationCalled } = setupMetricsService({
+        enabledCount: 2,
+        variantCount: 4,
+        enabledDailyCount: 0,
+        variantDailyCount: 0,
+        limit: 5,
+    });
+    await service.aggregateDailyMetrics();
+    expect(recordedWarning()).toBe('Skipping previous day metrics aggregation. Too many results. Expected max value: 5, Actual value: 6');
+    expect(aggregationCalled()).toBe(false);
+});
+test('aggregate previous day metrics', async () => {
+    const { service, recordedWarning, aggregationCalled } = setupMetricsService({
+        enabledCount: 2,
+        variantCount: 4,
+        enabledDailyCount: 0,
+        variantDailyCount: 0,
+        limit: 6,
+    });
+    await service.aggregateDailyMetrics();
+    expect(recordedWarning()).toBe('');
+    expect(aggregationCalled()).toBe(true);
+});
+//# sourceMappingURL=metrics-service-v2.test.js.map

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

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

package/dist/lib/{services/client-metrics → features/metrics/instance}/instance-service.d.ts

@@ -1,12 +1,12 @@
 import { IApplication } from './models';
-import { IUnleashStores } from '../../types/stores';
-import { IUnleashConfig } from '../../types/option';
-import { IClientApplication } from '../../types/stores/client-applications-store';
-import { IApplicationQuery } from '../../types/query';
-import { IClientApp } from '../../types/model';
-import { PartialSome } from '../../types/partial';
-import { IPrivateProjectChecker } from '../../features/private-project/privateProjectCheckerType';
-import { Logger } from '../../logger';
+import { IUnleashStores } from '../../../types/stores';
+import { IUnleashConfig } from '../../../types/option';
+import { IClientApplication } from '../../../types/stores/client-applications-store';
+import { IApplicationQuery } from '../../../types/query';
+import { IClientApp } from '../../../types/model';
+import { PartialSome } from '../../../types/partial';
+import { IPrivateProjectChecker } from '../../private-project/privateProjectCheckerType';
+import { Logger } from '../../../logger';
 export default class ClientInstanceService {
     apps: {};
     logger: Logger;
@@ -30,5 +30,6 @@ export default class ClientInstanceService {
     deleteApplication(appName: string): Promise<void>;
     createApplication(input: IApplication): Promise<void>;
     removeInstancesOlderThanTwoDays(): Promise<void>;
+    usesSdkOlderThan(sdkName: string, sdkVersion: string): Promise<boolean>;
 }
 //# sourceMappingURL=instance-service.d.ts.map