Fixes for APM for MongoDB 2.4.x or earlier

Author: christkv

lib/apm.js

@@ -84,7 +84,7 @@ var Instrumentation = function(core, options, callback) {
   // Reference
   var self = this;
   // Names of methods we need to wrap
-  var methods = ['command'];
+  var methods = ['command', 'insert', 'update', 'remove'];
   // Prototype
   var proto = core.Server.prototype;
   // Core server method we are going to wrap
@@ -105,6 +105,18 @@ var Instrumentation = function(core, options, callback) {
       var commandName = keys[0];
       var db = ns.split('.')[0];
 
+      // Do we have a legacy insert/update/remove command
+      if(x == 'insert' && !this.lastIsMaster().maxWireVersion) {
+        commandName = 'insert';
+      } else if(x == 'update' && !this.lastIsMaster().maxWireVersion) {
+        commandName = 'update';
+      } else if(x == 'remove' && !this.lastIsMaster().maxWireVersion) {
+        commandName = 'delete';
+      } else if(x == 'insert' || x == 'update' || x == 'remove' && this.lastIsMaster().maxWireVersion >= 2) {
+        // Skip the insert/update/remove commands as they are executed as actual write commands in 2.6 or higher
+        return func.apply(this, args);        
+      }
+
       // Get the callback
       var callback = args.pop();
       // Set current callback operation id from the current context or create
@@ -151,8 +163,10 @@ var Instrumentation = function(core, options, callback) {
         };
 
         // If we have an error
-        if(err || (r && r.result && r.result.writeErrors)) {
-          command.failure = err || r.result.writeErrors;
+        if(err 
+          || (r && r.result && r.result.writeErrors)
+          || (r && r.result && r.result.errmsg)) {
+          command.failure = err || r.result.writeErrors || r.result;
           self.emit('failed', command);
         } else {
           command.reply = r;
@@ -376,6 +390,7 @@ var Instrumentation = function(core, options, callback) {
 
           // Add our callback handler
           args.push(function(err, r) {
+
             if(err) {
               // Command
               var command = {

lib/cursor.js

@@ -816,7 +816,6 @@ var toArray = function(self, callback) {
   self.rewind();
   self.s.state = Cursor.INIT;
 
-
   // Fetch all the documents
   var fetchDocs = function() {
     self._next(function(err, doc) {

test/functional/apm_tests.js

@@ -29,6 +29,8 @@ exports['Correctly receive the APM events for an insert'] = {
 
     var db = configuration.newDbInstance({w:1}, {poolSize:1, auto_reconnect:false});
     db.open(function(err, db) {
+      test.equal(null, err);
+
       db.collection('apm_test').insertOne({a:1}).then(function(r) {
         test.equal(1, r.insertedCount);
         test.equal(1, started.length);
@@ -223,7 +225,6 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
     });
   } else {
     params.push(function(err, result) {
-
       // Validate the expectations
       test.expectations.forEach(function(x, index) {
         validateExpecations(assert, x, {
@@ -351,11 +352,10 @@ exports['Correctly receive the APM events for a find with getmore and killcursor
       db.collection('apm_test_2').drop(function(err, r) {
 
         // Insert test documents
-        db.collection('apm_test_2').insertMany([{a:1}, {a:1}, {a:1}, {a:1}, {a:1}, {a:1}]).then(function(r) {
+        db.collection('apm_test_2').insertMany([{a:1}, {a:1}, {a:1}, {a:1}, {a:1}, {a:1}], {w:1}).then(function(r) {
           test.equal(6, r.insertedCount);
 
           db.collection('apm_test_2').find({a:1})
-            .sort({a:1})
             .project({_id: 1, a:1})
             .hint({'_id':1})
             .skip(1)
@@ -399,7 +399,7 @@ exports['Correctly receive the APM events for a find with getmore and killcursor
 }
 
 exports['Correctly receive the APM failure event for find'] = {
-  metadata: { requires: { topology: ['single'] } },
+  metadata: { requires: { topology: ['single'], mongodb: ">=2.6.0" } },
 
   // The actual test we wish to run
   test: function(configuration, test) {
@@ -805,7 +805,6 @@ exports['Correctly receive the APM events for a bulk operation'] = {
 
     var listener = require('../..').instrument();
     listener.on('started', function(event) {
-      // console.log(JSON.stringify(event, null, 2))
       if(event.commandName == 'insert' || event.commandName == 'update' || event.commandName == 'delete')
         started.push(event);
     });