whatap 0.5.26 → 1.0.0-canary.0

package/lib/core/interceptor.js

@@ -35,7 +35,7 @@ Interceptor.prototype.before = function(obj, funcs, advice, isCallback) {
                 try {
                     advice(this, arguments);
                 } catch (e) {
-                    Logger.printError("WHATAP-500", "Interceptor error", e);
+                    Logger.printError("WHATAP-114", "Interceptor error", e);
                 }
                 return orig.apply(this, arguments);
             }
@@ -60,7 +60,7 @@ Interceptor.prototype.after = function(obj, funcs, advice) {
             try {
                 funcRet = advice(this, arguments, ret);
             } catch(e) {
-                Logger.printError('WHATAP-177', 'Interceptor after error', e);
+                Logger.printError('WHATAP-115', 'Interceptor after error', e);
             }
 
             return funcRet || ret;
@@ -90,7 +90,7 @@ Interceptor.prototype.both = function(obj, funcs, beforeFunc, afterFunc) {
             try {
                 beforeFunc(this, arguments, local_ctx);
             } catch(e) {
-                Logger.printError('WHATAP-178', 'Interceptor both before error', e);
+                Logger.printError('WHATAP-116', 'Interceptor both before error', e);
             }
 
             var ret = orig.apply(this, arguments);
@@ -100,7 +100,7 @@ Interceptor.prototype.both = function(obj, funcs, beforeFunc, afterFunc) {
                     funcRet = afterFunc(this, arguments, ret, local_ctx);
                 }
             } catch(e) {
-                Logger.printError("WHATAP-501", "Interceptor both after error", e);
+                Logger.printError("WHATAP-117", "Interceptor both after error", e);
             }
 
             return funcRet || ret;
@@ -122,7 +122,7 @@ Interceptor.prototype.functionHook = function(args, pos, beforeFunc, afterFunc)
             try {
                 beforeFunc(this, arguments);
             } catch(e) {
-                Logger.printError("WHATAP-179", 'Interceptor functionhook before error', e);
+                Logger.printError("WHATAP-118", 'Interceptor functionhook before error', e);
             }
         }
 
@@ -132,7 +132,7 @@ Interceptor.prototype.functionHook = function(args, pos, beforeFunc, afterFunc)
             try {
                 afterFunc(this, arguments, result);
             } catch(e) {
-                Logger.printError("WHATAP-180", 'Interceptor functionhook after error', e);
+                Logger.printError("WHATAP-119", 'Interceptor functionhook after error', e);
             }
         }
         return result;

package/lib/core/shimmer.js

@@ -1,10 +1,10 @@
 'use strict'
 
-function isFunction(funktion) {
+function isFunction (funktion) {
     return typeof funktion === 'function'
 }
 
-function defineProperty(obj, name, value) {
+function defineProperty (obj, name, value) {
     var enumerable = !!obj[name] && obj.propertyIsEnumerable(name)
     Object.defineProperty(obj, name, {
         configurable: true,
@@ -14,28 +14,10 @@ function defineProperty(obj, name, value) {
     })
 }
 
-var shimmer = function() {}
-
-/**
- * Wrap a single method or multiple methods with the provided wrapper function
- *
- * @param {Object} nodule - The object containing methods to wrap
- * @param {string|Array<string>} name - Method name or array of method names to wrap
- * @param {Function} wrapper - The wrapper function
- * @returns {Function|Array<Function>} - The wrapped function(s)
- */
-var wrap = function(nodule, name, wrapper) {
-    // If name is an array, recursively call wrap for each name in the array
-    if (Array.isArray(name)) {
-        var wrapped = [];
-        name.forEach(function(methodName) {
-            var result = wrap(nodule, methodName, wrapper);
-            if (result) wrapped.push(result);
-        });
-        return wrapped.length > 0 ? wrapped : undefined;
-    }
+var shimmer = function () {
+}
 
-    // Standard single method wrap logic
+var wrap = function (nodule, name, wrapper) {
     if (!nodule || !nodule[name]) {
         return;
     }
@@ -45,95 +27,67 @@ var wrap = function(nodule, name, wrapper) {
     }
 
     if (!isFunction(nodule[name]) || !isFunction(wrapper)) {
-        return;
+        return
     }
 
-    var original = nodule[name];
-    var wrapped = wrapper(original, name);
+    var original = nodule[name]
+    var wrapped = wrapper(original, name)
 
-    defineProperty(wrapped, '__original', original);
-    defineProperty(wrapped, '__unwrap', function() {
-        if (nodule[name] === wrapped) defineProperty(nodule, name, original);
-    });
-    defineProperty(wrapped, '__wrapped', true);
+    defineProperty(wrapped, '__original', original)
+    defineProperty(wrapped, '__unwrap', function () {
+        if (nodule[name] === wrapped) defineProperty(nodule, name, original)
+    })
+    defineProperty(wrapped, '__wrapped', true)
 
-    defineProperty(nodule, name, wrapped);
-    return wrapped;
+    defineProperty(nodule, name, wrapped)
+    return wrapped
 }
 
-/**
- * Unwrap a single method or multiple methods
- *
- * @param {Object} nodule - The object containing wrapped methods
- * @param {string|Array<string>} name - Method name or array of method names to unwrap
- */
-function unwrap(nodule, name) {
-    // If name is an array, recursively call unwrap for each name in the array
-    if (Array.isArray(name)) {
-        name.forEach(function(methodName) {
-            unwrap(nodule, methodName);
-        });
-        return;
-    }
-
+function unwrap (nodule, name) {
     if (!nodule || !nodule[name]) {
-        return;
+        return
     }
 
     if (!nodule[name].__unwrap) {
-        // Method is not wrapped
     } else {
-        return nodule[name].__unwrap();
+        return nodule[name].__unwrap()
     }
 }
 
-/**
- * Wrap multiple methods of multiple modules with the same wrapper
- *
- * @param {Object|Array<Object>} nodules - Module or array of modules with methods to wrap
- * @param {Array<string>} names - Array of method names to wrap
- * @param {Function} wrapper - The wrapper function to apply
- */
-function massWrap(nodules, names, wrapper) {
+function massWrap (nodules, names, wrapper) {
     if (!nodules) {
-        return;
+        return
     } else if (!Array.isArray(nodules)) {
-        nodules = [nodules];
+        nodules = [nodules]
     }
 
     if (!(names && Array.isArray(names))) {
-        return;
+        return
     }
 
-    nodules.forEach(function(nodule) {
-        names.forEach(function(name) {
-            wrap(nodule, name, wrapper);
-        });
-    });
+    nodules.forEach(function (nodule) {
+        names.forEach(function (name) {
+            wrap(nodule, name, wrapper)
+        })
+    })
 }
 
-/**
- * Unwrap multiple methods of multiple modules
- *
- * @param {Object|Array<Object>} nodules - Module or array of modules with wrapped methods
- * @param {Array<string>} names - Array of method names to unwrap
- */
-function massUnwrap(nodules, names) {
+function massUnwrap (nodules, names) {
     if (!nodules) {
-        return;
+        return
     } else if (!Array.isArray(nodules)) {
-        nodules = [nodules];
+        nodules = [nodules]
     }
 
     if (!(names && Array.isArray(names))) {
-        return;
+        return
     }
 
-    nodules.forEach(function(nodule) {
-        names.forEach(function(name) {
-            unwrap(nodule, name);
-        });
-    });
+    nodules.forEach(function (nodule) {
+        names.forEach(function (name) {
+            unwrap(nodule, name)
+        })
+    })
 }
 
 shimmer.wrap = wrap;

package/lib/counter/counter-manager.js

@@ -4,70 +4,32 @@
  * can be found in the LICENSE file.
  */
 
-var CounterPack = require('../pack/counter-pack'),
-    Service = require('./task/service'),
-    AgentInfo = require('./task/agentinfo'),
-    ActiveTransaction = require('./task/activetransaction'),
-    ProcCpu = require('./task/proc-cpu'),
-    ResSysCpu = require('./task/res-sys-cpu'),
-    HeapMem = require('./task/heapmem'),
-    SystemPerf = require('./task/systemperf'),
-    RealtimeUser = require('./task/realtimeuser'),
-    Socketio = require('./task/socketio'),
-    GCStat = require('./task/gcstat'),
-    Sql = require('./task/sql'),
-    HttpC = require('./task/httpc'),
-    MeteringInfo = require('./task/metering-info'),
-    GCAction = require('./task/gc-action'),
-    StatError = require('../stat/stat-error'),
-    TagCounterPack = require('../pack/tagcount-pack'),
-    TraceContextManager = require('../trace/trace-context-manager'),
+var TraceContextManager = require('../trace/trace-context-manager'),
     secuMaster = require('../net/security-master'),
-    DataPackSender = require('../data/datapack-sender'),
     conf = require('../conf/configure'),
     DateUtil = require('./../util/dateutil'),
-    KubeClient       = require('../kube/kube-client'),
-    KubeUtil            = require('../util/kube-util'),
-    Logger              = require('../logger');
+    Logger              = require('../logger'),
+    GCAction = require('../system/gc-action');
 
 function CounterManager(agent) {
     this.agent = agent;
     this.time = Date.now();
-
+    
     this.intervalIndex = undefined;
 };
 CounterManager.plugin={}
 CounterManager.prototype.run = function () {
-    var self = this;
-
+    let self = this;
     process.nextTick(function () {
         var tasks = [];
-        tasks.push(new Service());
-        tasks.push(new AgentInfo());
-        tasks.push(new ActiveTransaction());
-        tasks.push(new RealtimeUser());
-        tasks.push(new HeapMem());
-        tasks.push(new ProcCpu());
-        tasks.push(new ResSysCpu());
-        tasks.push(new SystemPerf());
-        tasks.push(new Socketio());
-        tasks.push(new GCStat());
-        tasks.push(new Sql());
-        tasks.push(new HttpC());
         tasks.push(new GCAction());
 
-        // metering
-        tasks.push(new MeteringInfo());
         self.intervalIndex = setInterval(function(){
             self.process(tasks);
         },5000);
+
         self.process(tasks);
     });
-
-    if(conf.whatap_micro_enabled || process.env.WHATAP_MICRO_ENABLED === "true"){
-        KubeUtil.loadContainerId();
-        if (conf.enabled_master_agent_call) KubeClient.run();
-    }
 };
 CounterManager.prototype.stop = function(){
     if(this.intervalIndex){
@@ -90,49 +52,16 @@ CounterManager.prototype.process = function (tasks) {
         return;
     }
 
-    var enumer = TraceContextManager.getContextEnumeration();
-    while (enumer.hasMoreElements()) {
-        var ctx = enumer.nextElement();
-        if (ctx.getElapsedTime() > conf.profile_max_time) {
-            //TraceContextManager.end(ctx._id);
-            if(conf.getProperty("ignore_http_lost_connection", false) === true){
-                Logger.print("WHATAP-072", "Lost Connection was ignored, " + ctx._id, false);
-                TraceContextManager.end(ctx._id);
-                ctx = null;
-            }else{
-                // var obj = TraceContextManager.resume(ctx._id);
-                TraceContextManager.addStep("Lost Connection","", ctx);
-                //ctx.status = 5;
-                //ctx.error = StatError.addError(500, "Lost Connection", ctx.service_hash);
-                TraceContextManager.endTrace(ctx);
-            }
-        }
-    }
-
     if (conf.counter_enabled) {
-        var pack = new CounterPack();
-        pack.pcode = secuMaster.PCODE;
-        pack.oid = secuMaster.OID;
-        pack.time = Math.floor(DateUtil.currentTime() / 5000) * 5000;
-        pack.duration = Math.floor(interval / 1000);
         for (var i = 0; i < len; i++) {
             task = tasks[i];
             try{
-                task.process(pack);
+                task.process();
             } catch (e) {
-                Logger.printError('WHATAP-070', 'Counter Manager process ', e, true);
+                Logger.printError('WHATAP-603', 'Counter Manager process ', e, true);
             }
         }
-        pack.starttime = this.agent.starttime;
 
-        try {
-            if (CounterManager.plugin["extra"]) {
-                CounterManager.plugin["extra"](pack);
-            }
-        } catch (e) {
-            Logger.printError('WHATAP-071', 'Counter Manager Plugin ', e, true);
-        }
-        DataPackSender.sendCounterPack(pack);
     }
 };
 

package/lib/counter/task/activetransaction.js

@@ -4,91 +4,40 @@
  * can be found in the LICENSE file.
  */
 
-var CounterTask = require('./counter-task'),
-    StatSql = require('../../stat/stat-sql'),
-    conf = require('../../conf/configure'),
+var conf = require('../../conf/configure'),
     TraceContextManager = require('../../trace/trace-context-manager'),
-    MeterActiveX = require('../meter/meter-activex'),
-    ActiveStackPack = require('../../pack/activestack-pack'),
-    ActiveStackStep = require('../../step/activestack-step'),
-    DataPackSender = require('../../data/datapack-sender'),
-    DataTextAgent = require('../../data/datatext-agent'),
-    MeterUsers = require('../meter/meter-users'),
     KeyGen = require('../../util/keygen'),
     HashUtil = require('../../util/hashutil'),
-    ResourceProfile = require('../../util/resourceprofile'),
     Logger          = require('../../logger'),
     Long = require('long');
 
-function ActiveTransaction() {
-    CounterTask.call(this);
-    this.last_stack_sec = 0;
-}
-
-ActiveTransaction.prototype = new CounterTask();
-ActiveTransaction.prototype.constructor = ActiveTransaction;
-ActiveTransaction.prototype.process = function (p) {
-
-    p.active_tx_slice = [0, 0, 0];
-    p.active_stat = new Array(5).fill(0);
-
-    var activeX = null;
-    if (conf.actx_meter_enabled) {
-        activeX = MeterActiveX;
-        activeX.reinit();
-    }
-
+function ActiveTransaction() {}
+ActiveTransaction.prototype.getActiveStats = function () {
+    var stats = new Array(5).fill(0);
     var en = TraceContextManager.getContextEnumeration();
     try {
         while (en.hasMoreElements()) {
             var ctx = en.nextElement();
-            if (ctx == null) {
-                return false;
-            }
-            var elapsed = ctx.getElapsedTime();
-            if (elapsed < conf.trace_active_transaction_yellow_time) {
-                p.active_tx_slice[0]++;
-            } else if (elapsed < conf.trace_active_transaction_red_time) {
-                p.active_tx_slice[1]++;
-            } else {
-                p.active_tx_slice[2]++;
-                if (elapsed >= conf.trace_active_transaction_hang_time) {
-                    p.act_svc_hang++;
-                }
-            }
-            p.active_tx_count++;
-            if (activeX) {
-                activeX.addTx(ctx.mcaller_pcode, ctx.mcaller_okind, ctx.mcaller_oid);
-                var httpc = ctx.active_httpc_hash;
-                if (httpc != 0) {
-                    activeX.addHttpc(httpc);
-                } else {
-                    var dbc = ctx.active_dbc;
-                    if (dbc != 0) {
-                        activeX.addSql(dbc);
-                    }
-                }
+            if (!ctx) {
+                break;
             }
-
-
-            if (ctx.active_sqlhash != 0) {
-                p.active_stat[1]++; // sql
-            } else if (ctx.active_httpc_hash != 0) {
-                p.active_stat[2]++; // httpc
+            if (ctx.active_sqlhash) {
+                stats[1]++;
+            } else if (ctx.active_httpc_hash) {
+                stats[2]++; // httpc
             } else if (ctx.db_opening) {
-                p.active_stat[3]++; // dbc
+                stats[3]++; // dbc
             } else if (ctx.socket_connecting) {
-                p.active_stat[4]++; // socket
+                stats[4]++; // socket
             } else {
-                p.active_stat[0]++; // method
+                stats[0]++; // method
             }
-
-            MeterUsers.addActive(ctx.userid);
         }
+        return stats;
     } catch (e) {
-        Logger.printError("WHATAP-071", 'Active Transaction(process)', e)
+        Logger.printError("WHATAP-602", 'Active Transaction(process)', e)
+        return stats;
     }
-
 };
 
-module.exports = ActiveTransaction;
+module.exports = new ActiveTransaction();

package/lib/io/data-inputx.js

@@ -4,17 +4,7 @@
  * can be found in the LICENSE file.
  */
 
-var constants       = require('../env/constants'),
-    ValueEnum       = require('../value/valueenum'),
-    CounterPack     = require('../pack/counter-pack'),
-    ActiveStackPack = require('../pack/activestack-pack'),
-    TextPack        = require('../pack/text-pack').TextPack,
-    StatHttpcPack   = require('../pack/stathttpc-pack').StatHttpcPack,
-    StatErrorPack   = require('../pack/staterror-pack').StatErrorPack,
-    ParamPack       = require('../pack/param-pack').ParamPack,
-    ErrorSnapPack1  = require('../pack/errorsnap-pack').ErrorSnapPack1,
-    EventPack       = require('../pack/event-pack').Instance,
-    HitMapPack1     = require('../pack/hitmap-pack1'),
+var ValueEnum       = require('../value/valueenum'),
     PackEnum        = require('../pack/packenum'),
     Long            = require('long');
 
@@ -131,7 +121,7 @@ DataInputX.prototype.readByte = function() {
 DataInputX.prototype.readIntBytes = function(max) {
     var len = this.readInt32BE();
     if(len < 0 || len > max){
-        Logger.printError('WHATAP-210', "read byte is overflowed max:" + max + " len:" + len, new Error());
+        Logger.printError('WHATAP-501', "read byte is overflowed max:" + max + " len:" + len, new Error());
     }
     return this.read(len);
 };
@@ -238,7 +228,7 @@ DataInputX.prototype.readPack = function () {
         }
         return null;
     } catch (e) {
-        require('../logger').printError('WHATAP-211', "DataInputX (readPack)", e , false);
+        require('../logger').printError('WHATAP-502', "DataInputX (readPack)", e , false);
         return null;
     }
 };