fix(mongo): do not add callback for aggregation

Author: gergelyke

lib/instrumentations/index.spec.js

@@ -4,7 +4,7 @@ var Shimmer = require('../utils/shimmer')
 
 describe('The instrumentor module', function () {
   it('can be created', function () {
-    var shimmerStub = this.sandbox.stub(Shimmer, 'wrap')
+    this.sandbox.stub(Shimmer, 'wrap')
 
     instrumentor.create({
       config: {

lib/instrumentations/mongodb.js

@@ -47,7 +47,8 @@ module.exports = function (mongodb, agent) {
         protocol: consts.PROTOCOLS.MONGODB,
         url: _this.collectionName || 'unknown',
         host: host,
-        method: name
+        method: name,
+        disableCallback: name === 'aggregate'
       })
     }
   })

lib/instrumentations/mongodb.spec.js

@@ -51,7 +51,8 @@ describe('The mongodb wrapper module', function () {
           host: 'fakeHost:666',
           method: 'find',
           protocol: 'mongodb',
-          url: 'unknown'
+          url: 'unknown',
+          disableCallback: false
         })
     })
 
@@ -78,18 +79,19 @@ describe('The mongodb wrapper module', function () {
 
     var shimmerWrapStub = this.sandbox.stub(Shimmer, 'wrap', function (nodule, path, name, cb) {
       expect(cb).to.be.a('function')
-      var commandArguments = ['find', {x: 5}]
+      var commandArguments = ['aggregate', {x: 5}]
       var fakeFind = 'not even a function'
-      cb(fakeFind, 'find').apply(fakeMongo.Collection, commandArguments)
+      cb(fakeFind, 'aggregate').apply(fakeMongo.Collection, commandArguments)
       expect(fakeWrapQuery).to.have.been.calledWith(
         fakeFind,
         commandArguments,
         fakeAgent,
         {
           host: 'fakeHost:666',
-          method: 'find',
+          method: 'aggregate',
           protocol: 'mongodb',
-          url: 'unknown'
+          url: 'unknown',
+          disableCallback: true
         })
     })
 

lib/instrumentations/utils/wrapQuery.js

@@ -10,6 +10,7 @@ function wrapQuery (original, args, agent, params) {
   var url = _params.url
   var method = _params.method
   var returnsPromise = _params.returnsPromise || false
+  var disableCallback = _params.disableCallback
 
   // custom error parsing depending on the instrumentation
   var parseError = _params.parseError || function (err) {
@@ -60,13 +61,12 @@ function wrapQuery (original, args, agent, params) {
       }
     }
     var last = args[args.length - 1]
-
     if (last && typeof last === 'function') {
       args[args.length - 1] = wrappedCallback(last)
     } else if (Array.isArray(last) && typeof last[last.length - 1] === 'function') {
       var lastOfLast = last.length - 1
       args[args.length - 1][lastOfLast] = wrappedCallback(last[lastOfLast])
-    } else {
+    } else if (!disableCallback) {
       args.push(wrappedCallback(function () { }))
     }
     reportSend()