fix(collector): correctly read severity during SS

Author: dszakallas

lib/agent/tracer/collector.js

@@ -285,11 +285,11 @@ Collector.prototype.serverSend = function (payload, briefcase, options) {
     }, payload.severity != null ? payload.severity : this.defaultSeverity)
   }
 
+  var severity = this._getSeverityHintFromCache(communicationId)
+
   this._removeLockFromCache(communicationId)
   this._flushUnlockedCache(communicationId)
 
-  var severity = this._getSeverityHintFromCache(communicationId)
-
   var duffelBag = {
     timestamp: timestamp,
     severity: severity,
@@ -407,7 +407,7 @@ Collector.prototype._getSeverityHintFromCache = function (cacheId) {
   if (this._eventBuffers[cacheId]) {
     return this._eventBuffers[cacheId].severityBuf.elements().reduce(function (acc, x) {
       return levels.gte(acc, x) ? acc : x
-    })
+    }, this.defaultSeverity)
   } else {
     return this.defaultSeverity
   }

lib/agent/tracer/collector.spec.js

@@ -283,6 +283,35 @@ describe('Collector', function () {
       expect(tracer.collect().length).to.be.equal(2)
     })
 
+    it('SS duffelBag contains mustCollect', function () {
+      var tracer = new Collector(options)
+      var sr = {
+        payload: { },
+        duffelBag: {
+          communicationId: 'commId',
+          transactionId: 'trId',
+          severity: tracer.mustCollectSeverity
+        }
+      }
+      var ss = {
+        payload: { },
+        briefcase: {
+          communication: {
+            id: sr.duffelBag.communicationId,
+            transactionId: sr.duffelBag.transactionId
+          }
+        }
+      }
+
+      this.sandbox.stub(microtime, 'now', function () {
+        return 2
+      })
+
+      tracer.serverRecv(sr.payload, sr.duffelBag)
+      var ssResult = tracer.serverSend(ss.payload, ss.briefcase)
+      expect(ssResult.duffelBag.severity).to.equal(tracer.mustCollectSeverity)
+    })
+
     it('both is dropped when SS is skipped', function () {
       var tracer = new Collector(options)
       var sr = {