whatap 0.5.1 → 0.5.3

package/lib/conf/config-default.js

@@ -112,6 +112,7 @@ var ConfigDefault = {
 
     "profile_error_sql_time_max": num("profile_error_sql_time_max", 30000),
     "profile_error_step_enabled": bool('profile_error_step_enabled', true),
+    "profile_error_httpc_time_max": num("profile_error_httpc_time_max", 10000),
     "hook_direct_patch_classes": "",
 
     "log_rotation_enabled": bool('log_rotation_enabled',true),
@@ -266,6 +267,7 @@ var ConfigDefault = {
     "grpc_profile_ignore_method": bool("grpc_profile_ignore_method", true),
 
     "oname_port_postfix_enabled": bool("oname_port_postfix_enabled", false),
+    "ignore_http_lost_connection": bool("ignore_http_lost_connection", false)
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/counter/counter-manager.js

@@ -26,8 +26,7 @@ var CounterPack = require('../pack/counter-pack'),
     DateUtil = require('./../util/dateutil'),
     KubeClient       = require('../kube/kube-client'),
     KubeUtil            = require('../util/kube-util'),
-    Logger              = require('../logger'),
-    Long = require('long');
+    Logger              = require('../logger');
 
 function CounterManager(agent) {
     this.agent = agent;
@@ -90,11 +89,17 @@ CounterManager.prototype.process = function (tasks) {
         var ctx = enumer.nextElement();
         if (ctx.getElapsedTime() > conf.profile_max_time) {
             //TraceContextManager.end(ctx._id);
-            var obj = TraceContextManager.resume(ctx._id);
-            TraceContextManager.addStep("Lost Connection","", ctx);
-            //ctx.status = 5;
-            //ctx.error = StatError.addError(500, "Lost Connection", ctx.service_hash);
-            TraceContextManager.endTrace(ctx);
+            if(conf.getProperty("ignore_http_lost_connection", false) === true){
+                Logger.print("WHATAP-072", "Lost Connection was ignored, " + ctx._id, false);
+                TraceContextManager.end(ctx._id);
+                ctx = null;
+            }else{
+                // var obj = TraceContextManager.resume(ctx._id);
+                TraceContextManager.addStep("Lost Connection","", ctx);
+                //ctx.status = 5;
+                //ctx.error = StatError.addError(500, "Lost Connection", ctx.service_hash);
+                TraceContextManager.endTrace(ctx);
+            }
         }
     }
 

package/lib/observers/http-observer.js

@@ -40,6 +40,8 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     IntKeyLinkedMap = require("../util/intkey-linkedmap");
 const ParamSecurity = require("../util/paramsecurity");
 const {Buffer} = require("buffer");
+const shimmer = require('../core/shimmer');
+const TraceHttpc = require('../trace/trace-httpc');
 
 var _exts=new Set([".css",".js",".png", ".htm", ".html", ".gif", ".jpg", ".css", ".txt", ".ico"]);
 
@@ -199,17 +201,14 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
                 ctx.status = Math.floor(obj.statusCode / 100);
 
                 // 에러가 발생했지만 스택수집안했을 경우
-                if (transaction_status_error_enable && ctx.status >= 4 && ctx.error.isZero()) {
-                    ctx.error = StatError.addError(obj.statusCode, obj.statusMessage,
-                        ctx.service_hash);
+                if (transaction_status_error_enable && ctx.status >= 4) {
+                    if(ctx.error.isZero())
+                        ctx.error = StatError.addError(obj.statusCode, obj.statusMessage, ctx.service_hash);
                     ctx.statusCode = obj.statusCode;
-                    ctx.statusMessage = obj.statusMessage;
+                    ctx.statusTitle = obj.statusMessage;
+                    ctx.statusMessage = ctx.error_message;
                 }
 
-                var requestPath = '';
-                if(req.route && req.route.path)
-                    requestPath = req.route.path;
-
                 var shouldEndTransaction = shouldEndCurrentTransaction(not_found_ignore, ctx, res, req.route ? req.route.path : '');
                 if (shouldEndTransaction) {
                     self.__endTransaction(null, ctx, req, res);
@@ -469,10 +468,11 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
     if(profile_error_step_enabled && ctx.statusMessage){
         var step = new MessageStep();
-        step.hash = HashUtil.hashFromString("EXCEPTION");
+        var title = ctx.statusTitle ? ctx.statusTitle : "EXCEPTION";
+        step.hash = HashUtil.hashFromString(title);
         step.start_time = ctx.getElapsedTime();
         step.desc = ctx.statusMessage;
-        DataTextAgent.MESSAGE.add(step.hash, "EXCEPTION");
+        DataTextAgent.MESSAGE.add(step.hash, title);
         ctx.profile.push(step);
     }
 
@@ -667,112 +667,102 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             moduleName === 'https', obj);
     });
 
-    if( conf.httpc_enabled === false ) { return; }
-
-    aop.both(mod, 'request',
-        function (obj, args, lctx) {
-            var ctx = lctx.context;
-            if (ctx == null || (args[0].host == null && args[0].hostname == null) ) { return; } // for axios
+    if( conf.getProperty('httpc_enabled', true) === false ) { return; }
 
-            var isHttpsRepeat = false;
-            if(moduleName === 'https') {
-                args[0].__isHttps = true;
+    shimmer.wrap(mod, 'request', function (original) {
+        return function wrappedRequest(options, callback) {
+            var ctx = TraceContextManager.getCurrentContext();
+            if(!ctx || (!options.host && !options.hostname)){
+                return original.apply(this, arguments);
             }
 
-            if(moduleName === 'http' && args[0].__isHttps) {
-                isHttpsRepeat = true;
+            var isHttpRepeat = false;
+            if(moduleName === 'https'){
+                options.__isHttps = true;
+            }
+            if(moduleName === 'http' && options.__isHttps){
+                isHttpRepeat = true;
             }
 
-            if(!isHttpsRepeat) {
-                try {
-                    if(args[0].method === 'OPTION') {
-                        return;
-                    }
-
-                    var dataConsumption = false;
-
-                    if(args.length > 0) {
-                        var info = args[0];
-
-                        interTxTraceAutoOn(ctx);
-
-                        if(conf.mtrace_enabled){
-                            if(info.headers){
-                                info.headers['x-wtap-po']=transferPOID(ctx);
-                            }else{
-                                info.headers={
-                                    'x-wtap-po': transferPOID(ctx)
-                                };
-                            }
-                            if(conf.stat_mtrace_enabled){
-                                info.headers[conf._trace_mtrace_spec_key1]=transferSPEC_URL(ctx);
-                            }
-                            if(conf.mtid_mtrace_enabled && ctx.mtid.isZero()===false){
-                                info.headers[conf._trace_mtrace_caller_key]=transferMTID_CALLERTX(ctx);
-                            }
+            var step = new HttpStepX();
+            step.start_time = ctx.getElapsedTime();
 
+            if(!isHttpRepeat){
+                if(options.method === 'OPTION'){
+                    return original.apply(this, arguments);
+                }
+                try{
+                    interTxTraceAutoOn(ctx);
+                    if(conf.getProperty('mtrace_enabled', false)){
+                        if(options.headers){
+                            options.headers['x-wtap-po'] = transferPOID(ctx);
+                        }else{
+                            options.headers = {'x-wtap-po': transferPOID(ctx)};
+                        }
+                        if(conf.stat_mtrace_enabled){
+                            options.headers[conf._trace_mtrace_spec_key1]=transferSPEC_URL(ctx);
+                        }
+                        if(conf.mtid_mtrace_enabled && ctx.mtid.isZero()===false){
+                            options.headers[conf._trace_mtrace_caller_key]=transferMTID_CALLERTX(ctx);
                         }
-                        ctx.httpc_url = info.path || '/';
-                        ctx.httpc_host = info.host || info.hostname || '';
-                        ctx.httpc_port = info.port || -1;
                     }
+
+                    ctx.httpc_url = options.path || '/';
+                    ctx.httpc_host = options.host || options.hostname || '';
+                    ctx.httpc_port = options.port || -1;
+
                     ctx.footprint('Http Call Start');
 
                     if (ctx.httpc_port < 0) { ctx.httpc_port = 80 };
-
-                } catch(e) {
-                    return Logger.printError('WHATAP-852', 'Http Repeat ', e, true);
+                }catch (e) {
+                    Logger.printError('WHATAP-852', 'Http Repeat ', e, true);
+                    return original.apply(this, arguments);
                 }
+            }else{
+                return original.apply(this, arguments);
+            }
 
-                aop.functionHook(args, -1,  function(obj, args) {
-                    if(TraceContextManager.resume(ctx._id) == null) { return; }
+            var wrappedCallback;
+            if (typeof callback === 'function') {
+                wrappedCallback = function(response) {
+                    if (TraceContextManager.resume(ctx._id) === null) {
+                        return callback.apply(this, arguments);
+                    }
 
-                    var res = args[0];
-                    aop.before(res, ['on', 'addListener'], function(obj, args) {
-                        if(!dataConsumption && args[0] === 'data') {
-                            dataConsumption = true;
+                    response.on('end', function() {
+                        step.elapsed = ctx.getElapsedTime() - step.start_time;
+                        step.url = HashUtil.hashFromString(ctx.httpc_url);
+                        DataTextAgent.HTTPC_URL.add(step.url, ctx.httpc_url);
+                        step.host = HashUtil.hashFromString(ctx.httpc_host);
+                        DataTextAgent.HTTPC_HOST.add(step.host, ctx.httpc_host);
+                        step.port = ctx.httpc_port;
+
+                        if (response.statusCode >= 400 && transaction_status_error_enable) {
+                            step.error = StatError.addError(response.statusCode, response.statusMessage,
+                                ctx.service_hash, TextTypes.HTTPC_URL, step.url);
+                            if (ctx.error.isZero()) {
+                                ctx.error = step.error;
+                                ctx.statusCode = response.statusCode;
+                                ctx.statusMessage = response.statusMessage;
+                            }
                         }
-                    });
-                    aop.before(res, 'pipe', function() {
-                        dataConsumption = true;
-                    });
-                    aop.before(res, 'resume', function() {
-                        dataConsumption = true;
+
+                        ctx.active_httpc_hash = step.url;
+                        ctx.profile.push(step);
+                        endHttpc(ctx, step);
                     });
 
-                    if (dataConsumption) { return; }
-                    // endHttpc(ctx, step);
-                });
-            }
-        },
-        function (obj, args, ret, lctx) {
-            if(moduleName === 'http' && args[0].__isHttps) {
-                return;
+                    return callback.apply(this, arguments);
+                };
             }
 
-            var ctx = lctx.context;
-            if (ctx == null || ( args[0].host == null && args[0].hostname == null)) { return; }
-            var is_ignore_error = false;
-
-            ret.on('response', function(response){
-                var statusCode = response.statusCode;
-                if(transaction_status_error_enable && statusCode >= 400){
-                    if (step.error.isZero()) {
-                        step.error = StatError.addError(statusCode, response.statusMessage , ctx.service_hash,
-                            TextTypes.HTTPC_URL, step.url);
-                        if (ctx.error.isZero()) {
-                            ctx.error = step.error;
-                            ctx.statusCode = statusCode;
-                            ctx.statusMessage = response.statusMessage;
-                        }
-                    }
-                }
-            })
-            ret.on('error', function(err) {
-                if (TraceContextManager.resume(ctx._id) == null) { return; }
+            var req = original.apply(this, [options, wrappedCallback]);
+
+            req.on('error', function (err) {
+                if (TraceContextManager.resume(ctx._id) === null) { return; }
                 ctx.is_httpc_error = true;
 
-                if (transaction_status_error_enable && step.error.isZero() && !is_ignore_error) {
+                if (transaction_status_error_enable && step.error.isZero()) {
                     step.error = StatError.addError(err.code, err.message, ctx.service_hash,
                         TextTypes.HTTPC_URL, step.url);
                     if (ctx.error.isZero()) {
@@ -785,63 +775,45 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                 endHttpc(ctx, step);
             });
 
-            var step = new HttpStepX();
-            step.start_time = ctx.getElapsedTime();
-            step.url = HashUtil.hashFromString(ctx.httpc_url);
-            DataTextAgent.HTTPC_URL.add(step.url, ctx.httpc_url);
-            step.host = HashUtil.hashFromString(ctx.httpc_host);
-            DataTextAgent.HTTPC_HOST.add(step.host, ctx.httpc_host);
-            step.port = ctx.httpc_port;
-
-            aop.before(ret, 'write', function (obj, args) {
-                if(conf.profile_httpc_parameter_enabled == true) {
-                    if(args.length == 1) {
-                        var step = new MessageStep();
-                        step.hash = HashUtil.hashFromString("HTTPC-REQUEST-BODY");
-                        step.start_time = ctx.getElapsedTime();
-                        step.desc = args[0];
-                        DataTextAgent.MESSAGE.add(step.hash, "HTTPC-REQUEST-BODY");
-                        ctx.profile.push(step);
+            shimmer.wrap(req, 'write', function (original) {
+                return function wrappedWrite() {
+                    try {
+                        if (conf.getProperty('profile_httpc_parameter_enabled', true)) {
+                            if (arguments && arguments[0]) {
+                                var bodyData;
+
+                                if (typeof arguments[0] === 'object' && !(arguments[0] instanceof Buffer)) {
+                                    bodyData = JSON.stringify(arguments[0]);
+                                }
+                                if (arguments[0] instanceof Buffer) {
+                                    bodyData = arguments[0].toString('utf8');
+                                }
+                                if(bodyData){
+                                    var step = new MessageStep();
+                                    step.hash = HashUtil.hashFromString("HTTPC-REQUEST-BODY");
+                                    step.start_time = ctx.getElapsedTime();
+                                    step.desc = bodyData;
+                                    DataTextAgent.MESSAGE.add(step.hash, "HTTPC-REQUEST-BODY");
+                                    ctx.profile.push(step);
+                                }
+                            }
+                        }
+                    } catch (e) {
+                        Logger.printError('WHATAP-615', 'HTTP Write hook failed', e, false);
                     }
+                    return original.apply(this, arguments);
                 }
             });
 
-            aop.before(ret, 'end', function (obj, args) {
-                ctx.active_httpc_hash = step.url;
-                ctx.profile.push(step);
-            });
-
-            ret.on('socket', function(socket) {
-                // socket reuse chk
-                if(conf.setSocketChk(socket) == false) {
-                    aop.before(socket, 'end', function (obj, args) {
-                        if(ctx == null) { return; }
-                        TraceContextManager.resume(ctx._id);
-                        endHttpc(ctx, step);
-                    });
-
-                    socket.on('timeout', function () {
-                        if (TraceContextManager.resume(ctx._id) == null) { return; }
-                        is_ignore_error = true;
-                        // if (step.error.isZero()) {
-                        //     var msgObj = { 'class': 'Timeout', 'msg': 'Timeout' };
-                        //     step.error = StatError.addError('Timeout','Timeout', ctx.service_hash);
-                        //     if (transaction_status_error_enable && ctx.error.isZero()) {
-                        //         ctx.error = step.error;
-                        //         ctx.statusCode = 'Timeout';
-                        //         ctx.statusMessage = 'Timeout';
-                        //     }
-                        // }
-                        // endHttpc(ctx, step);
-                    });
-                }
-            });
-        });
+            return req;
+        }
+    });
 
     function endHttpc(ctx, step) {
         if(ctx == null || step == null) { return; }
 
         step.elapsed = ctx.getElapsedTime() - step.start_time;
+        TraceHttpc.isSlowHttpc(ctx, step);
 
         ctx.httpc_count++;
         ctx.httpc_time += step.elapsed;