Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.4.0 (May 23, 2022)
1.4.0 (May 24, 2022)
- Added `scheduler.telemetryRefreshRate` property to SDK configuration, and deprecated `scheduler.metricsRefreshRate` property.
- Updated SDK telemetry storage, metrics and updater to be more effective and send less often.
- Bugfixing - Updated default values for `scheduler.impressionsRefreshRate` config parameter: 300s for OPTIMIZED impression mode and 60s for DEBUG impression mode.
Expand Down
2 changes: 1 addition & 1 deletion src/utils/lang/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function forOwn<T>(obj: { [key: string]: T }, iteratee: (value: T, key: s
* Safely retrieve the specified prop from obj. If we can't retrieve
* that property value, we return the default value.
*/
export function get(obj: any, prop: any, val: any): any {
export function get(obj: any, prop: any, val?: any): any {
let res = val;

try { // No risks nor lots of checks.
Expand Down
63 changes: 34 additions & 29 deletions src/utils/settingsValidation/__tests__/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,36 @@ describe('settingsValidation', () => {
expect(settings.sync.impressionsMode).toBe(OPTIMIZED);
});

test('override with defaults', () => {
const settings = settingsValidation({
core: {
authorizationKey: 'dummy token'
},
sync: {
impressionsMode: 'some',
}
}, minimalSettingsParams);
test('override with default impressionMode if provided one is invalid', () => {
const config = {
core: { authorizationKey: 'dummy token' },
sync: { impressionsMode: 'some' }
};
let settings = settingsValidation(config, minimalSettingsParams);

expect(settings.sync.impressionsMode).toBe(OPTIMIZED);
expect(settings.scheduler.impressionsRefreshRate).toBe(300000);
expect(settings.scheduler.impressionsRefreshRate).toBe(300000); // Default

settings = settingsValidation({ ...config, scheduler: { impressionsRefreshRate: 10 } }, minimalSettingsParams);

expect(settings.sync.impressionsMode).toBe(OPTIMIZED);
expect(settings.scheduler.impressionsRefreshRate).toBe(10000);
});

test('impressionsMode should be configurable', () => {
const settings = settingsValidation({
core: {
authorizationKey: 'dummy token'
},
sync: {
impressionsMode: DEBUG
}
}, minimalSettingsParams);
const config = {
core: { authorizationKey: 'dummy token' },
sync: { impressionsMode: DEBUG }
};
let settings = settingsValidation(config, minimalSettingsParams);

expect(settings.sync.impressionsMode).toEqual(DEBUG);
expect(settings.scheduler.impressionsRefreshRate).toBe(60000); // Different default for DEBUG impressionsMode

settings = settingsValidation({ ...config, scheduler: { impressionsRefreshRate: 10 } }, minimalSettingsParams);

expect(settings.sync.impressionsMode).toBe(DEBUG);
expect(settings.scheduler.impressionsRefreshRate).toBe(10000);
});

test('urls should be configurable', () => {
Expand Down Expand Up @@ -246,17 +250,18 @@ describe('settingsValidation', () => {
expect(settings.core.trafficType).toEqual(true); // traffic type is ignored
});

test('validate min values', () => {
const settings = settingsValidation({
scheduler: {
telemetryRefreshRate: 0,
impressionsRefreshRate: 'invalid',
}
}, minimalSettingsParams);

expect(settings.scheduler.telemetryRefreshRate).toBe(60000);
expect(settings.scheduler.impressionsRefreshRate).toBe(60000);
});
// Not implemented yet
// test('validate min values', () => {
// const settings = settingsValidation({
// scheduler: {
// telemetryRefreshRate: 0,
// impressionsRefreshRate: 'invalid',
// }
// }, minimalSettingsParams);

// expect(settings.scheduler.telemetryRefreshRate).toBe(60000);
// expect(settings.scheduler.impressionsRefreshRate).toBe(60000);
// });

});

Expand Down
13 changes: 3 additions & 10 deletions src/utils/settingsValidation/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { merge } from '../lang';
import { merge, get } from '../lang';
import { mode } from './mode';
import { validateSplitFilters } from './splitFilters';
import { STANDALONE_MODE, OPTIMIZED, LOCALHOST_MODE, DEBUG } from '../constants';
Expand Down Expand Up @@ -131,15 +131,8 @@ export function settingsValidation(config: unknown, validationParams: ISettingsV
scheduler.eventsPushRate = fromSecondsToMillis(scheduler.eventsPushRate);
scheduler.telemetryRefreshRate = fromSecondsToMillis(validateMinValue('telemetryRefreshRate', scheduler.telemetryRefreshRate, 60));

if (scheduler.impressionsRefreshRate !== base.scheduler.impressionsRefreshRate) {
// Validate impressionsRefreshRate defined by user
scheduler.impressionsRefreshRate = validateMinValue('impressionsRefreshRate', scheduler.impressionsRefreshRate,
withDefaults.sync.impressionsMode === DEBUG ? 1 : 60 // Min is 1 sec for DEBUG and 60 secs for OPTIMIZED
);
} else {
// Default impressionsRefreshRate for DEBUG mode is 60 secs
if (withDefaults.sync.impressionsMode === DEBUG) scheduler.impressionsRefreshRate = 60;
}
// Default impressionsRefreshRate for DEBUG mode is 60 secs
if (get(config, 'scheduler.impressionsRefreshRate') === undefined && withDefaults.sync.impressionsMode === DEBUG) scheduler.impressionsRefreshRate = 60;
scheduler.impressionsRefreshRate = fromSecondsToMillis(scheduler.impressionsRefreshRate);

// Log deprecation for old telemetry param
Expand Down