whatap 0.5.5 → 0.5.7

package/lib/counter/task/res/systemECSTask.js

@@ -20,17 +20,19 @@ SystemECSTask.prototype.process = function (p) {
 
     var ecs = AwsEcsClientThread;
 
-    p.cpu = ecs.cpu * conf.correction_factor_cpu;
-    p.cpu_sys = ecs.cpu_sys;
-    p.cpu_usr = ecs.cpu_user;
-    p.mem = ecs.mem_pct;
-
-    if (ecs.millicore > 0) {
-        p.metering = ecs.millicore / 1024;
-        p.cpu_cores = Math.ceil(p.metering);
-    } else {
-        p.metering = p.cpu_cores;
-    }
+    setTimeout(() => {
+        p.cpu = ecs.cpu * conf.correction_factor_cpu;
+        p.cpu_sys = ecs.cpu_sys;
+        p.cpu_usr = ecs.cpu_user;
+        p.mem = ecs.mem_pct;
+
+        if (ecs.millicore > 0) {
+            p.metering = ecs.millicore / 1024;
+            p.cpu_cores = Math.ceil(p.metering);
+        } else {
+            p.metering = p.cpu_cores;
+        }
+    }, 500);
 
 };
 

package/lib/util/nodeutil.js

@@ -6,19 +6,23 @@
 
 var fs      = require('fs'),
     path    = require('path');
+const { execSync } = require('child_process');
 
-function getPackageJson(){
-    var appDir = require('./../conf/configure')['app.root'];
+function getPackageJson() {
     try {
-        var whatap_path = path.join(
-            appDir,
-            'node_modules',
-            'whatap',
-            'package.json');
-        NodeUtil.packageJson = require(whatap_path, 'utf8');
+        const whatapPath = require.resolve('whatap/package.json');
+        NodeUtil.packageJson = require(whatapPath);
         return;
     } catch(e) {
     }
+
+    try{
+        const globalPath = execSync('npm root -g').toString().trim();
+        const globalWhatapPath = path.join(globalPath, 'whatap', 'package.json');
+        NodeUtil.packageJson = require(globalWhatapPath);
+        return;
+    }catch (e) {
+    }
     NodeUtil.packageJson = {};
 }
 function recursiveCall(fullPath, file, cb){
@@ -65,4 +69,4 @@ var NodeUtil = {
     packageJson : {}
 };
 
-module.exports = NodeUtil;
+module.exports = NodeUtil;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.5",
-  "releaseDate": "20250123",
+  "version": "0.5.7",
+  "releaseDate": "20250207",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},