fix: allow file config to override true default values (#4119)

elastic · Jul 31, 2024 · 905289e · 905289e
1 parent 77b1823
commit 905289e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/lib/config/schema.js b/lib/config/schema.js
@@ -876,7 +876,7 @@ CONFIG_SCHEMA.forEach((def) => {
   if (def.envVar && process.env[def.envVar]) {
     def.environmentValue = process.env[def.envVar];
     def.source = 'environment';
-  } else if (fileOpts && fileOpts[def.name]) {
+  } else if (fileOpts && typeof fileOpts[def.name] !== 'undefined') {
     def.fileValue = fileOpts[def.name];
     def.source = 'file';
   }

diff --git a/test/start/file/elastic-apm-node.js b/test/start/file/elastic-apm-node.js
@@ -7,5 +7,6 @@
 'use strict'
 
 module.exports = {
-  serviceName: 'from-file'
+  serviceName: 'from-file',
+  active: false
 }
diff --git a/test/start/file/test.test.js b/test/start/file/test.test.js
@@ -17,7 +17,17 @@ var agent = require('../../..').start({
 
 const tape = require('tape');
 
-tape('from-file serviceName test', function (t) {
-  t.equals(agent._conf.serviceName, 'from-file');
+tape('from-file configuration test', function (t) {
+  t.equals(
+    agent._conf.serviceName,
+    'from-file',
+    'serviceName comes from config file',
+  );
+  t.equals(
+    agent._conf.active,
+    false,
+    'false values from config file override defaults',
+  );
+  t.equals(agent._conf.captureBody, 'off', 'existing defaults are preserved');
   t.end();
 });