whatap 0.4.44 → 0.4.47

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/task/res/systemKubeTask.js

@@ -41,15 +41,8 @@ SystemKubeTask.prototype.process = function (p) {
     p.cpu_cores = 1;        // static one core in nodejs
     p.host_ip = SecurityMaster.IP;
     var now = Date.now();
-
-    if (now < KubeClient.node_recv_time + 10000) {
-        //  몽땅 만들어야 함.
-        p.cpu = KubeClient.cpu * ConfSysMon.correction_factor_cpu;
-        p.mem = KubeClient.memory * ConfSysMon.correction_factor_pcpu;
-        // p.metering = KubeClient.metering == 0 ? p.cpu_cores : KubeClient.metering;
-        p.metering = 1;
-    }
-
+    p.cpu = 0;
+    p.mem = 0;
     if (p.metering != 0) {
         this.last_metering = p.metering;
     } else {

package/lib/counter/task/systemperf.js

@@ -6,6 +6,7 @@
 
 var CounterTask     = require('./counter-task'),
     ResourceProfile = require('./../../util/resourceprofile'),
+    KubeUtil            = require('./../../util/kube-util'),
     SecurityMaster  = require('../../net/security-master');
 
 function SystemPerf(){
@@ -25,10 +26,18 @@ SystemPerf.prototype.process = function(p) {
     p.cpu_proc = cpu.proc;
 
     p.disk = ResourceProfile.getDisk().usage;
-    p.mem = ResourceProfile.getMemory().usage;
+
+    if(p.version <= 1) p.mem = ResourceProfile.getMemory().usage;
+    else p.mem = ResourceProfile.getMemoryV2().usage;
+
     p.cpu_cores = cpu.core;
     p.host_ip = SecurityMaster.IP;
     p.pid=process.pid;
+    
+    if (KubeUtil.container_id != null) {
+        p.mem = 0;
+        p.cpu = 0;
+    }
 };
 
 module.exports = SystemPerf;

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/lib/util/kube-util.js

@@ -18,13 +18,14 @@ var KubeUtil = {
                 var line = contents[i];
                 if(line){
                     this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
-                    this.container_id = this.container_id.replace(/^(docker-)+|(\\.scope)+$/ig, "");
+                    this.container_id = this.container_id.replace(/^(docker-)+|(containerd-)+|(crio-)+|(\\.scope)+$/ig, "");
                     if(this.container_id.length > 5){
                         this.container_key = HashUtil.hash(this.container_id);
                         break;
                     }
                 }
             }
+            Logger.print('WHATAP-800' , 'id:' + this.container_id + ' // key:' + this.container_key  , false)
         }catch(e){
             Logger.printError('WHATAP-800', 'KubeUtil(loadContainerId) ', e)
         }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.44",
-  "releaseDate": "20220204",
+  "version": "0.4.47",
+  "releaseDate": "20220602",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},