whatap 0.4.79 → 0.4.80

package/lib/observers/promise-observer.js

@@ -1,31 +1,31 @@
-/**
- * Created by yunhoi on 12/06/2017.
- */
-
-var TraceContextManager = require('../trace/trace-context-manager'),
-Logger              = require('../logger');
-
-var PromiseObserver = function (agent) {
-    this.agent = agent;
-    this.packages = ['promise', 'bluebird'];
-};
-
-PromiseObserver.prototype.inject = function (mod, moduleName) {
-
-    var self = this;
-    var aop = self.agent.aop;
-
-    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();
-            aop.functionHook(args, -1, function (obj, args) {
-                TraceContextManager.resume(ctx);
-            })
-        });
-
-};
-
-exports.PromiseObserver = PromiseObserver;
+/**
+ * Created by yunhoi on 12/06/2017.
+ */
+
+var TraceContextManager = require('../trace/trace-context-manager'),
+Logger              = require('../logger');
+
+var PromiseObserver = function (agent) {
+    this.agent = agent;
+    this.packages = ['promise', 'bluebird'];
+};
+
+PromiseObserver.prototype.inject = function (mod, moduleName) {
+
+    var self = this;
+    var aop = self.agent.aop;
+
+    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();
+            aop.functionHook(args, -1, function (obj, args) {
+                TraceContextManager.resume(ctx);
+            })
+        });
+
+};
+
+exports.PromiseObserver = PromiseObserver;

package/lib/observers/redis-observer.js

@@ -1,110 +1,157 @@
-
-var TraceContextManager = require('../trace/trace-context-manager'),
-    DataTextAgent       = require('../data/datatext-agent'),
-    SqlStepX            = require('../step/sql-stepx'),
-    DBCStep             = require('../step/dbc-step'),
-    TextTypes           = require('../lang/text-types'),
-    HashUtil            = require('../util/hashutil'),
-    Long                = require('long'),
-    Logger              = require('../logger');
-
-
-var RedisObserver = function (agent) {
-    this.agent = agent;
-    this.aop = agent.aop;
-    this.packages = ['redis'];
-};
-
-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',
-        function (obj, args, lctx) {
-            var ctx = TraceContextManager.getCurrentContext();
-            if(ctx == null) { return; }
-
-            var dbc_step = new DBCStep();
-            dbc_step.start_time = ctx.getElapsedTime();
-
-            lctx.context = ctx;
-            lctx.step = dbc_step;
-        },
-        function (obj, args, ret, lctx) {
-            var dbc_step = lctx.step,
-                ctx = lctx.context;
-
-            if(ctx == null) { return; }
-
-            var client = ret;
-            var method = client.internal_send_command
-                ? "internal_send_command"
-                : "send_command";
-
-            var address = 'redis://'
-            address += (client.address || (client.host + ':' + client.port)) || '';
-            dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
-            dbc_step.hash = HashUtil.hashFromString(address);
-            DataTextAgent.DBC.add(dbc_step.hash, address);
-
-            ctx.profile.push(dbc_step);
-
-            self.aop.before(client, method, function (obj, args) {
-                var command,params;
-                try{
-                    if (typeof(args[0]) === 'string') {
-                        command = args[0];
-                        params = args[1];
-                    } else {
-                        command = args[0].command;
-                        params = args[0].args;
-                    }
-                } catch(e) {
-                    command = '';
-                    params = '';
-                }
-
-                var sql = command + ' ' + params;
-                var sql_step = new SqlStepX();
-                sql_step.start_time = ctx.getElapsedTime();
-                sql_step.hash = HashUtil.hashFromString(sql);
-                sql_step.dbc = dbc_step.hash;
-                //sql_step.crud = 'S'.charCodeAt(0);
-                ctx.profile.push(sql_step);
-
-                DataTextAgent.SQL.add(sql_step.hash, sql);
-
-                ctx.footprint('Redis Command Start');
-                var hasCallback = self.aop.functionHook(args[1], -1, function (obj, args) {
-                    
-                    TraceContextManager.resume(ctx._id);
-                    if(args[0]) {
-                        //error
-                        sql_step.error = StatError.addError(
-                            'redis',
-                            (args[0].message || 'redis error'),
-                            ctx.service_hash,
-                            TextTypes.SQL,
-                            sql_step.hash);
-                        if(ctx.error.isZero()) {
-                            ctx.error = sql_step.error;
-                        }
-                    }
-                    sql_step.elapsed = sql_step.start_time - ctx.getElapsedTime();
-
-                    ctx.footprint('Redis Command Done');
-                
-                });
-
-                // if(hasCallback === false) {
-                //    ctx.footprint('Redis Command Done');
-                // }
-            });
-        });
-
-};
-
+var TraceContextManager = require('../trace/trace-context-manager'),
+    DataTextAgent = require('../data/datatext-agent'),
+    SqlStepX = require('../step/sql-stepx'),
+    DBCStep = require('../step/dbc-step'),
+    TextTypes = require('../lang/text-types'),
+    HashUtil = require('../util/hashutil'),
+    Long = require('long'),
+    Logger = require('../logger');
+
+
+var RedisObserver = function (agent) {
+    this.agent = agent;
+    this.aop = agent.aop;
+    this.packages = ['redis'];
+};
+
+RedisObserver.prototype.inject = function (mod, modName) {
+
+    if (mod.__whatap_observe__) {
+        return;
+    }
+    mod.__whatap_observe__ = true;
+    Logger.initPrint("RedisObserver");
+    var self = this;
+
+    var dbc_hash= 0;
+    var dbc;
+    var dbc_time;
+    self.aop.both(mod, 'createClient',
+        function (obj, args, lctx) {
+            if(dbc_hash === 0){
+                if(args.length > 0) {
+                    var info = (args[0] || {});
+                    dbc = 'redis://';
+                    dbc += info.host || '';
+                    dbc += ':';
+                    dbc += info.port || '';
+                    dbc_hash = HashUtil.hashFromString(dbc);
+                }
+            }
+        },
+        function (obj, args, ret, lctx) {
+            var selectCommand = new Set(['get', 'hGet', 'hmGet']);
+            var insertCommand = new Set(['set', 'hSet', 'hset', 'hmSet', 'hmset', 'zAdd', 'zadd', 'lSet', 'lset']);
+            var updateCommand = new Set(['set', 'lSet', 'lset', 'hSet', 'hset', 'zAdd', 'zadd']);
+            var deleteCommand = new Set(['del', 'lRem', 'sRem', 'srem', 'hDel',  'hdel', 'zRem', 'zrem']);
+            var commands = new Set([...selectCommand, ...insertCommand, ...updateCommand, ...deleteCommand]);
+            commands.forEach(function (command) {
+                self.aop.after(ret, command,
+                    function (obj, args, ret, lctx) {
+                        var ctx = TraceContextManager.getCurrentContext();
+                        if(ctx == null) {return;}
+
+                        var dbc_step = new DBCStep();
+                        dbc_step.hash = dbc_hash;
+                        dbc_step.start_time = dbc_time;
+                        dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
+                        ctx.profile.push(dbc_step);
+
+                        var sql_step;
+                        try {
+                            sql_step = new SqlStepX();
+                            const key = args[0];
+                            const values = [];
+                            for(let i = 1; i < args.length; i++)
+                                values.push(args[i]);
+
+                            var sql = 'Redis ' + command + ': ' + JSON.stringify([key]);
+                            if(values.length > 0)
+                                sql += ' ' + JSON.stringify(values);
+                            sql_step.hash = HashUtil.hashFromString(sql);
+                            sql_step.start_time = ctx.getElapsedTime();
+                            //sql_step.crud = 'I'.charCodeAt(0);
+                            // DataTextAgent.SQL.add(sql_step.hash, sql);
+                            ctx.profile.push(sql_step);
+                        } catch(e) {
+                            Logger.printError("WHATAP-605", "Redis CRUD error", e, false);
+                            sql_step = null;
+                        }
+                    })
+            })
+
+            var dbc_step = lctx.step,
+                ctx = lctx.context;
+
+            if (ctx == null) {
+                return;
+            }
+
+            var client = ret;
+            var method = client.internal_send_command
+                ? "internal_send_command"
+                : "send_command";
+
+            var address = 'redis://'
+            address += (client.address || (client.host + ':' + client.port)) || '';
+            dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
+            dbc_step.hash = HashUtil.hashFromString(address);
+            DataTextAgent.DBC.add(dbc_step.hash, address);
+
+            ctx.profile.push(dbc_step);
+
+            self.aop.before(client, method, function (obj, args) {
+                var command, params;
+                try {
+                    if (typeof (args[0]) === 'string') {
+                        command = args[0];
+                        params = args[1];
+                    } else {
+                        command = args[0].command;
+                        params = args[0].args;
+                    }
+                } catch (e) {
+                    command = '';
+                    params = '';
+                }
+
+                var sql = command + ' ' + params;
+                var sql_step = new SqlStepX();
+                sql_step.start_time = ctx.getElapsedTime();
+                sql_step.hash = HashUtil.hashFromString(sql);
+                sql_step.dbc = dbc_step.hash;
+                //sql_step.crud = 'S'.charCodeAt(0);
+                ctx.profile.push(sql_step);
+
+                DataTextAgent.SQL.add(sql_step.hash, sql);
+
+                ctx.footprint('Redis Command Start');
+                var hasCallback = self.aop.functionHook(args[1], -1, function (obj, args) {
+
+                    TraceContextManager.resume(ctx._id);
+                    if (args[0]) {
+                        //error
+                        sql_step.error = StatError.addError(
+                            'redis',
+                            (args[0].message || 'redis error'),
+                            ctx.service_hash,
+                            TextTypes.SQL,
+                            sql_step.hash);
+                        if (ctx.error.isZero()) {
+                            ctx.error = sql_step.error;
+                        }
+                    }
+                    sql_step.elapsed = sql_step.start_time - ctx.getElapsedTime();
+
+                    ctx.footprint('Redis Command Done');
+
+                });
+
+                // if(hasCallback === false) {
+                //    ctx.footprint('Redis Command Done');
+                // }
+            });
+        });
+};
+
 exports.RedisObserver = RedisObserver;

package/lib/observers/schedule-observer.js

@@ -1,67 +1,67 @@
-/**
- * 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 TraceContextManager = require('../trace/trace-context-manager'),
- conf                = require('../conf/configure'),
- DataTextAgent       = require('../data/datatext-agent'),
- DataProfileAgent    = require('../data/dataprofile-agent'),
- EventLevel          = require('../data/event-level'),
- TxRecord          = require('../service/tx-record'),
- ProfilePack         = require('../pack/profile-pack'),
- SecurityMaster      = require('../net/security-master'),
- HashUtil            = require('../util/hashutil'),
- DateUtil            = require('../util/dateutil'),
- ResourceProfile     = require('../util/resourceprofile'),
- MessageStep         = require('../step/message-step'),
- Logger              = require('../logger');
-
-var ScheduleObserver = function(agent){
- this.agent = agent;
- this.packages = ['node-schedule'];
-};
-
-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;
-
-    aop.after(mod, 'scheduleJob',
-    function (obj, args, ret) {
-        var orig = ret.job;
-        if(!orig) return;
-        ret.job = async () => {
-            var ctx = null;
-            if(conf['trace_node_schedule_enabled']) {
-                ctx = TraceContextManager.startTrace('ScheduleJob');
-            }
-            var result = null;
-            try {
-                result = await orig.apply(this, arguments);   
-            } catch(err) {
-                Logger.printError('WHATAP-607', 'End batch error..', err, false);
-            }
-            if(conf['trace_node_schedule_enabled'] && ctx != null) {
-                try {
-                    var step = new MessageStep();
-                    step.msg = 'Node ScheduleJob finished!!!!!'
-                    step.hash =  HashUtil.hashFromString(step.msg);;
-                    step.start_time = ctx.getElapsedTime();
-                    step.desc = '';
-                    DataTextAgent.MESSAGE.add(step.hash, step.msg);
-                    ctx.profile.add(step);
-                    TraceContextManager.endTrace(ctx);
-                    if(ctx != null) ctx = null;
-                } catch(err) {}
-             }
-            return result;
-        };
-    }
-);
-};
-
+/**
+ * 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 TraceContextManager = require('../trace/trace-context-manager'),
+ conf                = require('../conf/configure'),
+ DataTextAgent       = require('../data/datatext-agent'),
+ DataProfileAgent    = require('../data/dataprofile-agent'),
+ EventLevel          = require('../data/event-level'),
+ TxRecord          = require('../service/tx-record'),
+ ProfilePack         = require('../pack/profile-pack'),
+ SecurityMaster      = require('../net/security-master'),
+ HashUtil            = require('../util/hashutil'),
+ DateUtil            = require('../util/dateutil'),
+ ResourceProfile     = require('../util/resourceprofile'),
+ MessageStep         = require('../step/message-step'),
+ Logger              = require('../logger');
+
+var ScheduleObserver = function(agent){
+ this.agent = agent;
+ this.packages = ['node-schedule'];
+};
+
+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;
+
+    aop.after(mod, 'scheduleJob',
+    function (obj, args, ret) {
+        var orig = ret.job;
+        if(!orig) return;
+        ret.job = async () => {
+            var ctx = null;
+            if(conf['trace_node_schedule_enabled']) {
+                ctx = TraceContextManager.startTrace('ScheduleJob');
+            }
+            var result = null;
+            try {
+                result = await orig.apply(this, arguments);   
+            } catch(err) {
+                Logger.printError('WHATAP-607', 'End batch error..', err, false);
+            }
+            if(conf['trace_node_schedule_enabled'] && ctx != null) {
+                try {
+                    var step = new MessageStep();
+                    step.msg = 'Node ScheduleJob finished!!!!!'
+                    step.hash =  HashUtil.hashFromString(step.msg);;
+                    step.start_time = ctx.getElapsedTime();
+                    step.desc = '';
+                    DataTextAgent.MESSAGE.add(step.hash, step.msg);
+                    ctx.profile.add(step);
+                    TraceContextManager.endTrace(ctx);
+                    if(ctx != null) ctx = null;
+                } catch(err) {}
+             }
+            return result;
+        };
+    }
+);
+};
+
 exports.ScheduleObserver = ScheduleObserver;

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

@@ -1,55 +1,55 @@
-/**
- * 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 MeterSocketio = require('../counter/meter/meter-socket.io'),
-Logger              = require('../logger');
-
-var SocketIOObserver = function(agent){
-    this.agent = agent;
-    this.packages = ['socket.io'];
-};
-
-SocketIOObserver.prototype.inject = function( mod ){
-    var self = this;
-    var aop = self.agent.aop;
-
-    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;
-
-        aop.before(ret.sockets, ['on', 'addListener'], function(obj, args) {
-            if (args[0] !== 'connection') return;
-
-            aop.functionHook(args, -1, function(obj, args) {
-                if (!args[0]) return; //no client socket
-
-                var socket = args[0];
-
-                MeterSocketio.connected(1);
-
-                socket.on('disconnect', function() {
-                    MeterSocketio.disconnected();
-                });
-
-                aop.before(socket, ['emit', 'send'], function(obj, args) {
-                    if (args[0] === 'newListener') return;
-                    MeterSocketio.send(null, args);
-                });
-
-                aop.before(socket, ['on', 'addListener'], function(obj, args) {
-                    if (args[0] === 'disconnect') return;
-                    aop.functionHook(args, -1, function (obj, args) {
-                        MeterSocketio.receive(null, args[0]);
-                    });
-                });
-            });
-        });
-    });
-}
-
+/**
+ * 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 MeterSocketio = require('../counter/meter/meter-socket.io'),
+Logger              = require('../logger');
+
+var SocketIOObserver = function(agent){
+    this.agent = agent;
+    this.packages = ['socket.io'];
+};
+
+SocketIOObserver.prototype.inject = function( mod ){
+    var self = this;
+    var aop = self.agent.aop;
+
+    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;
+
+        aop.before(ret.sockets, ['on', 'addListener'], function(obj, args) {
+            if (args[0] !== 'connection') return;
+
+            aop.functionHook(args, -1, function(obj, args) {
+                if (!args[0]) return; //no client socket
+
+                var socket = args[0];
+
+                MeterSocketio.connected(1);
+
+                socket.on('disconnect', function() {
+                    MeterSocketio.disconnected();
+                });
+
+                aop.before(socket, ['emit', 'send'], function(obj, args) {
+                    if (args[0] === 'newListener') return;
+                    MeterSocketio.send(null, args);
+                });
+
+                aop.before(socket, ['on', 'addListener'], function(obj, args) {
+                    if (args[0] === 'disconnect') return;
+                    aop.functionHook(args, -1, function (obj, args) {
+                        MeterSocketio.receive(null, args[0]);
+                    });
+                });
+            });
+        });
+    });
+}
+
 exports.SocketIOObserver = SocketIOObserver;

package/lib/observers/stream-observer.js

@@ -1,19 +1,19 @@
-/**
- * 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 StreamObserver = function(agent) {
-    this.agent = agent;
-    this.aop = agent.aop;
-    this.packages = ['stream'];
-};
-StreamObserver.prototype.inject = function (mod, moduleName) {
-    if(mod.__whatap_observe__) { return; }
-    mod.__whatap_observe__ = true;
-    
-};
-
-exports.StreamObserver = StreamObserver;
+/**
+ * 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 StreamObserver = function(agent) {
+    this.agent = agent;
+    this.aop = agent.aop;
+    this.packages = ['stream'];
+};
+StreamObserver.prototype.inject = function (mod, moduleName) {
+    if(mod.__whatap_observe__) { return; }
+    mod.__whatap_observe__ = true;
+    
+};
+
+exports.StreamObserver = StreamObserver;