feat(profiler): correlate commands with profiles

Author: gergelyke

lib/agent/control/control.js

@@ -32,7 +32,7 @@ Control.prototype.getUpdates = function () {
 
     result.commands = result.commands || []
     result.commands.forEach(function (command) {
-      _this.controlBus.emit(command.command, command.data)
+      _this.controlBus.emit(command.command, command)
     })
   })
 }

lib/agent/control/control.spec.js

@@ -5,13 +5,14 @@ var Timer = require('../timer')
 
 describe('The Control module', function () {
   it('gets memory-heapdump', function () {
+    var command = {
+      id: 123,
+      command: 'memory-heapdump'
+    }
     var collectorApi = {
       getUpdates: function (options, cb) {
         cb(null, {
-          commands: [{
-            id: 123,
-            command: 'memory-heapdump'
-          }]
+          commands: [command]
         })
       }
     }
@@ -29,7 +30,7 @@ describe('The Control module', function () {
       }
     })
     profiler.getUpdates()
-    expect(controlBus.emit).to.be.calledWith('memory-heapdump', undefined)
+    expect(controlBus.emit).to.be.calledWith('memory-heapdump', command)
   })
   it('should have a timer', function () {
     var collectorApi = {

lib/agent/profiler/cpu/index.js

@@ -9,12 +9,12 @@ function CpuProfiler (options) {
   this.controlBus = options.controlBus
   this.profileWindow = 10000
 
-  this.controlBus.on('cpu-profile', function (data) {
-    _this.sendProfile()
+  this.controlBus.on('cpu-profile', function (command) {
+    _this.sendProfile(command)
   })
 }
 
-CpuProfiler.prototype.sendProfile = function () {
+CpuProfiler.prototype.sendProfile = function (command) {
   var _this = this
 
   v8profiler.startProfiling('trace-cpu-profile', true)
@@ -30,7 +30,8 @@ CpuProfiler.prototype.sendProfile = function () {
 
       _this.collectorApi.sendCpuProfile({
         cpuProfile: result,
-        time: Date.now()
+        time: Date.now(),
+        commandId: command.id
       })
       profile.delete()
     })

lib/agent/profiler/cpu/index.spec.js

@@ -17,6 +17,9 @@ describe('The Cpu Profiler module', function () {
       },
       delete: this.sandbox.spy()
     }
+    var command = {
+      id: 42
+    }
 
     var startProfilingStub = this.sandbox.stub(v8profiler, 'startProfiling', function () {})
     var stopProfilingStub = this.sandbox.stub(v8profiler, 'stopProfiling', function () {
@@ -36,14 +39,15 @@ describe('The Cpu Profiler module', function () {
       return now
     })
 
-    profiler.sendProfile()
+    profiler.sendProfile(command)
 
     setTimeout(function () {
       expect(startProfilingStub).to.be.calledWith('trace-cpu-profile', true)
       expect(stopProfilingStub).to.be.calledWith('trace-cpu-profile')
       expect(collectorApi.sendCpuProfile).to.be.calledWith({
         cpuProfile: profileData,
-        time: now
+        time: now,
+        commandId: command.id
       })
       expect(profile.delete).to.be.called
       done()

lib/agent/profiler/memory/index.js

@@ -8,12 +8,12 @@ function MemoryProfiler (options) {
   this.collectorApi = options.collectorApi
   this.controlBus = options.controlBus
 
-  this.controlBus.on('memory-heapdump', function (data) {
-    _this.sendSnapshot()
+  this.controlBus.on('memory-heapdump', function (command) {
+    _this.sendSnapshot(command)
   })
 }
 
-MemoryProfiler.prototype.sendSnapshot = function () {
+MemoryProfiler.prototype.sendSnapshot = function (command) {
   var _this = this
   var now = Date.now()
   var snapshot = v8profiler.takeSnapshot()
@@ -25,7 +25,8 @@ MemoryProfiler.prototype.sendSnapshot = function () {
 
     _this.collectorApi.sendMemorySnapshot({
       heapSnapshot: result,
-      time: now
+      time: now,
+      commandId: command.id
     })
 
     snapshot.delete()

lib/agent/profiler/memory/index.spec.js

@@ -14,7 +14,9 @@ describe('The Memory Profiler module', function () {
     var deleteSnapshotSpy = this.sandbox.spy()
     var snapshotContent = 'snapshot'
     var now = 1234
-
+    var command = {
+      id: 42
+    }
     var profiler = MemoryProfiler.create({
       collectorApi: collectorApi,
       controlBus: msgBus
@@ -33,11 +35,12 @@ describe('The Memory Profiler module', function () {
       return now
     })
 
-    profiler.sendSnapshot()
+    profiler.sendSnapshot(command)
 
     expect(collectorApi.sendMemorySnapshot).to.be.calledWith({
       heapSnapshot: snapshotContent,
-      time: now
+      time: now,
+      commandId: command.id
     })
     expect(deleteSnapshotSpy).to.be.called
   })