whatap 0.4.45 → 0.4.46

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/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.45",
-  "releaseDate": "20220517",
+  "version": "0.4.46",
+  "releaseDate": "20220523",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},