Skip to content

refactor: build config from user config instead of mutating pre-filled object #2448

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
aryamohanan wants to merge 4 commits into
base: fix-config-precedence
Choose a base branch
from
Draft

refactor: build config from user config instead of mutating pre-filled object #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77ab6ce
refactor: build config from userConfig instead of mutating pre-filled…
aryamohanan Mar 30, 2026
16f2407
chore: refactor
aryamohanan Mar 31, 2026
d3caf5b
chore: updated
aryamohanan Apr 1, 2026
71a1f10
chore: refactor
aryamohanan Apr 1, 2026
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
4 changes: 2 additions & 2 deletions packages/aws-lambda/src/wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const latestRuntime = semver.gte(process.version, '24.0.0');

const logger = serverlessLogger.init();
coreConfig.init(logger);
let config = coreConfig.normalize({}, lambdaConfigDefaults);
let config = coreConfig.normalize({ defaultsOverride: lambdaConfigDefaults });
let coldStart = true;

// Initialize instrumentations early to allow for require statements after our
Expand Down Expand Up @@ -286,7 +286,7 @@ function init(event, arnInfo, _config) {
// - late env variables (less likely)
// - custom logger
// - we always renormalize unconditionally to ensure safety.
config = coreConfig.normalize(userConfig, lambdaConfigDefaults);
config = coreConfig.normalize({ userConfig, defaultsOverride: lambdaConfigDefaults });

if (!config.tracing.enabled) {
return false;
Expand Down
7 changes: 5 additions & 2 deletions packages/collector/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,11 @@ function init(userConfig = {}) {
log.init(userConfig);
}

config = normalizeCollectorConfig(userConfig);
config = instanaNodeJsCore.coreConfig.normalize(config);
const collectorConfig = normalizeCollectorConfig(userConfig);
config = instanaNodeJsCore.coreConfig.normalize({
userConfig,
extraFinalConfig: collectorConfig
});

agentConnection = require('./agentConnection');
const agentOpts = require('./agent/opts');
Expand Down
Loading