added async tracking and cursor tracking

Author: arunoda

lib/hijack/async.js

@@ -0,0 +1,21 @@
+var Fibers = Npm.require('fibers');
+var Future = Npm.require('fibers/future');
+
+var originalWait = Future.prototype.wait;
+Future.prototype.wait = function wait() {
+  if(Fibers.current && Fibers.current.__apmInfo && !this._apmInfo) {
+    var success = NotificationManager.methodTrackEvent('asyncstart');
+    if(success) {
+      this._apmInfo = Fibers.current.__apmInfo;
+    }
+  }
+  return originalWait.call(this);
+};
+
+var originalReturn = Future.prototype.return;
+Future.prototype.return = function(value) {
+  if(this._apmInfo) {
+    NotificationManager.methodTrackEvent('asyncend', null, this._apmInfo);
+  }
+  return originalReturn.call(this, value);
+};

lib/hijack/db.js

@@ -16,6 +16,32 @@
     var ret = originalFunc.apply(this, arguments);
     NotificationManager.methodTrackEvent('dbend');
 
+    if(func == 'find' && !ret.constructor.prototype._ampOk) {
+      hijackCursor(ret.constructor.prototype);
+    }
+
     return ret;
   };
-});
+});
+
+function hijackCursor(cursorProto) {
+  ['forEach', 'map', 'rewind', 'fetch', 'count'].forEach(function(type) {
+    var originalFunc = cursorProto[type];
+    cursorProto[type] = function() {
+      var cursorDescription = this._cursorDescription;
+      var payload = {
+        coll: cursorDescription.collectionName,
+        selector: cursorDescription.selector,
+        func: type
+      };
+
+      NotificationManager.methodTrackEvent('cursorstart', payload);
+      var ret = originalFunc.apply(this, arguments);
+      NotificationManager.methodTrackEvent('cursorend');
+
+      return ret;
+    };
+  });
+
+  cursorProto._ampOk = true;
+}

lib/notification_manager.js

@@ -6,16 +6,23 @@ function _NotficationManager() {
 
 }
 
-_NotficationManager.prototype.methodTrackEvent = function(type, data) {
-  var ampInfo = Fibers.current.__apmInfo;
+_NotficationManager.prototype.methodTrackEvent = function(type, data, ampInfo) {
+  ampInfo = ampInfo || Fibers.current.__apmInfo;
   if(ampInfo && ampInfo.method) {
     var method = this._ensureMethodExists(ampInfo);
+    if(type =='asyncstart' && this._isLastEventIsStart(method)) {
+      return false;
+    }
+
     var event = {type: type, at: Date.now()};
     if(data) {
       event.data = data;
     }
     method.events.push(event);
-    console.log('method::', type, Fibers.current.__apmInfo, data);
+    console.log('method::', type, ampInfo, data);
+    return true;
+  } else {
+    return false;
   }
 };
 
@@ -34,4 +41,13 @@ _NotficationManager.prototype._ensureMethodExists = function(ampInfo) {
   return MethodsStore[id];
 };
 
+_NotficationManager.prototype._isLastEventIsStart = function(method) {
+  var lastEvent = method.events[method.events.length -1];
+  if(lastEvent && ['dbstart', 'httpstart', 'cursorstart'].indexOf(lastEvent.type) >= 0) {
+    return true;
+  } else {
+    return false;
+  }
+};
+
 NotificationManager = new _NotficationManager();

lib/test_methods.js

@@ -1,9 +1,25 @@
 Posts = new Meteor.Collection('posts');
+Future = Npm.require('fibers/future');
 
 Meteor.methods({
   hello: function() {
     var content =  HTTP.get('http://localhost:3000');
     Posts.insert({aa: 100});
-    return Posts.find({}).count();
+    var cnt =  Posts.find({}).fetch();
+
+    Meteor._wrapAsync(wait)(1000);
+    return cnt;
+  },
+
+  async: function() {
+    var waitSync = Future.wrap(wait);
+    waitSync(1000).wait();
+    return 2000;
   }
-});
+});
+
+function wait(time, done) {
+  setTimeout(function() {
+    done();
+  }, time)
+}

package.js

@@ -14,6 +14,7 @@ Package.on_use(function(api) {
     'lib/hijack/session.js',
     'lib/hijack/db.js',
     'lib/hijack/http.js',
+    'lib/hijack/async.js',
     'lib/test_methods.js'
   ], 'server');
 });

todo

@@ -4,14 +4,15 @@
 Script to Sync Package to Test
 Hijack Sessions
 Hijack DB
+add cursor methods
 Notification Manager
 * Api Initialization
 
 * Some Other Stuff to Hijack
 ----------------------------
-* HTTP
+HTTP
 * Email
-* Other Async Time (HiJack Future)
+Other Async Time (HiJack Future)
 
 ##Pub/Sub