whatap 0.4.97 → 0.4.98

package/lib/conf/config-default.js

@@ -256,6 +256,9 @@ var ConfigDefault = {
     "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'),
+
+    "stat_ipurl_enabled": bool("stat_ipurl_enabled", false),
+    "stat_ipurl_max_count": num("stat_ipurl_max_count", 10000),
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/conf/configure.js

@@ -52,7 +52,7 @@ var applyEmptyConf=false;
 Configuration.prototype.reload = function(cb) {
     var self = this;
 
-    this.getPropertyFilePath( function(err, propertyFile) {        
+    this.getPropertyFilePath( function(err, propertyFile) {
         if(err) {
             if(applyEmptyConf==false){
                 applyEmptyConf=true;
@@ -63,14 +63,14 @@ Configuration.prototype.reload = function(cb) {
                 defKeys.forEach(function (key) {
                     if(ConfigDefault[key]) {
                         p[key] = ConfigDefault[key];
-                    }                
+                    }
                 });
                 if(process.env.WHATAP_SERVER_HOST){
                     p['whatap.server.host']=process.env.WHATAP_SERVER_HOST;
-                } 
+                }
                 if(process.env.WHATAP_LICENSE){
                     p['license']=process.env.WHATAP_LICENSE;
-                } 
+                }
                 self.apply(p);
                 updatePrivate(self);
                 if(cb) cb();
@@ -121,6 +121,10 @@ Configuration.prototype.reload = function(cb) {
                 require('../logger').print("WHATAP-203", "Config file reloaded", false);
             }
 
+            if(!self._customProps['license'] && process.env.WHATAP_LICENSE)
+                self._customProps['license'] = process.env.WHATAP_LICENSE;
+            if(!self._customProps['whatap.server.host'] && process.env.WHATAP_SERVER_HOST)
+                self._customProps['whatap.server.host'] = process.env.WHATAP_SERVER_HOST;
             self.apply( self._customProps );
             updatePrivate(self);
             if(cb) cb();
@@ -150,10 +154,10 @@ Configuration.prototype.apply = function(properties) {
     var ips = Array.from(set);
     this.whatap_server_host = ips;
 
-    if( this.getProperty('whatap_micro_enabled') === true || process.env.WHATAP_MICRO_ENABLED === "true"){
+    if( this.getProperty('whatap_micro_enabled', false) === true || process.env.WHATAP_MICRO_ENABLED === "true"){
         this.kubeNodeName(properties);
     }
-    
+
     ConfSysMon.apply(properties);
 };
 
@@ -170,12 +174,12 @@ Configuration.prototype.kubeNodeName = function(properties){
 
     this.ONODE_NAME = this.getProperty("whatap.onode");
     if (!this.ONODE_NAME || (this.ONODE_NAME && this.ONODE_NAME.length < 1)) {
-        this.ONODE_NAME = process.env['NODE_NAME'];
+        this.ONODE_NAME = process.env['NODE_NAME'] || process.env['WHATAP_ONODE'];
     }
     if (!this.ONODE_NAME || (this.ONODE_NAME && this.ONODE_NAME.length < 1)) {
         this.ONODE_NAME = process.env["NODE_IP"];
     }
-    this.ONODE = StringUtil.isEmpty(this.ONODE_NAME) ? 0 : HashUtil.hash(this.ONODE_NAME);
+    this.ONODE = StringUtil.isEmpty(this.ONODE_NAME) ? 0 : HashUtil.hashFromString(this.ONODE_NAME);
     secu.ONODE = this.ONODE;
     secu.ONODE_NAME = this.ONODE_NAME;
 }
@@ -197,7 +201,7 @@ Configuration.prototype.getPropertyFilePath = function(cb) {
 
     var default_conf = WHATAP_CONF+".conf";
     var configFile = this.getProperty('whatap.config', default_conf);
-    
+
     var confFullPathFile=path.join(confDir, configFile);
     fs.access(confFullPathFile, function (err) {
         if (err) {
@@ -230,10 +234,10 @@ Configuration.prototype.saveProperty = function(keyValues){
 
         if(!self._customProps['whatap.server.host'] && process.env.WHATAP_SERVER_HOST){
             self._customProps['whatap.server.host']=process.env.WHATAP_SERVER_HOST;
-        } 
+        }
         if(!self._customProps['license'] && process.env.WHATAP_LICENSE){
             self._customProps['license']=process.env.WHATAP_LICENSE;
-        } 
+        }
         var writeContents = '';
         for(var k in self._customProps){
             var v = self._customProps[k];
@@ -301,11 +305,11 @@ Configuration.prototype.isIgnoreLog = function (id) {
 };
 Configuration.prototype.setSocketChk = function (socket) {
     if(socket.whatapId == undefined) {
-        socket.whatapId = (new Date()).getTime().toString(36) + Math.random().toString(36).slice(2);    
-        //require('../logger').print("WHATAP-TEST", 'Socket whatapId : ' + socket.whatapId, false);   
-    } 
+        socket.whatapId = (new Date()).getTime().toString(36) + Math.random().toString(36).slice(2);
+        //require('../logger').print("WHATAP-TEST", 'Socket whatapId : ' + socket.whatapId, false);
+    }
     //else {
-    //    require('../logger').print("WHATAP-TEST", '[REUSE] Socket whatapId : ' + socket.whatapId, false);   
+    //    require('../logger').print("WHATAP-TEST", '[REUSE] Socket whatapId : ' + socket.whatapId, false);
     //}
     if(this.socketChk.get(socket.whatapId) == null) {
         this.socketChk.put(socket.whatapId , socket.whatapId);
@@ -319,7 +323,7 @@ Configuration.prototype.getStringSet = function (key, defaultValue, deli) {
 
     var arr = value.split(deli);
     for(var i=0; i<arr.length; i++) {
-    	var x = arr[i].trim();
+        var x = arr[i].trim();
         if(x)set.add(replaceCarriageReturns(x));
     }
     return set;

package/lib/core/agent.js

@@ -52,7 +52,8 @@ var Configuration    = require('./../conf/configure'),
 require('../stat/stat-tranx');
 require('../stat/stat-sql');
 require('../stat/stat-httpc');
-require('../stat/stat-remoteip');
+require('../stat/stat-remote-ip');
+require('../stat/stat-remote-ipurl');
 require('../stat/stat-useragent');
 require('../stat/timingsender');
 

package/lib/data/datapack-sender.js

@@ -159,6 +159,10 @@ var sendStatRemoteIpPack = function(p){
     return sendPack(p);
 };
 
+var sendStatRemoteIpUrlPack = function(p){
+    return sendPack(p);
+};
+
 var sendStatUserAgentPack = function(p){
     return sendPack(p);
 };
@@ -245,6 +249,7 @@ var DataPackSender = {
     sendStatHttpcPack       : sendStatHttpcPack,
     sendStatErrorPack       : sendStatErrorPack,
     sendStatRemoteIpPack    : sendStatRemoteIpPack,
+    sendStatRemoteIpUrlPack : sendStatRemoteIpUrlPack,
     sendStatUserAgentPack   : sendStatUserAgentPack,
 
     sendRealtimeUserPack    : sendRealtimeUserPack,

package/lib/data/dataprofile-agent.js

@@ -6,11 +6,12 @@
 
 var DataPackSender  = require('./datapack-sender'),
     StatTranX       = require('../stat/stat-tranx'),
-    StatRemoteIp    = require('../stat/stat-remoteip'),
+    StatRemoteIp    = require('../stat/stat-remote-ip'),
     StatUserAgent   = require('../stat/stat-useragent'),
     StatTranxDomain   = require('../stat/stat-tx-domain'),
     StatTranxMtCaller   = require('../stat/stat-tx-caller'),
     StatTranxReferer   = require('../stat/stat-tx-referer'),
+    StatRemoteIpUrl   = require('../stat/stat-remote-ipurl'),
     conf            = require('../conf/configure'),
     HashUtil            = require('../util/hashutil'),
     EventLevel          = require('../data/event-level'),
@@ -20,9 +21,13 @@ var DataPackSender  = require('./datapack-sender'),
 
 var ZipProfile = require('./zipprofile');
 var profile_zip_enabled = conf.getProperty('profile_zip_enabled', false);
+var stat_ipurl_enabled = conf.getProperty('stat_ipurl_enabled', false);
 conf.on('profile_zip_enabled', function(newProperty) {
     profile_zip_enabled = newProperty;
 });
+conf.on('stat_ipurl_enabled', function(newProperty) {
+    stat_ipurl_enabled = newProperty;
+});
 
 var DataProfileAgent = {
     last_reject : 0,
@@ -32,6 +37,17 @@ var DataProfileAgent = {
             StatUserAgent.incUserAgent(ctx.userAgent);
 
             var transaction = profile.service;
+            if(stat_ipurl_enabled && ctx.remoteIp){
+                var tc = StatRemoteIpUrl.getService(ctx.remoteIp, ctx.service_hash);
+                if (tc) {
+                    tc.count++;
+                    if (tc.errorLevel >= EventLevel.WARNING) {
+                        tc.error++;
+                    }
+                    tc.time += transaction.elapsed;
+                }
+            }
+
             if(conf.stat_domain_enabled && ctx.http_host_hash!=0) {
                 StatTranxDomain.add(ctx.http_host_hash, ctx.service_hash, transaction.elapsed, ctx.error != 0);
             }

package/lib/net/security-master.js

@@ -90,9 +90,11 @@ var SecurityMaster = {
             this.OKIND_NAME=null;
         }
 
-        if(Configuration.getProperty('whatap_micro_enabled', false) === false || process.env.WHATAP_MICRO_ENABLED === "true") {
-            var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
-            console.log(onodeStr)
+        const whatapMicroEnabledConfig = Configuration.getProperty('whatap_micro_enabled', false);
+        const whatapMicroEnabledEnv = process.env.WHATAP_MICRO_ENABLED;
+
+        if (!whatapMicroEnabledConfig || whatapMicroEnabledEnv === undefined || whatapMicroEnabledEnv === "false") {
+            var onodeStr= process.env.WHATAP_ONODE || process.env.NODE_NAME ||  Configuration.getProperty('whatap.onode', null);
             if(onodeStr && onodeStr.length>0){
                 this.ONODE = HashUtil.hashFromString(onodeStr);
                 this.ONODE_NAME=onodeStr;
@@ -140,8 +142,11 @@ var SecurityMaster = {
             this.OKIND_NAME=null;
         }
 
-        if(Configuration.getProperty('whatap_micro_enabled', false) === false || process.env.WHATAP_MICRO_ENABLED === "true") {
-            var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
+        const whatapMicroEnabledConfig = Configuration.getProperty('whatap_micro_enabled', false);
+        const whatapMicroEnabledEnv = process.env.WHATAP_MICRO_ENABLED;
+
+        if (!whatapMicroEnabledConfig || whatapMicroEnabledEnv === undefined || whatapMicroEnabledEnv === "false") {
+            var onodeStr= process.env.WHATAP_ONODE || process.env.NODE_NAME ||  Configuration.getProperty('whatap.onode', null);
             if(onodeStr && onodeStr.length>0){
                 this.ONODE = HashUtil.hashFromString(onodeStr);
                 this.ONODE_NAME=onodeStr;

package/lib/observers/websocket-observer.js

@@ -24,7 +24,7 @@ const MeterUsers = require("whatap/lib/counter/meter/meter-users");
 const DataPackSender = require("whatap/lib/data/datapack-sender");
 const MeterService        = require('../counter/meter/meter-service').MeterService;
 
-var trace_background_socket_enabled = conf.getProperty('trace_background_socket_enabled', false);
+var trace_background_socket_enabled = conf.getProperty('trace_background_socket_enabled', true);
 conf.on('trace_background_socket_enabled', function (newProps) {
     trace_background_socket_enabled = newProps;
 })

package/lib/stat/{stat-remoteip.js → stat-remote-ip.js}

@@ -9,23 +9,23 @@ var StatRemoteIpPack    = require('../pack/statremote-pack'),
 
 var TABLE_MAX_SIZE = 70000;
 
-function StatRemoteIP() {
-    if(typeof StatRemoteIP.instance === 'object') {
-        return StatRemoteIP.instance;
+function StatRemoteIp() {
+    if(typeof StatRemoteIp.instance === 'object') {
+        return StatRemoteIp.instance;
     }
 
     this.table = new StatRemoteIpPack();
     this.table.iptable.setMax(TABLE_MAX_SIZE);
 
-    StatRemoteIP.instance = this;
+    StatRemoteIp.instance = this;
 }
 
-StatRemoteIP.prototype.incRemoteIp = function (ip) {
+StatRemoteIp.prototype.incRemoteIp = function (ip) {
     if(ip) {
         this.table.iptable.addNoOver(ip,1);
     }
 };
-StatRemoteIP.prototype.send = function (now) {
+StatRemoteIp.prototype.send = function (now) {
     if(this.table.iptable.size() === 0) {
         return;
     }
@@ -37,10 +37,10 @@ StatRemoteIP.prototype.send = function (now) {
     this.table = new StatRemoteIpPack();
     this.table.iptable.setMax(TABLE_MAX_SIZE);
 };
-StatRemoteIP.prototype.clear = function () {
+StatRemoteIp.prototype.clear = function () {
     this.table.iptable.clear();
 };
 
-module.exports = new StatRemoteIP();
+module.exports = new StatRemoteIp();
 
 

package/lib/stat/stat-remote-ipurl.js

@@ -0,0 +1,88 @@
+const StatGeneralPack = require('../pack/stat-general-pack');
+const LongKeyLinkedMap = require('../util/longkey-linkedmap');
+const TimeCount = require('../pack/time-count');
+const conf = require('../conf/configure');
+const BitUtil = require('../util/bitutil');
+const ZipProfile = require('../data/zipprofile');
+const DataPackSender = require('../data/datapack-sender');
+const AnyList       = require('../util/anylist');
+
+var TABLE_MAX_SIZE = 10000;
+
+function StatRemoteIpurl() {
+    if (typeof StatRemoteIpurl.instance === 'object') {
+        return StatRemoteIpurl.instance;
+    }
+
+    this.TABLE_MAX_SIZE = TABLE_MAX_SIZE;
+    this.table = new LongKeyLinkedMap(TABLE_MAX_SIZE + 1, 1).setMax(TABLE_MAX_SIZE);
+    this.table.create = function (key) {
+        return new TimeCount();
+    };
+
+    StatRemoteIpurl.instance = this;
+}
+
+StatRemoteIpurl.prototype.getService = function (ip, url_hash) {
+    var key = BitUtil.composite(ip, url_hash);
+    if (this.table.size() < conf.getProperty('stat_ipurl_max_count', 10000)) {
+        return this.table.intern(key);
+    } else {
+        return this.table.get(key);
+    }
+};
+
+StatRemoteIpurl.prototype.send = function (now) {
+    if (this.table.size() === 0) return;
+
+    var currTable = this.table;
+    var sz = Math.max(this.TABLE_MAX_SIZE, conf.getProperty('stat_ipurl_max_count', 10000));
+    this.table = new LongKeyLinkedMap(sz + 1, 1).setMax(conf.getProperty('stat_ipurl_max_count', 10000));
+    this.table.create = function (key) {
+        return new TimeCount();
+    };
+
+    var rsize = this.table.size();
+    var ip = new AnyList(AnyList.INT, rsize);
+    var url = new AnyList(AnyList.INT, rsize);
+    var count = new AnyList(AnyList.INT, rsize);
+    var error = new AnyList(AnyList.INT, rsize);
+    var time = new AnyList(AnyList.LONG, rsize);
+
+    var entries = currTable.entries();
+    var i = 0;
+    while(entries.hasMoreElements()){
+        var ent = entries.nextElement();
+        var k = ent.getKey();
+        var v = ent.getValue();
+
+        ip.put(i, BitUtil.getHigh(k));
+        url.put(i, BitUtil.getLow(k));
+        count.put(i, v.count);
+        error.put(i, v.error);
+        time.put(i, v.time);
+        i++;
+    }
+
+    const out = new StatGeneralPack();
+    out.put("ip", ip);
+    out.put("url", url);
+    out.put("count", count);
+    out.put("error", error);
+    out.put("time", time);
+
+    out.id = "ip-url";
+    out.time = now;
+
+    DataPackSender.sendStatRemoteIpUrlPack(out);
+};
+
+StatRemoteIpurl.prototype.clear = function () {
+    this.table.clear();
+};
+
+StatRemoteIpurl.prototype.size = function () {
+    return this.table.size();
+};
+
+module.exports = new StatRemoteIpurl();

package/lib/stat/timingsender.js

@@ -9,7 +9,8 @@ var StatError       = require('./stat-error'),
     StatTranx       = require('./stat-tranx'),
     StatSql         = require('./stat-sql'),
     StatHttpc       = require('./stat-httpc'),
-    StatRemoteIp    = require('./stat-remoteip'),
+    StatRemoteIp    = require('./stat-remote-ip'),
+    StatRemoteIpUrl = require('./stat-remote-ipurl'),
     StatUserAgent   = require('./stat-useragent'),
     StatTranxMtCaller   = require('./stat-tx-caller'),
     StatTranxDomain   = require('./stat-tx-domain'),
@@ -43,6 +44,7 @@ TimingSender.prototype.run = function(){
                 StatSql.send(now);
                 StatHttpc.send(now);
                 StatRemoteIp.send(now);
+                StatRemoteIpUrl.send(now);
                 StatUserAgent.send(now);
                 StatError.send(now);
                 StatTranxDomain.send(now);
@@ -53,6 +55,7 @@ TimingSender.prototype.run = function(){
                 StatSql.clear();
                 StatHttpc.clear();
                 StatRemoteIp.clear();
+                StatRemoteIpUrl.clear();
                 StatUserAgent.clear();
                 StatError.clear();
                 StatTranxDomain.clear();

package/lib/util/kube-util.js

@@ -7,7 +7,7 @@ var KubeUtil = {
     container_key: 0, 
     container_id: undefined,
     loadFromMountinfo: function() {
-        if (this.container_id !== null && this.container_id !== undefined) return;
+        if (this.container_id) return;
 
         try{
             var content = fs.readFileSync("/proc/self/mountinfo");
@@ -35,7 +35,7 @@ var KubeUtil = {
         }
     },
     loadContainerId: function(){
-        if (this.container_id !== null && this.container_id !== undefined) return;
+        if (this.container_id) return;
 
         try{
             var content = fs.readFileSync("/proc/self/cgroup");
@@ -67,7 +67,7 @@ var KubeUtil = {
         }catch(e){
             Logger.printError('WHATAP-800', 'KubeUtil(loadContainerId) ', e)
         }
-        if(this.container_key == 0) this.loadFromMountinfo();
+        if(!this.container_key) this.loadFromMountinfo();
     }
 }
 module.exports = KubeUtil;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.97",
-  "releaseDate": "20240603",
+  "version": "0.4.98",
+  "releaseDate": "20240709",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},