whatap 0.4.88 → 0.4.89

package/lib/control/packagectr-helper.js

@@ -20,69 +20,43 @@ var loadedPackageList   = [],
     dependencies        = [];
 
 var PackageCtrHelper = function() {};
-PackageCtrHelper.addPackage = function(name, callPath, pkg){
+PackageCtrHelper.addPackage = function(realPath){
     try {
-        if (name[0] != '.') {
-            if (ArrayUtil.isExist(loadedPackageList, name) == false) {
-                loadedPackageList.push(name);
-            }
-        } else if(callPath != null) {
-            var callerPath = path.join(callPath, '..');
-            var filename = name;
-            var realPath = callerPath;
-            try {
-                realPath = fs.realpathSync(path.join(callerPath, filename));
-            } catch(e) {
-                try {
-                    filename += '.js';
-                    realPath = fs.realpathSync(path.join(callerPath, filename));
-                } catch(e) {
-                    return Logger.printError("WHATAP-511", "PackageControler helper", e, false);
-                }
-            }
-            loadedPackages[realPath] = pkg;
+        if(!loadedPackages[realPath]){
+            loadedPackages[realPath] = require(realPath);
         }
     } catch(e) {
         return Logger.printError("WHATAP-512", "PackageControler helper", e, false);
     }
 };
-PackageCtrHelper.dynamicHook = function(realPath, funcName) {
-    if(realPath == null || funcName == null) {
+PackageCtrHelper.dynamicHook = function(pkg, realPath, funcName) {
+    if(!pkg || !funcName) {
         return;
     }
-    if(loadedPackages[realPath]){
-        var pkg = loadedPackages[realPath];
 
-        if(pkg['prototype']){
-            if(pkg['prototype'][funcName] ){
-                var AOP = require('../core/interceptor').Interceptor;
-                var _aop = new AOP(null);
-                _aop.both(pkg['prototype'], funcName,
-                    function(){
-                        // transaction step
-                        var ctx = TraceContextManager.getCurrentContext();
-                        var step = new MethodStep();
-                        var msg = realPath + ' ' + funcName;
-                        var hash = HashUtil.hashFromString(msg);
-
-                        DataTextAgent.METHOD.add(hash, msg);
-                        step.hash = hash;
-                        step.start_time = ctx.getElapsedTime();
-                        pkg.__whatap_step__ = step;
-                    },
-                    function(){
-                        var ctx = TraceContextManager.getCurrentContext();
-                        var step = pkg.__whatap_step__;
-                        step.elapsed = ctx.getElapsedTime() - step.start_time;
-                        ctx.profile.add(step);
-                    });
-            }
-        } else {
-            _aop.before(pkg, functName, function(){
-                // transaction step
-            }, false);
-        }
-    }
+    var Interceptor = require('../core/interceptor').Interceptor;
+    var _aop = new Interceptor(null);
+    _aop.both(pkg, funcName,
+        function(obj, args, lctx){
+            // transaction step
+            var ctx = lctx.context;
+            if(!ctx) { return; }
+
+            var msg = realPath + ' ' + funcName;
+            var hash = HashUtil.hashFromString(msg);
+            var step = new MethodStep();
+            DataTextAgent.METHOD.add(hash, msg);
+            step.hash = hash;
+            step.start_time = ctx.getElapsedTime();
+            pkg.__whatap_step__ = step;
+        },
+        function(obj, args, ret, lctx){
+            var ctx = lctx.context;
+            if(!ctx) { return; }
+            var step = pkg.__whatap_step__;
+            step.elapsed = ctx.getElapsedTime() - step.start_time;
+            ctx.profile.add(step);
+        });
 };
 PackageCtrHelper.getLoadedPackageList = function(filter){
     return loadedPackageList;
@@ -142,9 +116,11 @@ conf.on('hook_method_patterns', function (value) {
             root = root.substr(0, root.indexOf('/bin'));
         }
         var real_path = root + relative_path;
-        PackageCtrHelper.dynamicHook(real_path, method);
+        PackageCtrHelper.addPackage(real_path);
+        if(loadedPackages[real_path]) {
+            PackageCtrHelper.dynamicHook(loadedPackages[real_path], real_path, method);
+        }
     });
-
 });
 
 module.exports = PackageCtrHelper;

package/lib/net/security-master.js

@@ -70,7 +70,7 @@ var SecurityMaster = {
         OidUtil.setType(process.env.name || Configuration.getProperty("whatap.type", "NODE"));
 
         var name_pattern;
-        if(Configuration.getProperty('whatap_micro_enabled') === true){
+        if(Configuration.getProperty('whatap_micro_enabled', false) === true){
             name_pattern = process.env.WHATAP_NAME || "{okind}-{ip2}-{ip3}";
         }else if(require('cluster').isMaster){
             name_pattern=process.env.WHATAP_NAME || "{type}-{ip2}-{ip3}";
@@ -90,8 +90,9 @@ var SecurityMaster = {
             this.OKIND_NAME=null;
         }
 
-        if(Configuration.getProperty('whatap_micro_enabled') === false) {
+        if(Configuration.getProperty('whatap_micro_enabled', false) === false) {
             var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
+            console.log(onodeStr)
             if(onodeStr && onodeStr.length>0){
                 this.ONODE = HashUtil.hashFromString(onodeStr);
                 this.ONODE_NAME=onodeStr;
@@ -107,7 +108,7 @@ var SecurityMaster = {
 
         if (lastOid != this.OID) {
             lastOid = this.OID;
-           require('../logger').print('WHATAP-968', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
+            require('../logger').print('WHATAP-968', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
         }
     },
     setAgentOnameOid :function (oname, myIp) {
@@ -139,7 +140,7 @@ var SecurityMaster = {
             this.OKIND_NAME=null;
         }
 
-        if(Configuration.getProperty('whatap_micro_enabled') === false) {
+        if(Configuration.getProperty('whatap_micro_enabled', false) === false) {
             var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
             if(onodeStr && onodeStr.length>0){
                 this.ONODE = HashUtil.hashFromString(onodeStr);
@@ -149,7 +150,7 @@ var SecurityMaster = {
                 this.ONODE_NAME=null;
             }
         }
-        
+
         if (lastOid != this.OID) {
             lastOid = this.OID;
             require('../logger').print('WHATAP-168', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
@@ -169,14 +170,14 @@ var SecurityMaster = {
             ProcessSeq('whatap').accessAuth(function(pseq){
                 if(!pseq){
                     return;
-                } 
+                }
                 var conf = require('./../conf/configure');
                 conf.setProperty('node.clusterId', pseq);
                 if(cb) cb();
             });
             */
         }
-        
+
     }
 };
 

package/lib/step/method-stepx.js

@@ -29,7 +29,6 @@ MethodStepX.prototype.write = function(dout) {
     dout.writeByte(0);
     dout.writeDecimal(this.hash);
     dout.writeDecimal(this.elapsed);
-    dout.writeByte(this.opt);
     dout.writeDecimal(this.start_cpu);
     dout.writeDecimal(this.start_mem);
     dout.writeIntArray(this.stack);
@@ -39,7 +38,6 @@ MethodStepX.prototype.read = function(din) {
     var ver = din.readByte();
     this.hash = din.readDecNumber();
     this.elapsed = din.readDecNumber();
-    this.opt = din.readByte();
     this.start_cpu = din.readDecNumber();
     this.start_mem = din.readDecNumber();
     this.stack = din.readIntArray();

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.88",
-  "releaseDate": "20240111",
+  "version": "0.4.89",
+  "releaseDate": "20240122",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},

package/logs/whatap-20231212.log

@@ -1,10 +0,0 @@
-20231212 15:46:55[WHATAP-001] <80146> Start initialize WhaTap Agent... Root[/Users/seunghunlee/workspace/nodejs_agent]
-20231212 15:46:55[WHATAP-INIT] <80146> HttpObserver starting!
-20231212 15:46:55[WHATAP-INIT] <80146> HttpObserver starting!
-20231212 15:46:55[WHATAP-INIT] <80146> NetObserver starting!
-20231212 15:46:55[WHTAP-loadObserves] <80146> unable to load mysql module
-20231212 15:46:55[WHATAP-INIT] <80146> FileObserve starting!
-20231212 15:46:55[WHATAP-203] <80146> Config file reloaded
-20231212 15:46:55[WHATAP-101] <80146> Finish initialize configuration... false
-20231212 15:46:55[WHATAP-110] <80146> [pcode=0,SECURE_KEY=]
-20231212 15:46:55[WHATAP-170] <80146> [WhaTap Agent] now waiting for starting......