Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-04 00:18:01 +01:00
Code Issues Projects Releases Wiki Activity

fix: allow instance ID to be empty for metrics (#1471)

Browse Source
This commit is contained in:
olav 2022-04-01 10:34:22 +02:00 committed by GitHub
parent be21a2af68
commit cf06b562f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/routes/client-api/metrics.test.ts
View File

@ -192,7 +192,6 @@ test('should set lastSeen on toggle', async () => {
.post('/api/client/metrics')
.send({
appName: 'demo',
instanceId: '1',
bucket: {
start: Date.now(),
stop: Date.now(),

13
src/lib/routes/client-api/register.test.ts
View File

@ -83,3 +83,16 @@ test('should require strategies field', () => {
})
.expect(400);
});
test('should allow an empty instanceId field', () => {
expect.assertions(0);
return request
.post('/api/client/register')
.send({
appName: 'demo',
strategies: ['default'],
started: Date.now(),
interval: 10,
})
.expect(202);
});

5
src/lib/services/client-metrics/instance-service.ts
View File

@ -18,6 +18,7 @@ import { clientRegisterSchema } from './schema';
import { minutesToMilliseconds, secondsToMilliseconds } from 'date-fns';
import { IClientMetricsStoreV2 } from '../../types/stores/client-metrics-store-v2';
import { clientMetricsSchema } from './schema';
import { PartialSome } from '../../types/partial';
export default class ClientInstanceService {
apps = {};
@ -90,7 +91,7 @@ export default class ClientInstanceService {
}
public async registerInstance(
data: IClientApp,
data: PartialSome<IClientApp, 'instanceId'>,
clientIp: string,
): Promise<void> {
const value = await clientMetricsSchema.validateAsync(data);
@ -103,7 +104,7 @@ export default class ClientInstanceService {
}
public async registerClient(
data: IClientApp,
data: PartialSome<IClientApp, 'instanceId'>,
clientIp: string,
): Promise<void> {
const value = await clientRegisterSchema.validateAsync(data);

4
src/lib/services/client-metrics/schema.ts
View File

@ -15,7 +15,7 @@ export const clientMetricsSchema = joi
.keys({
environment: joi.string().optional(),
appName: joi.string().required(),
instanceId: joi.string().required(),
instanceId: joi.string().default('default'),
bucket: joi
.object()
.required()
@ -48,7 +48,7 @@ export const clientRegisterSchema = joi
.options({ stripUnknown: true })
.keys({
appName: joi.string().required(),
instanceId: joi.string().required(),
instanceId: joi.string().default('default'),
sdkVersion: joi.string().optional(),
strategies: joi
.array()