whatap 0.4.42 → 0.4.45

package/lib/conf/config-default.js

@@ -58,6 +58,7 @@ var ConfigDefault = {
     "profile_http_querystring_enabled": false,
     "profile_http_header_enabled": bool('profile_http_header_enabled',false),
     "profile_http_parameter_enabled": bool('profile_http_parameter_enabled',false),
+    "profile_httpc_parameter_enabled": bool('profile_httpc_parameter_enabled',false),
     "profile_http_parameter_url_prefix": "/",
     "profile_http_header_url_prefix": "/",
     "profile_connection_open_enabled": true,
@@ -80,7 +81,7 @@ var ConfigDefault = {
     "profile_step_max_count": 1024,
     "profile_fullstack_max_lines": 0,
     "profile_basetime": num('profile_basetime',500),
-    "trace_http_client_ip_header_key": "",
+    "trace_http_client_ip_header_key": "x-forwarded-for",
     "trace_user_agent_header_key": "",
     "trace_referer_header_key": "",
 

package/lib/counter/counter-manager.js

@@ -17,6 +17,7 @@ var CounterPack = require('../pack/counter-pack'),
     GCStat = require('./task/gcstat'),
     Sql = require('./task/sql'),
     HttpC = require('./task/httpc'),
+    StatError = require('../stat/stat-error'),
     TagCounterPack = require('../pack/tagcount-pack'),
     TraceContextManager = require('../trace/trace-context-manager'),
     secuMaster = require('../net/security-master'),
@@ -88,8 +89,12 @@ CounterManager.prototype.process = function (tasks) {
     while (enumer.hasMoreElements()) {
         var ctx = enumer.nextElement();
         if (ctx.getElapsedTime() > conf.profile_max_time) {
-            //강제 종료된다. 
-            TraceContextManager.end(ctx._id);
+            //TraceContextManager.end(ctx._id);
+            var obj = TraceContextManager.resume(ctx._id);
+            TraceContextManager.addStep("Lost Connection","");
+            //ctx.status = 5;
+            //ctx.error = StatError.addError(500, "Lost Connection", ctx.service_hash);
+            TraceContextManager.endTrace(ctx);
         }
     }
 

package/lib/counter/meter/meter-sql.js

@@ -24,7 +24,7 @@ function Bucket() {
 
 function MeterSql() {
     this.bucket = new Bucket();
-    this.stat = new IntKeyLinkedMap(309, 1).setMax(307);
+    this.stat = new IntKeyLinkedMap(500, 1).setMax(500);
     this.stat.create = function (key) {
 			return new Bucket();
 	};

package/lib/counter/task/sql.js

@@ -62,12 +62,12 @@ function sql_meter(p){
             var key = en.nextElement();
             var b = MeterSql.stat.get(key);
             p.sql_meter.put(key, {
-                time: b.time,
-                count: b.count,
-                error: b.error,
+                time: b.sql_time,
+                count: b.sql_count,
+                error: b.sql_error,
                 actx : 0,
-                fetch_count: b.fetch_count,
-                fetch_time: b.fetch_time
+                fetch_count: b.sql_fetch_count,
+                fetch_time: b.sql_fetch_time
             });
         }
         MeterSql.resetStat();

package/lib/observers/http-observer.js

@@ -4,6 +4,7 @@
  * can be found in the LICENSE file.
  */
 
+const controlHandler = require('../control/control-handler');
 var TraceContextManager = require('../trace/trace-context-manager'),
     URLPatternDetector  = require('../trace/serviceurl-pattern-detector').Detector,
     DataTextAgent       = require('../data/datatext-agent'),
@@ -36,7 +37,7 @@ var TraceContextManager = require('../trace/trace-context-manager'),
 
 var _exts=new Set([".css",".js",".png"]);
 
-var configIpHeaderKey = undefined;
+var configIpHeaderKey = conf.trace_http_client_ip_header_key;
 var configUserAgentKey = undefined;
 var configRefererKey = undefined;
 var trace_origin_url = false;
@@ -235,6 +236,26 @@ function initCtx(req, res) {
     } catch (e) {
     }
     /************************************/ 
+    /*   Header / param Trace           */
+    /************************************/ 
+    var header_enabled = false;
+    if(conf.profile_http_header_enabled === true && req.headers) {
+        header_enabled = true;
+        var prefix = conf.profile_header_url_prefix;
+        if(prefix && ctx.service_name.indexOf(prefix) < 0) {
+            header_enabled = false;
+        }
+    }
+    
+    if(header_enabled) {
+        var step = new MessageStep();
+        step.hash = HashUtil.hashFromString("HTTP-HEADERS");
+        step.start_time = ctx.getElapsedTime();
+        step.desc = JSON.stringify(req.headers);
+        DataTextAgent.MESSAGE.add(step.hash, "HTTP-HEADERS");
+        ctx.profile.push(step);
+    }
+    /************************************/ 
     /*   Multi Server Transaction Trace */
     /************************************/ 
     if(conf.mtrace_enabled) {
@@ -280,7 +301,32 @@ function initCtx(req, res) {
 };
 
 HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
+    var param_enabled = false;
+    if(conf.profile_http_parameter_enabled === true) {
+        param_enabled = true;
+        var prefix = conf.profile_http_parameter_url_prefix;
+        if(prefix && ctx.service_name.indexOf(prefix) < 0) {
+            param_enabled = false;
+        }
+    }
 
+    if(param_enabled) {
+        var query = JSON.stringify(req.query || '');
+        var body = JSON.stringify(req.body || '');
+        //var param = JSON.stringify(req.params || '');
+        //console.log(query.length + " // " + body.length);
+        var step = new MessageStep();
+        step.hash = HashUtil.hashFromString("HTTP-PARAMETERS");
+        step.start_time = ctx.getElapsedTime();
+        if(query.length > 2) {
+            step.desc = '[GET] ' + query;
+        } else {
+            step.desc = '[POST] ' + body;
+        }
+        DataTextAgent.MESSAGE.add(step.hash, "HTTP-PARAMETERS");
+        ctx.profile.push(step);
+    }
+    
     if(error) {
         TraceContextManager.end(ctx != null ? ctx._id : null);
         ctx = null;
@@ -289,15 +335,6 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
     if(ctx == null || TraceContextManager.isExist(ctx._id) === false) { return; }
 
-    var header_enabled = false;
-    if(conf.profile_http_header_enabled === true && req.headers) {
-        header_enabled = true;
-        var prefix = conf.profile_header_url_prefix;
-        if(prefix && ctx.service_name.indexOf(prefix) < 0) {
-            header_enabled = false;
-        }
-    }
-
     if(ctx.isStaticContents !== true && conf._trace_ignore_url_set[ctx.service_hash]){
         ctx.isStaticContents = true;
     }
@@ -312,37 +349,6 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         return;
     }
 
-    if(header_enabled) {
-        var step = new MessageStep();
-        step.hash = HashUtil.hashFromString("HTTP-HEADERS");
-        step.start_time = ctx.getElapsedTime();
-        step.desc = JSON.stringify(req.headers);
-        DataTextAgent.MESSAGE.add(step.hash, "HTTP-HEADERS");
-        ctx.profile.push(step);
-    }
-
-    var param_enabled = false;
-    if(conf.profile_http_parameter_enabled === true) {
-        param_enabled = true;
-        var prefix = conf.profile_http_parameter_url_prefix;
-        if(prefix && ctx.service_name.indexOf(prefix) < 0) {
-            param_enabled = false;
-        }
-    }
-
-    if(param_enabled) {
-        // var query = JSON.stringify(req.query || '');
-        // var body = JSON.stringify(req.body || '');
-        var param = JSON.stringify(req.params || '');
-
-        var step = new MessageStep();
-        step.hash = HashUtil.hashFromString("HTTP-PARAMETERS");
-        step.start_time = ctx.getElapsedTime();
-        step.desc = param;
-        DataTextAgent.MESSAGE.add(step.hash, "HTTP-PARAMETERS");
-        ctx.profile.push(step);
-    }
-
     try {
         var profile = new ProfilePack();
         var wtx = new TxRecord();
@@ -526,6 +532,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                     if(args[0].method === 'OPTION') {
                         return;
                     }
+
                     var dataConsumption = false;
                    
                     if(args.length > 0) {
@@ -620,6 +627,19 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             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);
+                    }
+                }
+            });
+            
             aop.before(ret, 'end', function (obj, args) {
                 ctx.active_httpc_hash = step.url;
                 ctx.profile.push(step);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.42",
-  "releaseDate": "20210802",
+  "version": "0.4.45",
+  "releaseDate": "20220517",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},