Merge pull request #279 from kenspirit/master

Add collection name and method to emitted data for MongoDB

Author: sjanuary

README.md

@@ -297,6 +297,8 @@ Emitted when a MongoDB query is made using the `mongodb` module.
     * `time` (Number) the milliseconds when the MongoDB query was made. This can be converted to a Date using `new Date(data.time)`
     * `query` (String) the query made of the MongoDB database.
     * `duration` (Number) the time taken for the MongoDB query to be responded to in ms.
+    * `method` (String) the executed method for the query, such as find, update.
+    * `collection` (String) the MongoDB collection name.
 
 ### Event: 'mqtt'
 Emitted when a MQTT message is sent or received.
@@ -479,4 +481,4 @@ Non-release versions of this project (for example on github.com/RuntimeTools/app
 [3]:https://github.com/RuntimeTools/appmetrics/wiki
 [4]:https://docs.npmjs.com/files/folders
 [5]:https://github.com/RuntimeTools/appmetrics/issues
-[6]:https://github.com/RuntimeTools/appmetrics
+[6]:https://github.com/RuntimeTools/appmetrics

probes/mongo-probe.js

@@ -20,17 +20,19 @@ var util = require('util');
 var am = require('../');
 
 function MongoProbe() {
-	Probe.call(this, 'mongodb');
+    Probe.call(this, 'mongodb');
 }
 util.inherits(MongoProbe, Probe);
 
 MongoProbe.prototype.aspectCollectionMethod = function(coll, method) {
-	var that = this;
+    var that = this;
     var req;
     aspect.around( coll, method,
         function(target, methodName, methodArgs, probeData) {
-			that.metricsProbeStart(probeData, target, method, methodArgs);
-			that.requestProbeStart(probeData, target, method, methodArgs);
+            var collectionName = target.collectionName;
+
+            that.metricsProbeStart(probeData, target, method, methodArgs);
+            that.requestProbeStart(probeData, target, method, methodArgs);
             if (aspect.findCallbackArg(methodArgs) != undefined) {
                 aspect.aroundCallback( methodArgs, probeData, function(target,args, probeData){
 
@@ -39,24 +41,26 @@ MongoProbe.prototype.aspectCollectionMethod = function(coll, method) {
                     if (typeof(callbackPosition) != 'undefined') {
                         aspect.strongTraceTransactionLink('mongodb: ', methodName, methodArgs[callbackPosition]);
                     }
-                    
-                	that.metricsProbeEnd(probeData, method, methodArgs);
-                	that.requestProbeEnd(probeData, method, methodArgs);
+
+                    that.metricsProbeEnd(probeData, collectionName, method, methodArgs);
+                    that.requestProbeEnd(probeData, method, methodArgs);
                 } );
             } 
-    	},
+        },
         function(target, methodName, methodArgs, probeData, rc) {
+            var collectionName = target.collectionName;
+
             if (aspect.findCallbackArg(methodArgs) == undefined) {
-            	that.metricsProbeEnd(probeData, method, methodArgs);
-            	that.requestProbeEnd(probeData, method, methodArgs);
+                that.metricsProbeEnd(probeData, collectionName, method, methodArgs);
+                that.requestProbeEnd(probeData, method, methodArgs);
             }
             return rc;
-    	}
+        }
     );
 }
 
 MongoProbe.prototype.attach = function(name, target) {
-	var that = this;
+    var that = this;
     if( name != "mongodb" ) return target;
     if(target.__ddProbeAttached__) return target;
     target.__ddProbeAttached__ = true;
@@ -65,18 +69,20 @@ MongoProbe.prototype.attach = function(name, target) {
     var method = 'find';
     aspect.around( coll, "find",
         function(target, methodName, methodArgs, probeData){
-    		that.metricsProbeStart(probeData, target, method, methodArgs);
-    		that.requestProbeStart(probeData, target, method, methodArgs);
-    	},
+            that.metricsProbeStart(probeData, target, method, methodArgs);
+            that.requestProbeStart(probeData, target, method, methodArgs);
+        },
         function(target, methodName, findArgs, probeData, rc){
+            var collectionName = target.collectionName;
+
             if (rc == undefined) {
-            	that.metricsProbeEnd(probeData, method, findArgs);
-            	that.requestProbeEnd(probeData, method, findArgs);
+                that.metricsProbeEnd(probeData, collectionName, method, findArgs);
+                that.requestProbeEnd(probeData, method, findArgs);
             } else {
                 aspect.before( rc, "toArray", function(target, methodName, args, context){
                     aspect.aroundCallback( args, probeData, function(target, args, probeData){
-                    	that.metricsProbeEnd(probeData, method, findArgs);
-                    	that.requestProbeEnd(probeData, method, findArgs);
+                        that.metricsProbeEnd(probeData, collectionName, method, findArgs);
+                        that.requestProbeEnd(probeData, method, findArgs);
                     });
                 });
             }
@@ -101,24 +107,27 @@ MongoProbe.prototype.attach = function(name, target) {
  * Lightweight metrics probe for MongoDB queries
  * 
  * These provide:
- * 		time:		time event started
- * 		query:		the query itself
- * 		duration:	the time for the request to respond
+ *         time:        time event started
+ *         query:        the query itself
+ *         duration:    the time for the request to respond
+ *         method:      the executed method for the query, such as find, update
+ *         collection:  the mongo collection
  */
-MongoProbe.prototype.metricsEnd = function(probeData, method, methodArgs) {
-	probeData.timer.stop();
-	am.emit('mongo', {time: probeData.timer.startTimeMillis, query: JSON.stringify(methodArgs[0]), duration: probeData.timer.timeDelta});
+MongoProbe.prototype.metricsEnd = function(probeData, collectionName, method, methodArgs) {
+    probeData.timer.stop();
+    am.emit('mongo', {time: probeData.timer.startTimeMillis, query: JSON.stringify(methodArgs[0]), duration: probeData.timer.timeDelta,
+        method: method, collection: collectionName});
 };
 
 /*
  * Heavyweight request probes for MongoDB queries
  */
 MongoProbe.prototype.requestStart = function (probeData, target, method, methodArgs) {
-	probeData.req = request.startRequest( 'DB', method + "("+target.collectionName+")", false, probeData.timer );
+    probeData.req = request.startRequest( 'DB', method + "("+target.collectionName+")", false, probeData.timer );
 };
 
 MongoProbe.prototype.requestEnd = function (probeData, method, methodArgs) {
-	probeData.req.stop( { query: JSON.stringify(methodArgs[0]) } );
+    probeData.req.stop( { query: JSON.stringify(methodArgs[0]) } );
 };
 
-module.exports = MongoProbe;
+module.exports = MongoProbe;