whatap 0.5.0 → 0.5.2

package/lib/observers/pgsql-observer.js

@@ -8,7 +8,6 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     ParsedSql           = require('../trace/parsed-sql'),
     SqlStepX            = require('../step/sql-stepx'),
     DBCStep             = require('../step/dbc-step'),
-    ResultSetStep       = require('../step/resultset-step'),
     DataTextAgent       = require('../data/datatext-agent'),
     StatSql             = require('../stat/stat-sql'),
     MeterSql            = require('../counter/meter/meter-sql'),
@@ -20,148 +19,228 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     TextTypes           = require('../lang/text-types'),
     ParamSecurity       = require('../util/paramsecurity'),
     Logger              = require('../logger'),
-    conf                = require('../conf/configure'),
     Buffer              = require('buffer').Buffer,
-    DateUtil = require('../util/dateutil'),
-    MessageStep = require("../step/message-step");
-// const ResourceProfile = require("../util/resourceprofile");
+    DateUtil            = require('../util/dateutil');
+const shimmer = require('../core/shimmer');
 
 var PgSqlObserver = function (agent) {
     this.agent = agent;
     this.packages = ['pg'];
 };
 
-var queryHook = function (dbc_local, agent) {
+var dbc_hash = 0;
+var dbc, dbc_step;
+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;
 
-    return function (obj, args) {
+    if (conf.sql_enabled === false) { return; }
 
-        var ctx = TraceContextManager.getCurrentContext();
+    shimmer.wrap(mod.Client.prototype, 'connect', function (original) {
+        return function () {
+            const ctx = TraceContextManager.getCurrentContext();
+            if (!ctx || ctx.db_opening) {
+                return original.apply(this, arguments);
+            }
 
-        if (ctx == null || args[0] == null) { return; }
-        if(args[0].sql == null && typeof args[0] != 'string') { return; }
+            ctx.pg_opening = true;
+            ctx.footprint('PgSql Connecting Start');
 
-        var sql_step = new SqlStepX();
-        sql_step.start_time = ctx.getElapsedTime();
-        ctx.profile.push(sql_step);
-        ctx.footprint('PgSql Query Start');
+            dbc_step = new DBCStep();
+            dbc_step.start_time = ctx.getElapsedTime();
 
-        ctx.vvv++;
+            const finishConnect = function (param) {
+                if (ctx) {
+                    if (dbc_hash === 0) {
+                        const info = param.connectionParameters;
+                        dbc = 'postgresql://';
+                        dbc += (info.user || '') + '@';
+                        dbc += (info.host || '') + '/';
+                        dbc += info.database || '';
 
-        var sql = args.length > 0 ? args[0] : undefined,
-            psql = null;
+                        dbc_hash = HashUtil.hashFromString(dbc);
 
-        if(typeof sql !== 'string') {
-            sql = args[0].sql || undefined;
-        }
+                        // DataTextAgent.DBC.add(dbc_hash, dbc);
+                        // DataTextAgent.METHOD.add(dbc_hash, dbc);
+                        // DataTextAgent.ERROR.add(dbc_hash, dbc);
+                    }
+                    //
+                    // dbc_step.hash = dbc_hash;
+                    // dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
+                    //
+                    // ctx.db_opening = false;
+                    // ctx.footprint('PgSql Connecting Done');
+                    // ctx.profile.push(dbc_step);
+                }
+            };
 
-        if (typeof sql === 'string' && sql.length > 0) {
             try {
-                psql = escapeLiteral(sql);
-            } catch (e) {
-                Logger.printError('WHATAP-191', 'PgSqlObserver escapeliteral error', e);
+                const result = original.apply(this, arguments);
+
+                if (result && result.then) {
+                    result.then(finishConnect(this));
+                } else {
+                    finishConnect(this);
+                }
+
+            } catch (err) {
+                ctx.db_opening = false;
+                Logger.printError('PgSqlObserver', 'Connect Error', err);
+                throw err;
             }
-        } else {
-            sql = '';
-            psql = escapeLiteral(sql);
-        }
-
-        if(psql != null) {
-            sql_step.hash = psql.sql;
-            // = psql.type.charCodeAt(0);
-        }
-        sql_step.dbc = dbc_hash;
-
-        var els = new EscapeLiteralSQL(sql);
-        els.process();
-
-        ctx.active_sqlhash = sql_step.hash;
-        ctx.active_dbc = sql_step.dbc;
-        //ctx.active_crud = sql_step.crud;
-
-        if(conf.profile_sql_param_enabled) {
-            var params = args.length > 1 && Array.isArray(args[1]) ? args[1] : undefined;
-            sql_step.setTrue(1);
-            var crc = {value : 0};
-            sql_step.p1 = toParamBytes(psql.param, crc);
-            if(params != undefined) {
-                const result = params.map((param) => {
-                    if(typeof param === 'string'){
-                        return `'${param}'`
-                    }
-                    return param
-                }).toString()
-                sql_step.p2 = toParamBytes(result, crc);
+        };
+    });
+
+    shimmer.wrap(mod.Client.prototype, 'query', function (original) {
+        return function () {
+            const ctx = TraceContextManager.getCurrentContext();
+            if (!ctx) {
+                return original.apply(this, arguments);
             }
-            sql_step.pcrc = crc.value;
-        }
 
-        var lastCallback = false;
+            if(dbc && dbc_hash){
+                if(!dbc_step){
+                    dbc_step = new DBCStep();
+                    dbc_step.start_time = ctx.getElapsedTime();
+                }
+                dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
+                dbc_step.hash = dbc_hash;
+
+                DataTextAgent.DBC.add(dbc_hash, dbc);
+                DataTextAgent.METHOD.add(dbc_hash, dbc);
+                DataTextAgent.ERROR.add(dbc_hash, dbc);
+
+                ctx.pg_opening = false;
+                ctx.footprint('PgSql Connecting Done');
+                ctx.profile.push(dbc_step);
+            }
+            dbc_step = null;
 
-        function queryCallback(obj, args) {
+            var sql_step = new SqlStepX();
+            sql_step.start_time = ctx.getElapsedTime();
+            ctx.profile.push(sql_step);
+            ctx.footprint('PgSql Query Start');
 
-            if (ctx == null) { return; }
-            TraceContextManager.resume(ctx._id);
+            ctx.vvv++;
 
-            if (args[0]) {
+            let sql = arguments[0];
+            let psql = null;
+            if (typeof sql === 'string' && sql.length > 0) {
                 try {
-                    if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
-                        var traceDepth = conf.trace_sql_error_depth;
+                    psql = escapeLiteral(sql);
+                } catch (e) {
+                    Logger.printError('WHATAP-191', 'PgSqlObserver escapeliteral error', e);
+                }
+            } else {
+                sql = '';
+                psql = escapeLiteral(sql);
+            }
 
-                        var errorStack = args[0].stack.split("\n");
-                        if (errorStack.length > traceDepth) {
-                            errorStack = errorStack.slice(0, traceDepth + 1);
+            if(psql != null) {
+                sql_step.hash = psql.sql;
+            }
+            sql_step.dbc = dbc_hash;
+
+            var els = new EscapeLiteralSQL(sql);
+            els.process();
+            ctx.active_sqlhash = sql_step.hash;
+            ctx.active_dbc = sql_step.dbc;
+            //ctx.active_crud = sql_step.crud;
+
+            if(conf.profile_sql_param_enabled) {
+                var params = arguments.length > 1 && Array.isArray(arguments[1]) ? arguments[1] : undefined;
+                sql_step.setTrue(1);
+                var crc = {value : 0};
+                sql_step.p1 = toParamBytes(psql.param, crc);
+                if(params != undefined) {
+                    const result = params.map((param) => {
+                        if(typeof param === 'string'){
+                            return `'${param}'`
                         }
-                        var errorStackString = errorStack.join("\n");
-                        var error_stack_step = new MessageStep();
-                        error_stack_step.hash = HashUtil.hashFromString("ERROR STACK");
-                        error_stack_step.start_time = ctx.getElapsedTime();
-                        error_stack_step.desc = errorStackString;
-                        DataTextAgent.MESSAGE.add(error_stack_step.hash, "ERROR STACK");
-                        ctx.profile.push(error_stack_step);
-                    }
-                    if(conf._is_trace_ignore_err_cls_contains === true && args[0].code.indexOf(conf.trace_ignore_err_cls_contains) < 0){
-                        sql_step.error = StatError.addError( 'pgsql-'+args[0].code, args[0].message|| 'pgsql error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                        if (ctx.error.isZero()) { ctx.error = sql_step.error; }
-                    } else if(conf._is_trace_ignore_err_msg_contains === true && args[0].message.indexOf(conf.trace_ignore_err_msg_contains) < 0){
-                        sql_step.error = StatError.addError( 'pgsql-'+args[0].code, args[0].message|| 'pgsql error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                        if (ctx.error.isZero()) { ctx.error = sql_step.error; }
-                    } else if(conf._is_trace_ignore_err_cls_contains === false && conf._is_trace_ignore_err_msg_contains === false) {
-                        sql_step.error = StatError.addError( 'pgsql-'+args[0].code, args[0].message|| 'pgsql error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                        if (ctx.error.isZero()) { ctx.error = sql_step.error; }
-                    }
-                } catch (e) {
+                        return param
+                    }).toString()
+                    sql_step.p2 = toParamBytes(result, crc);
                 }
+                sql_step.pcrc = crc.value;
             }
 
-            sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
-            ctx.sql_time += sql_step.elapsed;
-
-            // if(conf.getProperty('profile_sql_resource_enabled', false)){
-            //     sql_step.start_cpu = ResourceProfile.getCPUTime();
-            //     sql_step.start_mem = ResourceProfile.getUsedHeapSize();
-            // }
-
-            ctx.footprint('PgSql Query Done');
-
-            MeterSql.add(dbc_hash, sql_step.elapsed, false);
-            StatSql.addSqlTime( ctx.service_hash,  sql_step.dbc,
-                sql_step.hash, sql_step.elapsed, args[0] != null, 0);
-
-            if (Array.isArray(args[1]) && psql != null && psql.type === 'S') {
-                var result_step = new ResultSetStep();
-                result_step.start_time = ctx.getElapsedTime();
-                result_step.elapsed = 0;
-                result_step.fetch = args[1].length;
-                result_step.sqlhash = psql.sql;
-                result_step.dbc = dbc_hash;
-                ctx.profile.push(result_step);
-                MeterSql.addFetch(result_step.dbc, result_step.fetch, 0);
-                StatSql.addFetch(result_step.dbc, result_step.sqlhash, result_step.fetch, 0);
+            try {
+                // SQL 실행
+                const result = original.apply(this, arguments);
+
+                if (result && result.then) {
+                    return result.then(res => {
+                        self._finishQuery(ctx, sql_step);
+                        return res;
+                    }).catch(err => {
+                        self._handleError(ctx, sql_step, err)
+                        if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
+                            var traceDepth = conf.trace_sql_error_depth;
+
+                            var errorStack = err.stack.split("\n");
+                            if (errorStack.length > traceDepth) {
+                                errorStack = errorStack.slice(0, traceDepth + 1);
+                            }
+                            ctx.error_message = errorStack.join("\n");
+                            sql_step.error = ctx.error = StatError.addError('pgsql -' + err.code, err.message, ctx.service_hash, TextTypes.SQL, null);
+                        }
+                        throw err;
+                    });
+                } else {
+                    const callback = arguments[arguments.length - 1];
+                    if (typeof callback === 'function') {
+                        arguments[arguments.length - 1] = function (err, res) {
+                            if (err) {
+                                self._handleError(ctx, sql_step, err);
+                            } else {
+                                self._finishQuery(ctx, sql_step);
+                            }
+                            return callback.apply(this, arguments);
+                        };
+                    }
+                    return result;
+                }
+            } catch (err) {
+                self._handleError(ctx, sql_step, err);
+                throw err;
             }
-        }
+        };
+    });
+
+    // if (mod.Pool && mod.Pool.prototype.query) {
+    //     shimmer.wrap(mod.Pool.prototype, 'query', function (original) {
+    //         return function () {
+    //             const traceContext = TraceContextManager.getCurrentContext();
+    //             if (!traceContext) {
+    //                 return original.apply(this, arguments);
+    //             }
+    //
+    //             // 동일한 방식으로 처리
+    //             return self.agent.pgClient.query.apply(this, arguments);
+    //         };
+    //     });
+    // }
+};
 
-        lastCallback = agent.aop.functionHook(args, -1, queryCallback);
-    }
+// 쿼리 완료 처리
+PgSqlObserver.prototype._finishQuery = function (ctx, sql_step) {
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
+
+    MeterSql.add(sql_step.hash, sql_step.elapsed, false);
+    StatSql.addSqlTime(ctx, ctx.service_hash, sql_step.dbc, sql_step.hash, sql_step.elapsed, false, 0);
+};
+
+PgSqlObserver.prototype._handleError = function (ctx, sql_step, err) {
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
+
+    // Logger.printError('WHATAP-192', 'PGSQL Query error.', err);
+    MeterSql.add(sql_step.hash, sql_step.elapsed, false);
+    StatSql.addSqlTime(ctx, ctx.service_hash, sql_step.dbc, sql_step.hash, sql_step.elapsed, true, 0);
 };
 
 var toParamBytes = function(p, crc) {
@@ -175,105 +254,6 @@ var toParamBytes = function(p, crc) {
     }
 };
 
-var errorDelegate = function () {
-    return function (obj, args) {
-
-        var ctx = TraceContextManager.getCurrentContext();
-        if(ctx == null) {  return; }
-
-        var laststep = ctx.profile.getLastSteps(1);
-        if(laststep == null || laststep.length === 0) {  return; }
-
-        var step = laststep[0];
-        if(!args[0].fatal) {
-            MeterSql.add(step.dbc, step.elapsed, true);
-            StatSql.addSqlTime(ctx.service_hash, step.dbc,  step.hash, step.elapsed, true, 0);
-        }
-
-        try{
-            if(args[0].fatal) {
-                // Connection Error
-                step.error = StatError.addError("pgsql-"+args[0].code, args[0].message, ctx.service_hash); /*long*/
-                if (ctx.error.isZero()) { ctx.error = step.error; }
-            } else {
-                if(conf._is_trace_ignore_err_cls_contains === true && args[0].code.indexOf(conf.trace_ignore_err_cls_contains) < 0){
-                    step.error = StatError.addError( 'pgsql-'+args[0].code, args[0].message, ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                    if (ctx.error.isZero()) { ctx.error = step.error; }
-                } else if(conf._is_trace_ignore_err_msg_contains === true && args[0].message.indexOf(conf.trace_ignore_err_msg_contains) < 0){
-                    step.error = StatError.addError( 'pgsql-'+args[0].code, args[0].message, ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                    if (ctx.error.isZero()) { ctx.error = step.error; }
-                } else if(conf._is_trace_ignore_err_cls_contains === false && conf._is_trace_ignore_err_msg_contains === false) {
-                    step.error = StatError.addError( 'pgsql-'+args[0].code, args[0].message, ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                    if (ctx.error.isZero()) { ctx.error = step.error; }
-                }
-            }
-        } catch(e) {
-            Logger.printError('WHATAP-997', 'pgsql-observer (errorDelegate)', e, true);
-        }
-    }
-};
-
-var dbc_hash=0;
-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;
-
-    if( conf.sql_enabled === false ) { return; }
-
-
-    aop.both(mod.Client.prototype, 'connect',
-        function (obj, args, lctx) {
-            var ctx = lctx.context;
-            if(ctx == null || ctx.db_opening) { return; }
-            ctx.db_opening = true;
-
-            ctx.footprint('PgSql Connecting Start');
-
-            var dbc_step = new DBCStep();
-            dbc_step.start_time = ctx.getElapsedTime();
-            lctx.step = dbc_step;
-        },
-
-        function (obj, args, ret, lctx) {
-            var pool = ret;
-            var ctx  = lctx.context,
-                step = lctx.step;
-
-            if(ctx == null || step == null) { return; }
-            if(dbc_hash === 0){
-                var dbc;
-                var info = obj.connectionParameters;
-                dbc = 'postgresql://';
-                dbc += info.user || '';
-                dbc += "@";
-                dbc += info.host || '';
-                dbc += '/';
-                dbc += info.database || '';
-                dbc_hash = HashUtil.hashFromString(dbc);
-
-                DataTextAgent.DBC.add(dbc_hash, dbc);
-                DataTextAgent.METHOD.add(dbc_hash, dbc);
-                DataTextAgent.ERROR.add(dbc_hash, dbc);
-            }
-            step.hash=dbc_hash;
-            step.elapsed = ctx.getElapsedTime() - step.start_time;
-            ctx.db_opening = false;
-
-            ctx.footprint('PgSql Connecting Done');
-
-            ctx.profile.push(step);
-
-        });
-    aop.before(mod.Client.prototype, 'query', queryHook(dbc_hash, self.agent));
-    aop.before(mod.Query.prototype, 'handleError', errorDelegate());
-
-};
-
 var checkedSql = new IntKeyMap(2000).setMax(2000);
 var nonLiteSql = new IntKeyMap(5000).setMax(5000);
 var date = DateUtil.yyyymmdd();

package/lib/observers/process-observer.js

@@ -41,7 +41,6 @@ ProcessObserver.prototype._hookNextTick = function (mod) {
 ProcessObserver.prototype._hookStdOutWrite = function () {
     this.agent.aop.after(process.stdout, 'write', (obj, args) => {
         if (conf.getProperty('logsink_enabled', false) && args[0]) {
-            return;
             let content = typeof args[0] === 'string' ? args[0] : (args[0].message || '');
             try {
                 const parsedContent = JSON.parse(content);
@@ -58,7 +57,6 @@ ProcessObserver.prototype._hookStdOutWrite = function () {
 ProcessObserver.prototype._hookStdErrWrite = function () {
     this.agent.aop.after(process.stderr, 'write', (obj, args) => {
         if (conf.getProperty('logsink_enabled', false) && args[0]) {
-            return;
             let content = typeof args[0] === 'string' ? args[0] : (args[0].message || '');
             try {
                 const parsedContent = JSON.parse(content);

package/lib/observers/redis-observer.js

@@ -169,8 +169,13 @@ RedisObserver.prototype.inject = function (mod, modName) {
             }
         }
     }, function (obj, args, ret, lctx) {
+        var ctx = lctx.context;
+        if (!ctx) {
+            return;
+        }
+
         var selectCommand = new Set(['get', 'hget', 'hmget', 'zrange', 'smembers', 'lrange']);
-        var insertCommand = new Set(['set', 'hset', 'hmset', 'zadd', 'lset', 'sadd', 'lpush', 'rpush']);
+        var insertCommand = new Set(['set', 'hset', 'hmset', 'zadd', 'lset', 'sadd', 'lpush', 'rpush', 'evalsha']);
         var updateCommand = new Set(['set', 'lset', 'hset', 'zadd']);
         var deleteCommand = new Set(['del', 'lrem', 'srem', 'hdel', 'zrem']);
         var commands = new Set([...selectCommand, ...insertCommand, ...updateCommand, ...deleteCommand]);
@@ -180,10 +185,10 @@ RedisObserver.prototype.inject = function (mod, modName) {
         }
         var command = args[0].name;
         if(commands.has(command.toLowerCase())){
-            var ctx = TraceContextManager.getCurrentContext();
-            if (ctx == null) {
-                return;
-            }
+            // var ctx = TraceContextManager.getCurrentContext();
+            // if (ctx == null) {
+            //     return;
+            // }
 
             var dbc_step = new DBCStep();
             dbc_step.hash = ioredis_dbc_hash;