whatap 0.4.73 → 0.4.75

package/lib/conf/config-default.js

@@ -84,6 +84,7 @@ var ConfigDefault = {
     "trace_http_client_ip_header_key": "x-forwarded-for",
     "trace_user_agent_header_key": "",
     "trace_referer_header_key": "",
+    "profile_sql_param_enabled": bool('profile_sql_param_enabled',false),
 
     "error_snap_enabled" : true,
     
@@ -174,6 +175,7 @@ var ConfigDefault = {
     "whatap_micro_enabled": bool('whatap_micro_enabled',false),
     "master_agent_host": str('master_agent_host', 'whatap-master-agent.whatap-monitoring.svc.cluster.local'),
     "master_agent_port": num('master_agent_port', 6600),
+    "enabled_master_agent_call": bool('enabled_master_agent_call' , false), 
 
     "simula_agent_count": num('simula_agent_count', 0),
     "correction_factor_cpu": num('correction_factor_cpu', 1),

package/lib/core/agent.js

@@ -274,21 +274,21 @@ NodeAgent.prototype.loadObserves = function() {
         });
     });
 
-    agent.aop.after(module.__proto__, 'require', function(obj, args, result) {
-        //PackageCtrHelper.addPackage(args[0], obj.id, result);
+    agent.aop.after(module.proto, 'require', function (obj, args, result) {
         var observes = packageToObserve[args[0]];
 
-        if(observes) {
-            observes.forEach(function(observe){
-                if(result.__whatap_observe__ == true) return;
-                
-                observe.inject(result, args[0]);
-                if(result && result.constructor == Object){
-                    result.__whatap_observe__ = true;
-                }
-            });
+        if (observes) {
+            return observes.inject(result, args[0])
         }
     });
+
+    for (var name in packageToObserve) {
+        try {
+            require(name);
+        } catch (err) {
+            Logger.print("WHTAP-loadObserves", 'unable to load ' + name + ' module', false);
+        }
+    }
     new ProcessObserver(agent).inject(process, 'process');
     new GlobalObserver(agent).inject(global, 'global');
 };

package/lib/counter/counter-manager.js

@@ -61,7 +61,7 @@ CounterManager.prototype.run = function () {
 
     if(conf.whatap_micro_enabled){
         KubeUtil.loadContainerId();
-        KubeClient.run();
+        if (conf.enabled_master_agent_call) KubeClient.run();
     }
 };
 CounterManager.prototype.stop = function(){

package/lib/kube/kube-client.js

@@ -69,11 +69,9 @@ var KubeClient = {
             client.open( self.node_agent_ip , self.node_agent_port, function(err, data){
                 client.send(new DataOutputX().writeValue(p));
             }, function(err, data){
-
                 if(err || !data){
                     return console.log("#### errordata" , err, data);
                 }
-
                 var m = new DataInputX(data).readValue();
 
                 self.cpu = m.getFloat("cpu");

package/lib/logger.js

@@ -97,7 +97,20 @@
              }
          }
      },
-     printError : function (id, message, err, sysout) {
+     initPrint : function (message) {
+        try{
+            var b_msg = this.build("WHATAP-INIT", message + " starting!");
+            if(this.printWriter != null) {
+                this.printWriter.write(b_msg);
+                this.printWriter.write('\n');
+            } else {
+                this.openFile();
+            }
+        } catch (e){
+           
+        }
+    },
+    printError : function (id, message, err, sysout) {
          if(this.checkOk(id, 10) == false) {
              return;
          }

package/lib/observers/express-observer.js

@@ -11,6 +11,7 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     DataTextAgent       = require('../data/datatext-agent'),
     URLPatternDetector  = require('../trace/serviceurl-pattern-detector').Detector,
     PathMap             = require('../trace/serviceurl-pattern-detector').PathMap,
+    Logger              = require('../logger'),
     Long                = require('long');
 
 var ExpressObserver = function(agent){
@@ -65,7 +66,7 @@ ExpressObserver.prototype.inject = function( mod, moduleName ) {
     var self = this;
     if (mod.__whatap_observe__) return;
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("ExpressObserver");
     var aop = this.agent.aop;
     
     if(!mod.Router){

package/lib/observers/file-observer.js

@@ -29,7 +29,7 @@ FileObserve.prototype.inject = function( mod ) {
 
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("FileObserve");
     var extension = Configure.getProperty('web_static_content_extensions'),
         extensions = [],
         plugins = ['appservicestart', 'appserviceend', 'httpservicestart', 'httpserviceend', 'httpcall'];

package/lib/observers/http-observer.js

@@ -504,7 +504,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
 
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("HttpObserver");
     if( conf.profile_enabled === false ) { return; }
 
     aop.after(mod, 'createServer', function (obj, args, ret) {

package/lib/observers/maria-observer.js

@@ -202,6 +202,8 @@ MariaObserver.prototype.inject = function (mod, moduleName) {
  if(mod.__whatap_observe__) { return; }
  mod.__whatap_observe__ = true;
 
+ Logger.initPrint("MariaObserver");
+ 
  var self = this;
  var aop = self.agent.aop;
 

package/lib/observers/mongo-observer.js

@@ -21,6 +21,8 @@ MongoObserver.prototype.inject = function( mod, moduleName ) {
     if(mod.__whatap_observe__) {return;}
     mod.__whatap_observe__ = true;
 
+    Logger.initPrint("MongoObserver");
+    
     var self = this;
     self.agent.aop.before(mod.Server.prototype, 'connect', function (obj, args) {
 

package/lib/observers/mongodb-observer.js

@@ -10,7 +10,8 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     DataTextAgent       = require('../data/datatext-agent'),
     StatError           = require('../stat/stat-error'),
     TextTypes           = require('../lang/text-types'),
-    hashUtil            = require('../util/hashutil');
+    hashUtil            = require('../util/hashutil'),
+    Logger              = require('../logger');
 
 var MongodbObserver = function(agent){
     this.agent = agent;
@@ -28,6 +29,8 @@ MongodbObserver.prototype.inject = function( mod, moduleName ) {
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
 
+    Logger.initPrint("MongodbObserver");
+    
     var requestTable = {},
         nextRequest,
         listener = mod.instrument({}, function(err, instrumentations) {});

package/lib/observers/mssql-observer.js

@@ -32,6 +32,8 @@ MssqlObserver.prototype.inject = function (mod, modName) {
 
     if(mod.__whatap_observe__) {return;}
     mod.__whatap_observe__ = true;
+    
+    Logger.initPrint("MssqlObserver");
 
     var self = this;
 

package/lib/observers/mysql-observer.js

@@ -26,7 +26,7 @@
 
 var MysqlObserver = function (agent) {
  this.agent = agent;
- this.packages = ['mysql','mysql2'];
+ this.packages = ['mysql','mysql2','mysql2/promise'];
 };
 
 var queryHook = function (dbc_hash, agent) {
@@ -166,7 +166,7 @@ var toParamBytes = function(p, crc) {
      return null;
  }
  try{
-     return ParamSecurity.encrypt(Buffer.from(p), crc);
+    return ParamSecurity.encrypt(Buffer.from(p, 'utf8'), crc);
  } catch(e) {
      return null;
  }
@@ -210,7 +210,7 @@ var errorDelegate = function () {
 MysqlObserver.prototype.inject = function (mod, moduleName) {
  if(mod.__whatap_observe__) { return; }
  mod.__whatap_observe__ = true;
-
+ Logger.initPrint("MysqlObserver");
  var self = this;
  var aop = self.agent.aop;
 

package/lib/observers/net-observer.js

@@ -19,7 +19,7 @@ var NetObserver = function(agent){
 NetObserver.prototype.inject = function (mod, moduleName) {
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("NetObserver");
     if ( conf.trace_background_socket_enabled === false ) { return; }
 
     var self = this;

package/lib/observers/pgsql-observer.js

@@ -195,6 +195,8 @@ PgSqlObserver.prototype.inject = function (mod, moduleName) {
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
 
+    Logger.initPrint("PgSqlObserver");
+    
     var self = this;
     var aop = self.agent.aop;
 

package/lib/observers/promise-observer.js

@@ -2,8 +2,8 @@
  * Created by yunhoi on 12/06/2017.
  */
 
-var TraceContextManager = require('../trace/trace-context-manager');
-
+var TraceContextManager = require('../trace/trace-context-manager'),
+Logger              = require('../logger');
 
 var PromiseObserver = function (agent) {
     this.agent = agent;
@@ -17,7 +17,7 @@ PromiseObserver.prototype.inject = function (mod, moduleName) {
 
     if(mod.__whatap_observe__) {return;}
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("PromiseObserver");
     aop.both(mod.prototype, 'then'
         , function (obj, args, lctx) {
             var ctx = TraceContextManager.getCurrentContext();

package/lib/observers/redis-observer.js

@@ -5,7 +5,8 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     DBCStep             = require('../step/dbc-step'),
     TextTypes           = require('../lang/text-types'),
     HashUtil            = require('../util/hashutil'),
-    Long                = require('long');
+    Long                = require('long'),
+    Logger              = require('../logger');
 
 
 var RedisObserver = function (agent) {
@@ -18,7 +19,7 @@ RedisObserver.prototype.inject = function (mod, modName) {
 
     if(mod.__whatap_observe__) {return;}
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("RedisObserver");
     var self = this;
 
     self.aop.both(mod, 'createClient',

package/lib/observers/schedule-observer.js

@@ -26,6 +26,7 @@ var ScheduleObserver = function(agent){
 ScheduleObserver.prototype.inject = function (mod, moduleName) {
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
+    Logger.initPrint("ScheduleObserver");
     var self = this;
     var aop = self.agent.aop;
 

package/lib/observers/socket.io-observer.js

@@ -4,7 +4,8 @@
  * can be found in the LICENSE file.
  */
 
-var MeterSocketio = require('../counter/meter/meter-socket.io');
+var MeterSocketio = require('../counter/meter/meter-socket.io'),
+Logger              = require('../logger');
 
 var SocketIOObserver = function(agent){
     this.agent = agent;
@@ -17,7 +18,7 @@ SocketIOObserver.prototype.inject = function( mod ){
 
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("SocketIOObserver");
     aop.after(mod.prototype, ['listen','attach'], function(obj, args, ret) {
         if (!ret.sockets) return;
 

package/lib/observers/thrift-observer.js

@@ -32,7 +32,7 @@ ThriftObserver.prototype.inject = function (mod, moduleName) {
         return;
     }
     mod.__whatap_observe__ = true;
-
+    Logger.initPrint("ThriftObserver");
     var self = this;
     var aop = self.agent.aop;
 

package/lib/util/kube-util.js

@@ -1,13 +1,41 @@
 var fs = require('fs');
 var HashUtil2    = require('./hashutil2'),
-    Logger      = require('./../logger')
-    ;
+    StringUtil  = require('./string-util'),
+    Logger      = require('./../logger');
 
 var KubeUtil = {
     container_key: 0, 
     container_id: undefined,
+    loadFromMountinfo: function() {
+        if (this.container_id !== null && this.container_id !== undefined) return;
+
+        try{
+            var content = fs.readFileSync("/proc/self/mountinfo");
+            content = content.toString('utf-8');
+            var contents = content.split('\n')
+
+            for(var i = 0 ; i < contents.length ; i++){
+                var line = contents[i].trim();
+                if(line){
+                    if(line.indexOf("/kubelet/pods/") >= 0) {
+                        let lineParts = line.split("/kubelet/pods/");
+                        if (lineParts != null && lineParts.length > 1) {
+                            this.container_id= lineParts[1].split('/')[0];
+                        }
+                        if(this.container_id.length > 5){
+                            this.container_key = HashUtil2.hash(this.container_id);
+                            break;
+                        }
+                    }
+                }
+            }
+            Logger.print('WHATAP-800' , 'loadFromMountinfo id:' + this.container_id + ' // key:' + this.container_key  , false)
+        }catch(e){
+            Logger.printError('WHATAP-800', 'KubeUtil(loadFromMountinfo) ', e)
+        }
+    },
     loadContainerId: function(){
-        if (this.container_id != null) return ;
+        if (this.container_id !== null && this.container_id !== undefined) return;
 
         try{
             var content = fs.readFileSync("/proc/self/cgroup");
@@ -15,7 +43,7 @@ var KubeUtil = {
             var contents = content.split('\n')
 
             for(var i = 0 ; i < contents.length ; i++){
-                var line = contents[i];
+                var line = contents[i].trim();
                 if(line){
                     if(line.indexOf("/ecs/") >= 0) {
                         this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
@@ -35,11 +63,11 @@ var KubeUtil = {
                     }
                 }
             }
-            Logger.print('WHATAP-800' , 'id:' + this.container_id + ' // key:' + this.container_key  , false)
+            Logger.print('WHATAP-800' , 'loadContainerId id:' + this.container_id + ' // key:' + this.container_key  , false);
         }catch(e){
             Logger.printError('WHATAP-800', 'KubeUtil(loadContainerId) ', e)
         }
+        if(this.container_key == 0) this.loadFromMountinfo();
     }
 }
-
 module.exports = KubeUtil;

package/logs/whatap-20230616.log

@@ -0,0 +1,13 @@
+20230616 11:38:40 [WHATAP-001] <33088> Start initialize WhaTap Agent... Root[C:\Whatap\node_last]
+20230616 11:38:40 [WHATAP-203] <33088> Config file reloaded
+20230616 11:38:40 [WHATAP-101] <33088> Finish initialize configuration... false
+20230616 11:38:40 [WHATAP-110] <33088> [pcode=0,SECURE_KEY=]
+20230616 11:38:40 [WHATAP-170] <33088> [WhaTap Agent] now waiting for starting......
+20230616 11:38:45 [WHATAP-011] <33088> Connecton Retry....
+Error: PCODE is not defined..
+    at TcpSession.open (C:\Whatap\node_last\lib\net\tcp-session.js:41:26)
+    at Timeout.<anonymous> (C:\Whatap\node_last\lib\core\agent.js:215:26)
+    at Timeout.wrapper [as _onTimeout] (C:\Whatap\node_last\lib\core\interceptor.js:129:27)
+    at listOnTimeout (internal/timers.js:554:17)
+    at processTimers (internal/timers.js:497:7)
+20230616 11:38:50 [WHATAP-170] <33088> [WhaTap Agent] now waiting for starting......

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.73",
-  "releaseDate": "20230510",
+  "version": "0.4.75",
+  "releaseDate": "20230623",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},