whatap 0.4.79 → 0.4.80

package/lib/core/interceptor.js

@@ -1,143 +1,143 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-var LocalContext = require('../trace/local-context'),
-    TraceContextManager = require('../trace/trace-context-manager'),
-    Logger = require('../logger');
-
-var Interceptor = function(agent){
-    this.agent = agent;
-};
-
-Interceptor.prototype.init = function() {
-
-};
-
-Interceptor.prototype.before = function(obj, funcs, advice, isCallback) {
-    if(obj == null) return false;
-
-    if(!Array.isArray(funcs)) funcs = [funcs];
-
-    funcs.forEach(function(func) {
-        var orig = obj[func];
-        if(!orig) return;
-
-        obj[func] = function proxy() {
-            if(isCallback) {
-                var selfFunc = this;
-                advice(this, arguments, function() {
-                    return orig.apply(selfFunc, arguments);
-                });
-            } else {
-                try {
-                    advice(this, arguments);
-                } catch (e) {
-                    Logger.printError("WHATAP-500", "Interceptor error", e);
-                }
-                return orig.apply(this, arguments);
-            }
-        };
-    });
-};
-
-Interceptor.prototype.after = function(obj, funcs, advice) {
-    if(!obj) return false;
-
-    if(!Array.isArray(funcs)) funcs = [funcs];
-
-    funcs.forEach(function(func) {
-        var orig = obj[func];
-        if(!orig) return;
-
-        obj[func] = function() {
-
-            var ret = orig.apply(this, arguments);
-
-            var funcRet;
-            try {
-                funcRet = advice(this, arguments, ret);
-            } catch(e) {
-                Logger.printError('WHATAP-177', 'Interceptor after error', e);
-            }
-
-            return funcRet || ret;
-        };
-
-        obj[func].__whatapAOPInfo__ = {
-            obj: obj,
-            func: func,
-            orig: orig
-        };
-    });
-};
-
-Interceptor.prototype.both = function(obj, funcs, beforeFunc, afterFunc) {
-    if(!obj) return false;
-
-    if(!Array.isArray(funcs)) funcs = [funcs];
-
-    funcs.forEach(function(func) {
-        var orig = obj[func];
-        if(!orig) return;
-
-        obj[func] = function() {
-            var ctx = TraceContextManager.getCurrentContext();
-            var local_ctx = new LocalContext(ctx, null, null);
-
-            try {
-                beforeFunc(this, arguments, local_ctx);
-            } catch(e) {
-                Logger.printError('WHATAP-178', 'Interceptor both before error', e);
-            }
-
-            var ret = orig.apply(this, arguments);
-            var funcRet;
-            try {
-                if(afterFunc){
-                    funcRet = afterFunc(this, arguments, ret, local_ctx);
-                }
-            } catch(e) {
-                Logger.printError("WHATAP-501", "Interceptor both after error", e);
-            }
-
-            return funcRet || ret;
-        };
-    });
-};
-
-Interceptor.prototype.functionHook = function(args, pos, beforeFunc, afterFunc) {
-    if(!args) return false;
-
-    if(args.length <= pos) return false;
-    if(pos === -1) pos = args.length - 1;
-
-    var orig = (typeof args[pos] === 'function') ? args[pos] : undefined;
-    if(!orig) return false;
-
-    args[pos] = function wrapper() {
-        if(beforeFunc) {
-            try {
-                beforeFunc(this, arguments);
-            } catch(e) {
-                Logger.printError("WHATAP-179", 'Interceptor functionhook before error', e);
-            }
-        }
-
-        var result = orig.apply(this, arguments);
-
-        if(afterFunc) {
-            try {
-                afterFunc(this, arguments, result);
-            } catch(e) {
-                Logger.printError("WHATAP-180", 'Interceptor functionhook after error', e);
-            }
-        }
-        return result;
-    };
-    return true;
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+var LocalContext = require('../trace/local-context'),
+    TraceContextManager = require('../trace/trace-context-manager'),
+    Logger = require('../logger');
+
+var Interceptor = function(agent){
+    this.agent = agent;
+};
+
+Interceptor.prototype.init = function() {
+
+};
+
+Interceptor.prototype.before = function(obj, funcs, advice, isCallback) {
+    if(obj == null) return false;
+
+    if(!Array.isArray(funcs)) funcs = [funcs];
+
+    funcs.forEach(function(func) {
+        var orig = obj[func];
+        if(!orig) return;
+
+        obj[func] = function proxy() {
+            if(isCallback) {
+                var selfFunc = this;
+                advice(this, arguments, function() {
+                    return orig.apply(selfFunc, arguments);
+                });
+            } else {
+                try {
+                    advice(this, arguments);
+                } catch (e) {
+                    Logger.printError("WHATAP-500", "Interceptor error", e);
+                }
+                return orig.apply(this, arguments);
+            }
+        };
+    });
+};
+
+Interceptor.prototype.after = function(obj, funcs, advice) {
+    if(!obj) return false;
+
+    if(!Array.isArray(funcs)) funcs = [funcs];
+
+    funcs.forEach(function(func) {
+        var orig = obj[func];
+        if(!orig) return;
+
+        obj[func] = function() {
+
+            var ret = orig.apply(this, arguments);
+
+            var funcRet;
+            try {
+                funcRet = advice(this, arguments, ret);
+            } catch(e) {
+                Logger.printError('WHATAP-177', 'Interceptor after error', e);
+            }
+
+            return funcRet || ret;
+        };
+
+        obj[func].__whatapAOPInfo__ = {
+            obj: obj,
+            func: func,
+            orig: orig
+        };
+    });
+};
+
+Interceptor.prototype.both = function(obj, funcs, beforeFunc, afterFunc) {
+    if(!obj) return false;
+
+    if(!Array.isArray(funcs)) funcs = [funcs];
+
+    funcs.forEach(function(func) {
+        var orig = obj[func];
+        if(!orig) return;
+
+        obj[func] = function() {
+            var ctx = TraceContextManager.getCurrentContext();
+            var local_ctx = new LocalContext(ctx, null, null);
+
+            try {
+                beforeFunc(this, arguments, local_ctx);
+            } catch(e) {
+                Logger.printError('WHATAP-178', 'Interceptor both before error', e);
+            }
+
+            var ret = orig.apply(this, arguments);
+            var funcRet;
+            try {
+                if(afterFunc){
+                    funcRet = afterFunc(this, arguments, ret, local_ctx);
+                }
+            } catch(e) {
+                Logger.printError("WHATAP-501", "Interceptor both after error", e);
+            }
+
+            return funcRet || ret;
+        };
+    });
+};
+
+Interceptor.prototype.functionHook = function(args, pos, beforeFunc, afterFunc) {
+    if(!args) return false;
+
+    if(args.length <= pos) return false;
+    if(pos === -1) pos = args.length - 1;
+
+    var orig = (typeof args[pos] === 'function') ? args[pos] : undefined;
+    if(!orig) return false;
+
+    args[pos] = function wrapper() {
+        if(beforeFunc) {
+            try {
+                beforeFunc(this, arguments);
+            } catch(e) {
+                Logger.printError("WHATAP-179", 'Interceptor functionhook before error', e);
+            }
+        }
+
+        var result = orig.apply(this, arguments);
+
+        if(afterFunc) {
+            try {
+                afterFunc(this, arguments, result);
+            } catch(e) {
+                Logger.printError("WHATAP-180", 'Interceptor functionhook after error', e);
+            }
+        }
+        return result;
+    };
+    return true;
+};
+
 exports.Interceptor = Interceptor;

package/lib/core/request-agent.js

@@ -1,27 +1,27 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-
-const http = require('http');
-var keepAliveAgent = new http.Agent({ keepAlive: true });
-
-
-var baseConfig = {
-  keepAlive: true,
-  keepAliveTimeoutMsecs: 500,
-  maxSockets: 1 // requests are serialized
-}
-
-baseConfig.agent = keepAliveAgent;
-
-
-http.request(baseConfig, onResponseCallback);
-
-
-
-var RequestAgent = function(){
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+
+const http = require('http');
+var keepAliveAgent = new http.Agent({ keepAlive: true });
+
+
+var baseConfig = {
+  keepAlive: true,
+  keepAliveTimeoutMsecs: 500,
+  maxSockets: 1 // requests are serialized
+}
+
+baseConfig.agent = keepAliveAgent;
+
+
+http.request(baseConfig, onResponseCallback);
+
+
+
+var RequestAgent = function(){
+
 }

package/lib/counter/counter-manager.js

@@ -1,128 +1,128 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * 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'),
-    StatError = require('../stat/stat-error'),
-    TagCounterPack = require('../pack/tagcount-pack'),
-    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'),
-    Long = require('long');
-
-function CounterManager(agent) {
-    this.agent = agent;
-    this.time = Date.now();
-    
-    this.intervalIndex = undefined;
-};
-CounterManager.plugin={}
-CounterManager.prototype.run = function () {
-    var 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());
-        self.intervalIndex = setInterval(function(){
-            self.process(tasks);    
-        },5000);
-        self.process(tasks);
-    });
-
-    if(conf.whatap_micro_enabled){
-        KubeUtil.loadContainerId();
-        if (conf.enabled_master_agent_call) KubeClient.run();
-    }
-};
-CounterManager.prototype.stop = function(){
-    if(this.intervalIndex){
-        clearInterval(this.intervalIndex);
-        this.intervalIndex = undefined;
-    }
-}
-
-CounterManager.prototype.process = function (tasks) {
-    var interval = conf.counter_interval || 5000,
-        len = tasks.length, self = this, task;
-
-    var now = parseInt(Date.now() / 1000),
-        interval_sec = interval / 1000;
-
-    if (now != parseInt(now / interval_sec) * interval_sec) {
-        setTimeout(function () {
-            self.process(tasks);
-        }, 1000, 'whatap');
-        return;
-    }
-
-    var enumer = TraceContextManager.getContextEnumeration();
-    while (enumer.hasMoreElements()) {
-        var ctx = enumer.nextElement();
-        if (ctx.getElapsedTime() > conf.profile_max_time) {
-            //TraceContextManager.end(ctx._id);
-            var obj = TraceContextManager.resume(ctx._id);
-            TraceContextManager.addStep("Lost Connection","");
-            //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);
-            } catch (e) {
-                Logger.printError('WHATAP-070', '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);
-    }
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * 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'),
+    StatError = require('../stat/stat-error'),
+    TagCounterPack = require('../pack/tagcount-pack'),
+    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'),
+    Long = require('long');
+
+function CounterManager(agent) {
+    this.agent = agent;
+    this.time = Date.now();
+    
+    this.intervalIndex = undefined;
+};
+CounterManager.plugin={}
+CounterManager.prototype.run = function () {
+    var 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());
+        self.intervalIndex = setInterval(function(){
+            self.process(tasks);    
+        },5000);
+        self.process(tasks);
+    });
+
+    if(conf.whatap_micro_enabled){
+        KubeUtil.loadContainerId();
+        if (conf.enabled_master_agent_call) KubeClient.run();
+    }
+};
+CounterManager.prototype.stop = function(){
+    if(this.intervalIndex){
+        clearInterval(this.intervalIndex);
+        this.intervalIndex = undefined;
+    }
+}
+
+CounterManager.prototype.process = function (tasks) {
+    var interval = conf.counter_interval || 5000,
+        len = tasks.length, self = this, task;
+
+    var now = parseInt(Date.now() / 1000),
+        interval_sec = interval / 1000;
+
+    if (now != parseInt(now / interval_sec) * interval_sec) {
+        setTimeout(function () {
+            self.process(tasks);
+        }, 1000, 'whatap');
+        return;
+    }
+
+    var enumer = TraceContextManager.getContextEnumeration();
+    while (enumer.hasMoreElements()) {
+        var ctx = enumer.nextElement();
+        if (ctx.getElapsedTime() > conf.profile_max_time) {
+            //TraceContextManager.end(ctx._id);
+            var obj = TraceContextManager.resume(ctx._id);
+            TraceContextManager.addStep("Lost Connection","");
+            //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);
+            } catch (e) {
+                Logger.printError('WHATAP-070', '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);
+    }
+};
+
 module.exports = CounterManager;