whatap 0.4.54 → 0.4.57

package/lib/conf/config-default.js

@@ -218,6 +218,11 @@ var ConfigDefault = {
     "reqlog_x_dbc" : bool('reqlog_x_dbc', true),
     "reqlog_x_login" : bool('reqlog_x_login', true),
     "reqlog_x_rs" : bool('reqlog_x_rs', true),
+
+    // Cloud PLATFORM
+    "cloud_platform":str('cloud_platform', 'kic'),
+    "cloud_platform_chk":str('cloud_platform_chk', 'kr-central-1'),
+    "cloud_platform_httpc":str('cloud_platform_httpc', 'http://169.254.169.254/latest/meta-data/placement/availability-zone'),
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/core/agent.js

@@ -167,6 +167,8 @@ NodeAgent.prototype.initOK = function(cb) {
     param.putString('user.timezone', NodeUtil.getTimeZone());
     param.putString('user.home', os.homedir());
     param.putString('user.hostname', os.hostname());
+    // CLOUD PLATFORM INFO
+    param.putString('CLOUD_PLATFORM', WhatapUtil.cloudPlatformCheck());
     DataPackSender.sendBoot(param);
 
     if(self._counterManager === null) {

package/lib/counter/task/sql.js

@@ -61,14 +61,16 @@ function sql_meter(p){
         for (var i = 0; i < 100 && en.hasMoreElements(); i++) {
             var key = en.nextElement();
             var b = MeterSql.stat.get(key);
-            p.sql_meter.put(key, {
-                time: b.sql_time,
-                count: b.sql_count,
-                error: b.sql_error,
-                actx : 0,
-                fetch_count: b.sql_fetch_count,
-                fetch_time: b.sql_fetch_time
-            });
+            if(b != null) {
+                p.sql_meter.put(key, {
+                    time: b.time,
+                    count: b.count,
+                    error: b.error,
+                    actx : 0,
+                    fetch_count: b.fetch_count,
+                    fetch_time: b.fetch_time
+                });
+            }
         }
         MeterSql.resetStat();
     }

package/lib/util/index.js

@@ -6,6 +6,7 @@
 
 
 var NodeUtil = require('../util/nodeutil');
+var http = require('http');
 var Configure   = require('../conf/configure'),
     Logger      = require('../logger');
 var emptyIp = Buffer.alloc(4 , 0);
@@ -42,8 +43,36 @@ function printWhatap() {
     console.log(str);
 }
 
+function cloudPlatformCheck() {
+    let cloud_platform = Configure.cloud_platform;
+    let cloud_platform_chk = Configure.cloud_platform_chk;
+    let cloud_platform_httpc = Configure.cloud_platform_httpc;
+    let CAP_INFO = '';
+    Logger.print('[cloudPlatformCheck]', `cloud_platform: ${cloud_platform} , cloud_platform_chk: ${cloud_platform_chk} , cloud_platform_httpc: ${cloud_platform_httpc}` , false)
+    http.get(cloud_platform_httpc, (resp) => {
+        let data = '';
+        
+        resp.on('data', (chunk) => {
+            data += chunk;
+        });
+
+        resp.on('end', () => {
+            if (data.length < 5) return;
+            if (data.indexOf(cloud_platform_chk) >= 0) {
+                Logger.print('[cloudPlatformCheck]', "This agent is working in " + cloud_platform , false)
+                CAP_INFO = cloud_platform;
+            }
+            return CAP_INFO;
+        });
+    }).on("error", (err) => {
+        Logger.print('[cloudPlatformCheck Error]', "Error: " + err.message , false);
+    });
+    return CAP_INFO;
+}
+
 module.exports = {
     getIPAddresses: getIPAddresses,
     getRandomInteger: getRandomInteger,
-    printWhatap: printWhatap
-};
+    printWhatap: printWhatap,
+    cloudPlatformCheck:cloudPlatformCheck
+};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.54",
-  "releaseDate": "20220718",
+  "version": "0.4.57",
+  "releaseDate": "20220808",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},