whatap 0.4.43 → 0.4.46

package/lib/conf/config-default.js

@@ -81,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/core/agent.js

@@ -231,15 +231,16 @@ NodeAgent.prototype.connectCB = function (cb) {
         });
     }, self.setLoopTime);
 };
-
+const sleep = async(ms) => {
+    return new Promise(resolve=>{
+        setTimeout(resolve,ms)
+    })
+}
 NodeAgent.prototype.loadObserves = function() {
     var agent = this;
     var observes = [];
 
     observes.push(HttpObserver);
-    if(agent._conf['trace_node_schedule_enabled']) {
-        observes.push(ScheduleObserver);
-    }
     observes.push(NetObserver);
     observes.push(ClusterObserver);
     observes.push(MysqlObserver);
@@ -253,7 +254,8 @@ NodeAgent.prototype.loadObserves = function() {
     observes.push(ThriftObserver);
     observes.push(PromiseObserver);
     observes.push(PgSqlObserver);
-    
+    observes.push(ScheduleObserver);
+     
     var packageToObserve = {};
     observes.forEach(function(observeObj) {
         var observe = new observeObj(agent);

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;

package/lib/observers/schedule-observer.js

@@ -34,24 +34,29 @@ ScheduleObserver.prototype.inject = function (mod, moduleName) {
         var orig = ret.job;
         if(!orig) return;
         ret.job = async () => {
-            var ctx = TraceContextManager.startTrace('ScheduleJob');
+            var ctx = null;
+            if(conf['trace_node_schedule_enabled']) {
+                ctx = TraceContextManager.startTrace('ScheduleJob');
+            }
             var result = null;
             try {
                 result = await orig.apply(this, arguments);   
             } catch(err) {
                 Logger.printError('WHATAP-607', 'End batch error..', err, false);
             }
-            try {
-                var step = new MessageStep();
-                step.msg = 'Node ScheduleJob finished!!!!!'
-                step.hash =  HashUtil.hashFromString(step.msg);;
-                step.start_time = ctx.getElapsedTime();
-                step.desc = '';
-                DataTextAgent.MESSAGE.add(step.hash, step.msg);
-                ctx.profile.add(step);
-                TraceContextManager.endTrace(ctx);
-                if(ctx != null) ctx = null;
-            } catch(err) {}
+            if(conf['trace_node_schedule_enabled'] && ctx != null) {
+                try {
+                    var step = new MessageStep();
+                    step.msg = 'Node ScheduleJob finished!!!!!'
+                    step.hash =  HashUtil.hashFromString(step.msg);;
+                    step.start_time = ctx.getElapsedTime();
+                    step.desc = '';
+                    DataTextAgent.MESSAGE.add(step.hash, step.msg);
+                    ctx.profile.add(step);
+                    TraceContextManager.endTrace(ctx);
+                    if(ctx != null) ctx = null;
+                } catch(err) {}
+             }
             return result;
         };
     }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.43",
-  "releaseDate": "20210901",
+  "version": "0.4.46",
+  "releaseDate": "20220523",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},