whatap 0.5.21 → 0.5.23

package/lib/observers/http-observer.js

@@ -194,6 +194,15 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
                 ctx.profile.add(step);
             }
 
+            // res.on('aborted', () => {
+            //     self.__endTransaction(null, ctx, req, res)
+            // })
+
+            res.on('close', () => {
+                // 강제로 종료할 경우
+                self.__endTransaction(null, ctx, req, res)
+            });
+
             aop.after(res, 'end', function(obj, args) {
                 if(ctx == null) { return; }
                 PluginLoaderManager.do('httpserviceend', ctx, req, res);
@@ -537,6 +546,8 @@ function initCtx(req, res) {
 };
 
 HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
+    if(ctx == null || TraceContextManager.isExist(ctx._id) === false) { return; }
+
     var param_enabled = false;
     if(conf.profile_http_parameter_enabled === true) {
         param_enabled = true;
@@ -591,7 +602,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         return;
     }
 
-    if(ctx == null || TraceContextManager.isExist(ctx._id) === false) { return; }
+    // if(ctx == null || TraceContextManager.isExist(ctx._id) === false) { return; }
 
     if(ctx.isStaticContents !== true && conf._trace_ignore_url_set[ctx.service_hash]){
         ctx.isStaticContents = true;
@@ -779,12 +790,20 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
         });
     });
 
-    aop.before(mod.Server.prototype, ['on', 'addListener'], function (obj, args) {
-        if(args[0] !== 'request') {return;}
-
-        args[args.length-1] = self.__createTransactionObserver(args[args.length-1],
-            moduleName === 'https', obj);
-    });
+    shimmer.wrap(mod.Server.prototype, 'emit', function wrapEmit(originalEmit) {
+            return function wrappedEmit(eventName, ...args) {
+                if (eventName !== 'request') {
+                    return originalEmit.apply(this, [eventName, ...args]);
+                }
+                let [req, res] = args;
+                return self.__createTransactionObserver(
+                    (req, res) => originalEmit.call(this, eventName, req, res),
+                    moduleName === 'https',
+                    this
+                )(req, res);
+            };
+        }
+    );
 
     if( conf.getProperty('httpc_enabled', true) === false ) { return; }
 

package/lib/observers/mongo-observer.js

@@ -60,6 +60,7 @@ MongoObserver.prototype.inject = function( mod, moduleName ) {
         self.agent.aop.before(mod.Collection.prototype, command, function (obj, args) {
             var ctx = TraceContextManager.getCurrentContext();
             if(ctx == null) { return; }
+            if(ctx && ctx.__mongoose_traced__) { return; }
 
             ctx.footprint('Mongodb Command Start: ' + command );
             var sql_step;
@@ -94,6 +95,7 @@ MongoObserver.prototype.inject = function( mod, moduleName ) {
         self.agent.aop.both(mod.Collection.prototype, command, function (obj, args, lctx) {
             var ctx = lctx.context;
             if(ctx == null) { return; }
+            if(ctx && ctx.__mongoose_traced__) { return; }
 
             ctx.footprint('Mongodb Command Start: ' + command );
             var sql_step;
@@ -192,6 +194,7 @@ MongoObserver.prototype.inject = function( mod, moduleName ) {
             //args[0] where, args[1] set
             var ctx = TraceContextManager.getCurrentContext();
             if(ctx == null) {return;}
+            if(ctx && ctx.__mongoose_traced__) { return; }
 
             ctx.footprint('Mongodb Command Start: '+command);
             var sql_step;
@@ -239,6 +242,7 @@ MongoObserver.prototype.inject = function( mod, moduleName ) {
             //args[0] where
             var ctx = TraceContextManager.getCurrentContext();
             if(ctx == null) { return; }
+            if(ctx && ctx.__mongoose_traced__) { return; }
 
             ctx.footprint('Mongodb Command Start: '+command);
             var sql_step;
@@ -278,6 +282,7 @@ MongoObserver.prototype.inject = function( mod, moduleName ) {
         self.agent.aop.both(mod.Collection.prototype, command, function (obj, args) {
             var ctx = TraceContextManager.getCurrentContext();
             if(ctx == null) { return; }
+            if(ctx && ctx.__mongoose_traced__) { return; }
 
             ctx.footprint('Mongodb Command Start: '+command);
             var sql_step;