merge configs using a deep copy (#240)

ofrobots · web-flow · commit 21a8f5accf00 · 2017-02-11T07:36:43.000-08:00
We were losing the default values of some properties previously.
diff --git a/src/agent/debuglet.js b/src/agent/debuglet.js
@@ -155,7 +155,7 @@ Debuglet.prototype.normalizeConfig_ = function(config) {
     }
   };
 
-  config = extend({}, defaultConfig, config, envConfig);
+  config = extend(true, {}, defaultConfig, config, envConfig);
 
   if (config.keyFilename || config.credentials || config.projectId) {
     throw new Error('keyFilename, projectId or credentials should be provided' +
diff --git a/test/test-debuglet.js b/test/test-debuglet.js
@@ -58,6 +58,20 @@ describe('Debuglet', function() {
 
     afterEach(function() { nock.cleanAll(); });
 
+    it('should merge config correctly', function() {
+      var debug = require('../src/debug.js')();
+
+      var testValue = 2 * defaultConfig.capture.maxExpandFrames;
+      var config = {capture: {maxExpandFrames: testValue}};
+      var debuglet = new Debuglet(debug, config);
+
+      // The actual config should be exactly defaultConfig with only
+      // maxExpandFrames adjusted.
+      var compareConfig = extend(true, {}, defaultConfig);
+      compareConfig.capture.maxExpandFrames = testValue;
+      assert.deepEqual(debuglet.config_, compareConfig);
+    });
+
     it('should not start when projectId is not available', function(done) {
       this.timeout(8000);
       var debug = require('../src/debug.js')();

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ Debuglet.prototype.normalizeConfig_ = function(config) {`
`155`	`155`	`}`
`156`	`156`	`};`
`157`	`157`
`158`		`- config = extend({}, defaultConfig, config, envConfig);`
	`158`	`+ config = extend(true, {}, defaultConfig, config, envConfig);`
`159`	`159`
`160`	`160`	`if (config.keyFilename \|\| config.credentials \|\| config.projectId) {`
`161`	`161`	`throw new Error('keyFilename, projectId or credentials should be provided' +`