unleash-server 5.2.8 → 5.2.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/routes/client-api/metrics.js +3 -3
- package/dist/lib/routes/client-api/metrics.js.map +1 -1
- package/dist/lib/services/client-metrics/metrics-service-v2.d.ts +2 -0
- package/dist/lib/services/client-metrics/metrics-service-v2.js +29 -12
- package/dist/lib/services/client-metrics/metrics-service-v2.js.map +1 -1
- package/dist/lib/services/client-metrics/metrics-service-v2.test.d.ts +1 -0
- package/dist/lib/services/client-metrics/metrics-service-v2.test.js +96 -0
- package/dist/lib/services/client-metrics/metrics-service-v2.test.js.map +1 -0
- package/dist/lib/types/experimental.d.ts +1 -1
- package/dist/lib/types/experimental.js +1 -0
- package/dist/lib/types/experimental.js.map +1 -1
- package/package.json +1 -1
|
@@ -36,10 +36,10 @@ class ClientMetricsController extends controller_1.default {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
async registerMetrics(req, res) {
|
|
39
|
-
const { body: data, ip: clientIp, user } = req;
|
|
40
|
-
data.environment = this.metricsV2.resolveMetricsEnvironment(user, data);
|
|
41
|
-
await this.clientInstanceService.registerInstance(data, clientIp);
|
|
42
39
|
try {
|
|
40
|
+
const { body: data, ip: clientIp, user } = req;
|
|
41
|
+
data.environment = this.metricsV2.resolveMetricsEnvironment(user, data);
|
|
42
|
+
await this.clientInstanceService.registerInstance(data, clientIp);
|
|
43
43
|
await this.metricsV2.registerClientMetrics(data, clientIp);
|
|
44
44
|
res.status(202).end();
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,yDAA+C;AAE/C,oFAA+E;AAC/E,8EAG+C;AAE/C,MAAqB,uBAAwB,SAAQ,oBAAU;IAS3D,YACI,EACI,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,GAMjB,EACD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAE7B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC/C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC;QAExC,IAAI,CAAC,KAAK,CAAC;YACP,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,IAAI,CAAC,eAAe;YAC7B,UAAU,EAAE,kBAAI;YAChB,UAAU,EAAE;gBACR,cAAc,CAAC,SAAS,CAAC;oBACrB,IAAI,EAAE,CAAC,QAAQ,CAAC;oBAChB,OAAO,EAAE,+BAA+B;oBACxC,WAAW,EAAE,2QAA2Q;oBACxR,WAAW,EAAE,uBAAuB;oBACpC,WAAW,EAAE,IAAA,2CAAmB,EAAC,qBAAqB,CAAC;oBACvD,SAAS,EAAE;wBACP,GAAG,IAAA,yCAAoB,EAAC,GAAG,CAAC;wBAC5B,GAAG,EAAE,kCAAa;qBACrB;iBACJ,CAAC;aACL;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAiB,EAAE,GAAa;QAClD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,yDAA+C;AAE/C,oFAA+E;AAC/E,8EAG+C;AAE/C,MAAqB,uBAAwB,SAAQ,oBAAU;IAS3D,YACI,EACI,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,GAMjB,EACD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAE7B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC/C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC;QAExC,IAAI,CAAC,KAAK,CAAC;YACP,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,IAAI,CAAC,eAAe;YAC7B,UAAU,EAAE,kBAAI;YAChB,UAAU,EAAE;gBACR,cAAc,CAAC,SAAS,CAAC;oBACrB,IAAI,EAAE,CAAC,QAAQ,CAAC;oBAChB,OAAO,EAAE,+BAA+B;oBACxC,WAAW,EAAE,2QAA2Q;oBACxR,WAAW,EAAE,uBAAuB;oBACpC,WAAW,EAAE,IAAA,2CAAmB,EAAC,qBAAqB,CAAC;oBACvD,SAAS,EAAE;wBACP,GAAG,IAAA,yCAAoB,EAAC,GAAG,CAAC;wBAC5B,GAAG,EAAE,kCAAa;qBACrB;iBACJ,CAAC;aACL;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAiB,EAAE,GAAa;QAClD,IAAI;YACA,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;YAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,yBAAyB,CACvD,IAAI,EACJ,IAAI,CACP,CAAC;YACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAElE,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SACzB;QAAC,OAAO,CAAC,EAAE;YACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SACzB;IACL,CAAC;CACJ;AAlED,0CAkEC"}
|
|
@@ -12,8 +12,10 @@ export default class ClientMetricsServiceV2 {
|
|
|
12
12
|
private unsavedMetrics;
|
|
13
13
|
private clientMetricsStoreV2;
|
|
14
14
|
private lastSeenService;
|
|
15
|
+
private flagResolver;
|
|
15
16
|
private logger;
|
|
16
17
|
constructor({ clientMetricsStoreV2 }: Pick<IUnleashStores, 'clientMetricsStoreV2'>, config: IUnleashConfig, lastSeenService: LastSeenService, bulkInterval?: number);
|
|
18
|
+
filterValidToggleNames(toggleNames: string[]): Promise<string[]>;
|
|
17
19
|
registerBulkMetrics(metrics: IClientMetricsEnv[]): Promise<void>;
|
|
18
20
|
registerClientMetrics(data: ClientMetricsSchema, clientIp: string): Promise<void>;
|
|
19
21
|
bulkAdd(): Promise<void>;
|
|
@@ -10,6 +10,7 @@ const api_user_1 = __importDefault(require("../../types/api-user"));
|
|
|
10
10
|
const api_token_1 = require("../../types/models/api-token");
|
|
11
11
|
const collapseHourlyMetrics_1 = require("../../util/collapseHourlyMetrics");
|
|
12
12
|
const time_utils_1 = require("../../util/time-utils");
|
|
13
|
+
const feature_schema_1 = require("../../schema/feature-schema");
|
|
13
14
|
class ClientMetricsServiceV2 {
|
|
14
15
|
constructor({ clientMetricsStoreV2 }, config, lastSeenService, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
|
|
15
16
|
this.timers = [];
|
|
@@ -18,6 +19,7 @@ class ClientMetricsServiceV2 {
|
|
|
18
19
|
this.lastSeenService = lastSeenService;
|
|
19
20
|
this.config = config;
|
|
20
21
|
this.logger = config.getLogger('/services/client-metrics/client-metrics-service-v2.ts');
|
|
22
|
+
this.flagResolver = config.flagResolver;
|
|
21
23
|
this.timers.push(setInterval(() => {
|
|
22
24
|
this.bulkAdd().catch(console.error);
|
|
23
25
|
}, bulkInterval).unref());
|
|
@@ -25,6 +27,18 @@ class ClientMetricsServiceV2 {
|
|
|
25
27
|
this.clientMetricsStoreV2.clearMetrics(48).catch(console.error);
|
|
26
28
|
}, (0, date_fns_1.hoursToMilliseconds)(12)).unref());
|
|
27
29
|
}
|
|
30
|
+
async filterValidToggleNames(toggleNames) {
|
|
31
|
+
const nameValidations = toggleNames.map((toggleName) => feature_schema_1.nameSchema.validateAsync({ name: toggleName }));
|
|
32
|
+
const badNames = (await Promise.allSettled(nameValidations)).filter((r) => r.status === 'rejected');
|
|
33
|
+
if (badNames.length > 0) {
|
|
34
|
+
this.logger.warn(`Got a few toggles with invalid names: ${JSON.stringify(badNames)}`);
|
|
35
|
+
if (this.flagResolver.isEnabled('filterInvalidClientMetrics')) {
|
|
36
|
+
const justNames = badNames.map((r) => r.reason._original.name);
|
|
37
|
+
return toggleNames.filter((name) => !justNames.includes(name));
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return toggleNames;
|
|
41
|
+
}
|
|
28
42
|
async registerBulkMetrics(metrics) {
|
|
29
43
|
this.unsavedMetrics = (0, collapseHourlyMetrics_1.collapseHourlyMetrics)([
|
|
30
44
|
...this.unsavedMetrics,
|
|
@@ -36,18 +50,21 @@ class ClientMetricsServiceV2 {
|
|
|
36
50
|
const value = await schema_1.clientMetricsSchema.validateAsync(data);
|
|
37
51
|
const toggleNames = Object.keys(value.bucket.toggles).filter((name) => !(value.bucket.toggles[name].yes === 0 &&
|
|
38
52
|
value.bucket.toggles[name].no === 0));
|
|
39
|
-
this.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
53
|
+
const validatedToggleNames = await this.filterValidToggleNames(toggleNames);
|
|
54
|
+
this.logger.debug(`Got ${toggleNames.length} (${validatedToggleNames.length} valid) metrics from ${clientIp}`);
|
|
55
|
+
if (validatedToggleNames.length > 0) {
|
|
56
|
+
const clientMetrics = validatedToggleNames.map((name) => ({
|
|
57
|
+
featureName: name,
|
|
58
|
+
appName: value.appName,
|
|
59
|
+
environment: value.environment ?? 'default',
|
|
60
|
+
timestamp: value.bucket.start,
|
|
61
|
+
yes: value.bucket.toggles[name].yes ?? 0,
|
|
62
|
+
no: value.bucket.toggles[name].no ?? 0,
|
|
63
|
+
variants: value.bucket.toggles[name].variants,
|
|
64
|
+
}));
|
|
65
|
+
await this.registerBulkMetrics(clientMetrics);
|
|
66
|
+
this.config.eventBus.emit(events_1.CLIENT_METRICS, value);
|
|
67
|
+
}
|
|
51
68
|
}
|
|
52
69
|
async bulkAdd() {
|
|
53
70
|
if (this.unsavedMetrics.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":";;;;;AAQA,qCAA+C;AAC/C,uCAIkB;AAClB,+CAAoD;AACpD,oEAA2C;AAC3C,4DAAmD;AAEnD,4EAAyE;AAEzE,sDAA4D;
|
|
1
|
+
{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const metrics_service_v2_1 = __importDefault(require("./metrics-service-v2"));
|
|
7
|
+
const no_logger_1 = __importDefault(require("../../../test/fixtures/no-logger"));
|
|
8
|
+
const store_1 = __importDefault(require("../../../test/fixtures/store"));
|
|
9
|
+
const events_1 = __importDefault(require("events"));
|
|
10
|
+
const last_seen_service_1 = require("./last-seen-service");
|
|
11
|
+
function initClientMetrics(flagEnabled = true) {
|
|
12
|
+
const stores = (0, store_1.default)();
|
|
13
|
+
const eventBus = new events_1.default();
|
|
14
|
+
eventBus.emit = jest.fn();
|
|
15
|
+
const config = {
|
|
16
|
+
eventBus,
|
|
17
|
+
getLogger: no_logger_1.default,
|
|
18
|
+
flagResolver: {
|
|
19
|
+
isEnabled: () => {
|
|
20
|
+
return flagEnabled;
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
const lastSeenService = new last_seen_service_1.LastSeenService(stores, config);
|
|
25
|
+
lastSeenService.updateLastSeen = jest.fn();
|
|
26
|
+
const service = new metrics_service_v2_1.default(stores, config, lastSeenService);
|
|
27
|
+
return { clientMetricsService: service, eventBus, lastSeenService };
|
|
28
|
+
}
|
|
29
|
+
test('process metrics properly', async () => {
|
|
30
|
+
const { clientMetricsService, eventBus, lastSeenService } = initClientMetrics();
|
|
31
|
+
await clientMetricsService.registerClientMetrics({
|
|
32
|
+
appName: 'test',
|
|
33
|
+
bucket: {
|
|
34
|
+
start: '1982-07-25T12:00:00.000Z',
|
|
35
|
+
stop: '2023-07-25T12:00:00.000Z',
|
|
36
|
+
toggles: {
|
|
37
|
+
myCoolToggle: {
|
|
38
|
+
yes: 25,
|
|
39
|
+
no: 42,
|
|
40
|
+
variants: {
|
|
41
|
+
blue: 6,
|
|
42
|
+
green: 15,
|
|
43
|
+
red: 46,
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
myOtherToggle: {
|
|
47
|
+
yes: 0,
|
|
48
|
+
no: 100,
|
|
49
|
+
},
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
environment: 'test',
|
|
53
|
+
}, '127.0.0.1');
|
|
54
|
+
expect(eventBus.emit).toHaveBeenCalledTimes(1);
|
|
55
|
+
expect(lastSeenService.updateLastSeen).toHaveBeenCalledTimes(1);
|
|
56
|
+
});
|
|
57
|
+
test('process metrics properly even when some names are not url friendly, filtering out invalid names when flag is on', async () => {
|
|
58
|
+
const { clientMetricsService, eventBus, lastSeenService } = initClientMetrics();
|
|
59
|
+
await clientMetricsService.registerClientMetrics({
|
|
60
|
+
appName: 'test',
|
|
61
|
+
bucket: {
|
|
62
|
+
start: '1982-07-25T12:00:00.000Z',
|
|
63
|
+
stop: '2023-07-25T12:00:00.000Z',
|
|
64
|
+
toggles: {
|
|
65
|
+
'not url friendly ☹': {
|
|
66
|
+
yes: 0,
|
|
67
|
+
no: 100,
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
environment: 'test',
|
|
72
|
+
}, '127.0.0.1');
|
|
73
|
+
// only toggle with a bad name gets filtered out
|
|
74
|
+
expect(eventBus.emit).not.toHaveBeenCalled();
|
|
75
|
+
expect(lastSeenService.updateLastSeen).not.toHaveBeenCalled();
|
|
76
|
+
});
|
|
77
|
+
test('process metrics properly even when some names are not url friendly, with default behavior when flag is off', async () => {
|
|
78
|
+
const { clientMetricsService, eventBus, lastSeenService } = initClientMetrics(false);
|
|
79
|
+
await clientMetricsService.registerClientMetrics({
|
|
80
|
+
appName: 'test',
|
|
81
|
+
bucket: {
|
|
82
|
+
start: '1982-07-25T12:00:00.000Z',
|
|
83
|
+
stop: '2023-07-25T12:00:00.000Z',
|
|
84
|
+
toggles: {
|
|
85
|
+
'not url friendly ☹': {
|
|
86
|
+
yes: 0,
|
|
87
|
+
no: 100,
|
|
88
|
+
},
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
environment: 'test',
|
|
92
|
+
}, '127.0.0.1');
|
|
93
|
+
expect(eventBus.emit).toHaveBeenCalledTimes(1);
|
|
94
|
+
expect(lastSeenService.updateLastSeen).toHaveBeenCalledTimes(1);
|
|
95
|
+
});
|
|
96
|
+
//# sourceMappingURL=metrics-service-v2.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metrics-service-v2.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Variant } from 'unleash-client';
|
|
2
|
-
export declare type IFlagKey = 'anonymiseEventLog' | 'embedProxy' | 'embedProxyFrontend' | 'responseTimeWithAppNameKillSwitch' | 'maintenanceMode' | 'messageBanner' | 'featuresExportImport' | 'caseInsensitiveInOperators' | 'strictSchemaValidation' | 'proPlanAutoCharge' | 'personalAccessTokensKillSwitch' | 'cleanClientApi' | 'groupRootRoles' | 'migrationLock' | 'demo' | 'googleAuthEnabled' | 'disableBulkToggle' | 'experimentalExtendedTelemetry' | 'segmentContextFieldUsage' | 'disableNotifications' | 'advancedPlayground' | 'customRootRoles' | 'strategySplittedButton';
|
|
2
|
+
export declare type IFlagKey = 'anonymiseEventLog' | 'embedProxy' | 'embedProxyFrontend' | 'responseTimeWithAppNameKillSwitch' | 'maintenanceMode' | 'messageBanner' | 'featuresExportImport' | 'caseInsensitiveInOperators' | 'strictSchemaValidation' | 'proPlanAutoCharge' | 'personalAccessTokensKillSwitch' | 'cleanClientApi' | 'groupRootRoles' | 'migrationLock' | 'demo' | 'googleAuthEnabled' | 'disableBulkToggle' | 'experimentalExtendedTelemetry' | 'segmentContextFieldUsage' | 'disableNotifications' | 'advancedPlayground' | 'customRootRoles' | 'strategySplittedButton' | 'filterInvalidClientMetrics';
|
|
3
3
|
export declare type IFlags = Partial<{
|
|
4
4
|
[key in IFlagKey]: boolean | Variant;
|
|
5
5
|
}>;
|
|
@@ -35,6 +35,7 @@ const flags = {
|
|
|
35
35
|
disableNotifications: (0, util_1.parseEnvVarBoolean)(process.env.DISABLE_NOTIFICATIONS, false),
|
|
36
36
|
advancedPlayground: (0, util_1.parseEnvVarBoolean)(process.env.ADVANCED_PLAYGROUND, false),
|
|
37
37
|
customRootRoles: (0, util_1.parseEnvVarBoolean)(process.env.UNLEASH_EXPERIMENTAL_CUSTOM_ROOT_ROLES, false),
|
|
38
|
+
filterInvalidClientMetrics: (0, util_1.parseEnvVarBoolean)(process.env.FILTER_INVALID_CLIENT_METRICS, false),
|
|
38
39
|
};
|
|
39
40
|
exports.defaultExperimentalOptions = {
|
|
40
41
|
flags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../../../src/lib/types/experimental.ts"],"names":[],"mappings":";;;AAAA,mDAAsD;AACtD,kCAA6C;AAC7C,wDAA+D;
|
|
1
|
+
{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../../../src/lib/types/experimental.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED