stringify sourceContext before concat (#265)

ofrobots · web-flow · commit 6956da821b55 · 2017-05-17T21:31:53.000-07:00
diff --git a/src/agent/debuglet.js b/src/agent/debuglet.js
@@ -290,9 +290,8 @@ Debuglet.createDebuggee =
     desc += ' description:' + description;
   }
 
-  var uniquifier =
-      desc + version + uid + sourceContext + JSON.stringify(labels);
-  uniquifier = crypto.createHash('sha1').update(uniquifier).digest('hex');
+  var uniquifier = Debuglet._createUniquifier(desc, version, uid, sourceContext,
+      labels);
 
   var statusMessage =
       errorMessage ?
@@ -736,3 +735,10 @@ Debuglet._delimit = function(source, delim) {
   }
   return dest;
 };
+
+Debuglet._createUniquifier = function (desc, version, uid, sourceContext,
+  labels) {
+  var uniquifier = desc + version + uid + JSON.stringify(sourceContext) +
+    JSON.stringify(labels);
+  return crypto.createHash('sha1').update(uniquifier).digest('hex');
+};
diff --git a/test/test-debuglet.js b/test/test-debuglet.js
@@ -793,4 +793,43 @@ describe('Debuglet', function() {
        });
   });
 
+  describe('_createUniquifier', function () {
+    it('should create a unique string', function () {
+      var fn = Debuglet._createUniquifier;
+
+      var desc = 'description';
+      var version = 'version';
+      var uid = 'uid';
+      var sourceContext = {
+        git: 'something'
+      };
+      var labels = {
+        key: 'value'
+      };
+
+      var u1 = fn(desc, version, uid, sourceContext, labels);
+
+      assert.strictEqual(fn(desc, version, uid, sourceContext, labels), u1);
+
+      assert.notStrictEqual(
+        fn('foo', version, uid, sourceContext, labels),
+        u1,
+        'changing the description should change the result');
+      assert.notStrictEqual(
+        fn(desc, '1.2', uid, sourceContext, labels),
+        u1,
+        'changing the version should change the result');
+      assert.notStrictEqual(
+        fn(desc, version, '5', sourceContext, labels), u1,
+        'changing the description should change the result');
+      assert.notStrictEqual(
+        fn(desc, version, uid, { git: 'blah' }, labels),
+        u1,
+        'changing the sourceContext should change the result');
+      assert.notStrictEqual(
+        fn(desc, version, uid, sourceContext, { key1: 'value2' }),
+        u1,
+        'changing the labels should change the result');
+    });
+  });
 });
