Skip to content

fix(core): allowed metrics interval up to 60s #2713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kirrg001 wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −10
Draft

fix(core): allowed metrics interval up to 60s #2713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/core/src/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ let currentConfig;
/** @type {String[]} */
const allowedSecretMatchers = ['equals', 'equals-ignore-case', 'contains', 'contains-ignore-case', 'regex', 'none'];

const transmissionDelayMaxValue = 5000;
const transmissionDelayMaxValue = 60 * 1000;

/**
* @typedef {Object} InstanaConfig
Expand Down
30 changes: 21 additions & 9 deletions packages/core/test/config/normalizeConfig_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,27 +116,39 @@ describe('config.normalizeConfig', () => {
expect(config.metrics.transmissionDelay).to.equal(1000);
});

it('should use max metrics transmission settings when value exceeds max of 5000', () => {
process.env.INSTANA_METRICS_TRANSMISSION_DELAY = '6000';
it('should accept metrics transmission delay of 5s', () => {
process.env.INSTANA_METRICS_TRANSMISSION_DELAY = String(5 * 1000);
const normalizedConfig = coreConfig.normalize();
expect(normalizedConfig.metrics.transmissionDelay).to.equal(5000);
expect(normalizedConfig.metrics.transmissionDelay).to.equal(5 * 1000);
});

it('should accept metrics transmission delay at max value of 5000', () => {
process.env.INSTANA_METRICS_TRANSMISSION_DELAY = '5000';
it('should accept metrics transmission delay of 30s', () => {
process.env.INSTANA_METRICS_TRANSMISSION_DELAY = String(30 * 1000);
const normalizedConfig = coreConfig.normalize();
expect(normalizedConfig.metrics.transmissionDelay).to.equal(5000);
expect(normalizedConfig.metrics.transmissionDelay).to.equal(30 * 1000);
});

it('should use max metrics transmission settings when value exceeds max 5000', () => {
it('should cap metrics transmission delay of 120s to max of 60s', () => {
process.env.INSTANA_METRICS_TRANSMISSION_DELAY = String(120 * 1000);
const normalizedConfig = coreConfig.normalize();
expect(normalizedConfig.metrics.transmissionDelay).to.equal(60 * 1000);
});

it('should accept metrics transmission delay at max value of 60s', () => {
process.env.INSTANA_METRICS_TRANSMISSION_DELAY = String(60 * 1000);
const normalizedConfig = coreConfig.normalize();
expect(normalizedConfig.metrics.transmissionDelay).to.equal(60 * 1000);
});

it('should cap metrics transmission delay from config exceeding 60s', () => {
const config = coreConfig.normalize({
userConfig: {
metrics: {
transmissionDelay: 9753
transmissionDelay: 90 * 1000
}
}
});
expect(config.metrics.transmissionDelay).to.equal(5000);
expect(config.metrics.transmissionDelay).to.equal(60 * 1000);
});

it('should use default (1000) for transmissionDelay when neither env nor config is set', () => {
Expand Down