fix: corrected the config precedence for agent config

packages/collector/src/announceCycle/agentready.js

@@ -12,7 +12,7 @@ try {
   // Worker threads are not available, so we know that this is the main thread.
 }
 
-const { tracing } = require('@instana/core');
+const { tracing, coreConfig, util } = require('@instana/core');
 const agentConnection = require('../agentConnection');
 const agentOpts = require('../agent/opts');
 const initializedTooLate = require('../util/initializedTooLate');
@@ -130,7 +130,8 @@ function enter(_ctx) {
     }
   }
 
-  tracing.activate(agentOpts.config);
+  const updatedConfig = coreConfig.update(agentOpts.config, util.constants.CONFIG_SOURCES.AGENT);
+  tracing.activate(updatedConfig);
 
   if (agentOpts.autoProfile && autoprofile) {
     profiler = autoprofile.start();

packages/collector/src/util/normalizeConfig.js

@@ -6,6 +6,7 @@
 'use strict';
 
 const util = require('@instana/core/src/config/util');
+const validate = require('@instana/core/src/config/validator');
 
 const defaults = {
   agentHost: '127.0.0.1',
@@ -42,12 +43,15 @@ module.exports = function normalizeConfig(userConfig = {}) {
  * @returns {string}
  */
 function normalizeAgentHost(userConfig, defaultConfig) {
-  return util.resolveStringConfig({
-    envVar: 'INSTANA_AGENT_HOST',
-    configValue: userConfig.agentHost,
-    defaultValue: defaultConfig.agentHost,
-    configPath: 'config.agentHost'
-  });
+  const { value } = util.resolve(
+    {
+      envValue: 'INSTANA_AGENT_HOST',
+      inCodeValue: userConfig.agentHost,
+      defaultValue: defaultConfig.agentHost
+    },
+    [validate.stringValidator]
+  );
+  return value;
 }
 
 /**
@@ -56,12 +60,15 @@ function normalizeAgentHost(userConfig, defaultConfig) {
  * @returns {number}
  */
 function normalizeAgentPort(userConfig, defaultConfig) {
-  return util.resolveNumericConfig({
-    envVar: 'INSTANA_AGENT_PORT',
-    configValue: userConfig.agentPort,
-    defaultValue: defaultConfig.agentPort,
-    configPath: 'config.agentPort'
-  });
+  const { value } = util.resolve(
+    {
+      envValue: 'INSTANA_AGENT_PORT',
+      inCodeValue: userConfig.agentPort,
+      defaultValue: defaultConfig.agentPort
+    },
+    [validate.numberValidator]
+  );
+  return value;
 }
 
 /**
@@ -70,12 +77,15 @@ function normalizeAgentPort(userConfig, defaultConfig) {
  * @returns {number}
  */
 function normalizeAgentRequestTimeout(userConfig, defaultConfig) {
-  return util.resolveNumericConfig({
-    envVar: 'INSTANA_AGENT_REQUEST_TIMEOUT',
-    configValue: userConfig.agentRequestTimeout,
-    defaultValue: defaultConfig.agentRequestTimeout,
-    configPath: 'config.agentRequestTimeout'
-  });
+  const { value } = util.resolve(
+    {
+      envValue: 'INSTANA_AGENT_REQUEST_TIMEOUT',
+      inCodeValue: userConfig.agentRequestTimeout,
+      defaultValue: defaultConfig.agentRequestTimeout
+    },
+    [validate.numberValidator]
+  );
+  return value;
 }
 
 /**
@@ -84,18 +94,28 @@ function normalizeAgentRequestTimeout(userConfig, defaultConfig) {
  * @returns {boolean}
  */
 function normalizeAutoProfile(userConfig, defaultConfig) {
-  return util.resolveBooleanConfig({
-    envVar: 'INSTANA_AUTO_PROFILE',
-    configValue: userConfig.autoProfile,
-    defaultValue: defaultConfig.autoProfile,
-    configPath: 'config.autoProfile'
-  });
+  const { value } = util.resolve(
+    {
+      envValue: 'INSTANA_AUTO_PROFILE',
+      inCodeValue: userConfig.autoProfile,
+      defaultValue: defaultConfig.autoProfile
+    },
+    [validate.booleanValidator]
+  );
+  return value;
 }
 
 /**
  * @param {import('../types/collector').CollectorConfig} userConfig
  * @returns {boolean}
  */
 function normalizeUnhandledRejections(userConfig) {
-  return userConfig.reportUnhandledPromiseRejections ?? false;
+  const { value } = util.resolve(
+    {
+      inCodeValue: userConfig.reportUnhandledPromiseRejections,
+      defaultValue: false
+    },
+    [validate.booleanValidator]
+  );
+  return value;
 }