whatap 0.5.1 → 0.5.2

package/lib/observers/http-observer.js

@@ -199,11 +199,12 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
                 ctx.status = Math.floor(obj.statusCode / 100);
 
                 // 에러가 발생했지만 스택수집안했을 경우
-                if (transaction_status_error_enable && ctx.status >= 4 && ctx.error.isZero()) {
-                    ctx.error = StatError.addError(obj.statusCode, obj.statusMessage,
-                        ctx.service_hash);
+                if (transaction_status_error_enable && ctx.status >= 4) {
+                    if(ctx.error.isZero())
+                        ctx.error = StatError.addError(obj.statusCode, obj.statusMessage, ctx.service_hash);
                     ctx.statusCode = obj.statusCode;
-                    ctx.statusMessage = obj.statusMessage;
+                    ctx.statusTitle = obj.statusMessage;
+                    ctx.statusMessage = ctx.error_message;
                 }
 
                 var requestPath = '';
@@ -469,10 +470,11 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
     if(profile_error_step_enabled && ctx.statusMessage){
         var step = new MessageStep();
-        step.hash = HashUtil.hashFromString("EXCEPTION");
+        var title = ctx.statusTitle ? ctx.statusTitle : "EXCEPTION";
+        step.hash = HashUtil.hashFromString(title);
         step.start_time = ctx.getElapsedTime();
         step.desc = ctx.statusMessage;
-        DataTextAgent.MESSAGE.add(step.hash, "EXCEPTION");
+        DataTextAgent.MESSAGE.add(step.hash, title);
         ctx.profile.push(step);
     }
 
@@ -667,7 +669,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             moduleName === 'https', obj);
     });
 
-    if( conf.httpc_enabled === false ) { return; }
+    if( conf.getProperty('httpc_enabled', true) === false ) { return; }
 
     aop.both(mod, 'request',
         function (obj, args, lctx) {

package/lib/observers/maria-observer.js

@@ -23,321 +23,213 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     conf                = require('../conf/configure'),
     DateUtil            = require('../util/dateutil'),
     Buffer              = require('buffer').Buffer,
-    MessageStep = require("../step/message-step");
-// const ResourceProfile = require("../util/resourceprofile");
+    shimmer             = require('../core/shimmer');
 
 var MariaObserver = function (agent) {
     this.agent = agent;
     this.packages = ['mariadb'];
 };
 
-var queryHook = function (dbc, agent) {
-
-    return function (obj, args) {
-        var ctx = TraceContextManager.getCurrentContext();
+var dbc, dbc_hash;
+MariaObserver.prototype.inject = function (mod, moduleName) {
+    if (mod.__whatap_observe__) { return; }
+    mod.__whatap_observe__ = true;
 
-        if (ctx == null || args[0] == null) { return; }
-        if(args[0].sql == null && typeof args[0] != 'string') { return; }
+    Logger.initPrint("MariaObserver");
 
-        var dbc_step = new DBCStep();
-        var dbc_hash = HashUtil.hashFromString(dbc);
-        DataTextAgent.DBC.add(dbc_hash, dbc);
-        DataTextAgent.METHOD.add(dbc_hash, dbc);
-        DataTextAgent.ERROR.add(dbc_hash, dbc)
+    if (!conf.sql_enabled) return;
 
-        dbc_step.hash = dbc_hash;
-        dbc_step.start_time = ctx.getElapsedTime();
-        ctx.profile.push(dbc_step);
+    // shimmer.wrap(mod, 'createConnection', wrapCreateConnection(mod));
+    shimmer.wrap(mod, 'createConnection', wrapConnection(mod));
+    shimmer.wrap(mod, 'createPool', wrapCreatePool(mod));
+};
 
-        var sql_step = new SqlStepX();
-        sql_step.start_time = ctx.getElapsedTime();
-        ctx.profile.push(sql_step);
+var _finishQuery = function (ctx, sql_step) {
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
 
-        ctx.footprint('Maria Query Start');
+    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);
+};
 
-        ctx.sql_count++;
+var _handleError = function (ctx, sql_step, err) {
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
 
-        var sql = args.length > 0 ? args[0] : undefined,
-            psql = null;
+    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);
+};
 
-        if(typeof sql !== 'string') {
-            sql = args[0].sql || undefined;
-        }
+function wrapCreateConnection(agent) {
+    return function (original) {
+        return async function (...args) {
+            const ctx = TraceContextManager.getCurrentContext();
+            if (!ctx || ctx.db_opening) return original.apply(this, args);
 
-        if (typeof sql === 'string' && sql.length > 0) {
-            try {
-                psql = escapeLiteral(sql);
-            } catch (e) {
-                Logger.printError('WHATAP-191', 'MariaObserver escapeliteral error', e);
-            }
-        } else {
-            sql = '';
-            psql = escapeLiteral(sql);
-        }
+            ctx.db_opening = true;
+            ctx.footprint('Maria Connecting Start');
 
-        if(psql != null) {
-            sql_step.hash = psql.sql;
-            // sql_step.crud = 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);
-            }
-            sql_step.pcrc = crc.value;
-        }
+            // const dbc_step = new DBCStep();
+            // dbc_step.start_time = ctx.getElapsedTime();
 
-        var lastCallback = false;
+            const connection = await original.apply(this, args);
+            wrapConnectionMethods(connection, agent);
 
-        function queryCallback(obj, args) {
-            if (ctx == null) { return; }
-            TraceContextManager.resume(ctx._id);
+            ctx.footprint('Maria Connecting Done');
+            ctx.db_opening = false;
 
-            if(args[0]) {
-                try{
-                    if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
-                        var traceDepth = conf.trace_sql_error_depth;
+            getDBCHash(args);
+            // dbc_step.hash = dbc_hash;
+            // ctx.profile.push(dbc_step);
 
-                        var errorStack = args[0].stack.split("\n");
-                        if (errorStack.length > traceDepth) {
-                            errorStack = errorStack.slice(0, traceDepth + 1);
-                        }
-                        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( 'Maria-'+args[0].code, args[0].message || 'Maria 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( 'Maria-'+args[0].code, args[0].message || 'Maria 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( 'Maria-'+args[0].code, args[0].message || 'Maria error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                        if (ctx.error.isZero()) { ctx.error = sql_step.error; }
-                    }
-                }catch(e) {
-
-                }
-            }
+            return connection;
+        };
+    };
+}
 
-            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('Maria 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);
-            }
+function wrapConnection(agent) {
+    return function (original) {
+        return function (...args) {
+            const connectionPromise = original.apply(this, args);
+            getDBCHash(args);
 
-            if (args[1] != null && psql != null && psql.type === 'U') {
-                sql_step.updated = args[1].affectedRows || 0;
-                //StatSql.addUpdate(dbc_hash, psql.sql, sql_step.updated);
-            }
+            return connectionPromise.then(connection => {
+                shimmer.wrap(connection, 'query', createQueryHook(agent));
+                return connection;
+            });
         }
+    }
+}
 
-        lastCallback = agent.aop.functionHook(args, -1, queryCallback);
+function wrapCreatePool(agent) {
+    return function (original) {
+        return function (...args) {
+            const pool = original.apply(this, args);
+            getDBCHash(args);
+
+            shimmer.wrap(pool, 'getConnection', (originalGetConnection) => {
+                return async function (...connArgs) {
+                    const connection = await originalGetConnection.apply(this, connArgs);
+                    wrapConnectionMethods(connection, agent);
+                    return connection;
+                };
+            });
+
+            return pool;
+        };
+    };
+}
 
-        if(lastCallback === false && args.length>0 && args[0]._callback){
-            agent.aop.both(args[0], '_callback', queryCallback);
-        }
-    }
-};
+function wrapConnectionMethods(connection, agent) {
+    shimmer.wrap(connection, 'query', createQueryHook(agent));
+    shimmer.wrap(connection, 'execute', createQueryHook(agent));
+}
 
-var toParamBytes = function(p, crc) {
-    if(p == null || p.length === 0) {
-        return null;
-    }
-    try{
-        return ParamSecurity.encrypt(Buffer.from(p), crc);
-    } catch(e) {
-        return null;
-    }
-};
+function createQueryHook(agent) {
+    return function (original) {
+        return function (...args) {
+            const ctx = TraceContextManager.getCurrentContext();
+            if (!ctx || !args[0]) return original.apply(this, args);
 
-var errorDelegate = function () {
-    return function (obj, args) {
-        var ctx = TraceContextManager.getCurrentContext();
-        if(ctx == null) { return; }
+            ctx.db_opening = true;
+            ctx.footprint('Maria Connecting Start');
 
-        var laststep = ctx.profile.getLastSteps(1);
-        if(laststep == null || laststep.length === 0) { return; }
+            const dbc_step = new DBCStep();
+            ctx.footprint('Maria Connecting Done');
+            ctx.db_opening = false;
 
-        var step = laststep[0];
-        if(!args[0].fatal) {
-            MeterSql.add(step.dbc, step.elapsed, true);
-            StatSql.addSqlTime(ctx, ctx.service_hash, step.dbc, step.hash, step.elapsed, true, 0);
-        }
+            dbc_step.hash = dbc_hash;
+            ctx.profile.push(dbc_step);
 
-        try{
-            if(args[0].fatal) {
-                // Connection Error
-                step.error = StatError.addError( 'Maria-'+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( 'Maria-'+args[0].code, args[0].message || 'Maria error', 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( 'Maria-'+args[0].code, args[0].message || 'Maria error', 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( 'Maria-'+args[0].code, args[0].message || 'Maria error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
-                    if (ctx.error.isZero()) { ctx.error = step.error; }
-                }
-            }
-        } catch(e) {
-        }
-    }
-};
+            const sql_step = new SqlStepX();
+            sql_step.start_time = ctx.getElapsedTime();
+            ctx.profile.push(sql_step);
 
-MariaObserver.prototype.inject = function (mod, moduleName) {
-    if (mod.__whatap_observe__) {
-        return;
-    }
-    mod.__whatap_observe__ = true;
-    Logger.initPrint("MariaObserver");
-    var self = this;
-    var aop = self.agent.aop;
+            ctx.footprint('Maria Query Start');
+            ctx.sql_count++;
 
-    if (conf.sql_enabled === false) {
-        return;
-    }
+            var sql = args.length > 0 ? args[0] : undefined,
+                psql = null;
 
-    var dbc_hash = 0;
-    var dbc = 'maria://';
-    aop.both(mod, 'createConnection',
-        function (obj, args, lctx) {
-            var ctx = lctx.context;
-            if (ctx == null || ctx.db_opening) {
-                return;
+            if(typeof sql !== 'string') {
+                sql = args[0].sql || undefined;
             }
-            ctx.db_opening = true;
-            ctx.footprint('Maria Connecting Start');
 
-            var dbc_step = new DBCStep();
-            dbc_step.start_time = ctx.getElapsedTime();
-            lctx.step = dbc_step;
-        },
-        function (obj, args, ret, lctx) {
-            if (dbc_hash === 0) {
-                if (args.length > 0) {
-                    var info = (args[0] || {});
-                    dbc = 'maria://';
-                    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);
+            if (typeof sql === 'string' && sql.length > 0) {
+                try {
+                    psql = escapeLiteral(sql);
+                } catch (e) {
+                    Logger.printError('WHATAP-191', 'MariaObserver escapeliteral error', e);
                 }
+            } else {
+                sql = '';
+                psql = escapeLiteral(sql);
             }
 
-            ret.then(connection => {
-                aop.both(connection, 'query', queryHook(dbc, self.agent), function (_obj, _args, _ret, _lctx) {
-                    var ctx = _lctx.context;
-                    TraceContextManager.resume(ctx);
-                });
-            })
-
-            ret.then(connection => {
-                aop.both(connection, 'execute', queryHook(dbc, self.agent), function (_obj, _args, _ret, _lctx) {
-                    var ctx = _lctx.context;
-                    TraceContextManager.resume(ctx);
-                });
-            })
-
-            // aop.both(ret, 'execute', queryHook(dbc, self.agent), function (obj, args, ret, lctx) {
-            //     var ctx = lctx.context;
-            //     TraceContextManager.resume(ctx);
-            // });
-            //
-            // aop.after(ret._protocol, '_delegateError', errorDelegate());
-
-            var ctx = lctx.context,
-                step = lctx.step;
-
-            if (ctx == null || step == null) {
-                return;
+            if(psql != null) {
+                sql_step.hash = psql.sql;
+                // sql_step.crud = psql.type.charCodeAt(0);
             }
 
-            TraceContextManager.resume(ctx);
-            ctx.footprint('Maria Connecting Done');
-            ctx.db_opening = false;
-            step.hash = dbc_hash;
-        });
-
-
-    var dbc_pool_hash = 0;
-    aop.after(mod, ['createPool', 'createPoolCluster'], function (obj, args, ret) {
-        if (dbc_pool_hash == 0) {
-            if (args.length > 0) {
-                var info = args[0];
-                dbc += info.user || '';
-                dbc += "@";
-                dbc += info.host || '';
-                dbc += '/';
-                dbc += info.database || '';
+            var els = new EscapeLiteralSQL(sql);
+            els.process();
+
+            ctx.active_sqlhash = sql_step.hash;
+
+            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);
+                }
+                sql_step.pcrc = crc.value;
             }
-        }
 
-        aop.after(ret, 'getConnection', function (_obj, _args, _ret, _lctx) {
-            _ret.then(connection => {
-                aop.both(connection, 'query', queryHook(dbc, self.agent), function (__obj, __args, __ret, __lctx) {
-                    var ctx = __lctx.context;
-                    TraceContextManager.resume(ctx);
-                });
-                aop.both(connection, 'execute', queryHook(dbc, self.agent), function (__obj, __args, __ret, __lctx) {
-                    var ctx = __lctx.context;
-                    TraceContextManager.resume(ctx);
-                });
-            })
-        })
-    });
+            const result = original.apply(this, args);
+            // return result;
+            return result.then(res => {
+                _finishQuery(ctx, sql_step);
+                return res;
+            }).catch(err => {
+                _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;
+            });
+        };
+    };
+}
+
+var toParamBytes = function (p, crc) {
+    if (p == null || p.length === 0) {
+        return null;
+    }
+    try {
+        return ParamSecurity.encrypt(Buffer.from(p, 'utf8'), crc);
+    } catch (e) {
+        return null;
+    }
 };
 
+function getDBCHash(args) {
+    dbc = `mariadb://${(args[0] || {}).user || ''}@${(args[0] || {}).host || ''}/${(args[0] || {}).database || ''}`;
+    dbc_hash = HashUtil.hashFromString(dbc);
+}
+
 var checkedSql = new IntKeyMap(2000).setMax(2000);
 var nonLiteSql = new IntKeyMap(5000).setMax(5000);
 var date = DateUtil.yyyymmdd();

package/lib/observers/mssql-observer.js

@@ -101,22 +101,17 @@ MssqlObserver.prototype.inject = function (mod, modName) {
                             if (errorStack.length > traceDepth) {
                                 errorStack = errorStack.slice(0, traceDepth + 1);
                             }
-                            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);
+                            ctx.error_message = errorStack.join("\n");
+                            sql_step.error = ctx.error = StatError.addError('mssql-' + args[0].code, args[0].message, ctx.service_hash, TextTypes.SQL, null);
                         }
                         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( 'mssql-'+args[0].code, args[0].message|| 'mssql error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
+                            sql_step.error = StatError.addError( 'mssql-'+args[0].code, args[0].message|| 'mssql error', ctx.service_hash,  TextTypes.SQL, 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( 'mssql-'+args[0].code, args[0].message|| 'mssql error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
+                            sql_step.error = StatError.addError( 'mssql-'+args[0].code, args[0].message|| 'mssql error', ctx.service_hash,  TextTypes.SQL, 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( 'mssql-'+args[0].code, args[0].message|| 'mssql error', ctx.service_hash,  TextTypes.SQL, step.hash); /*long*/
+                            sql_step.error = StatError.addError( 'mssql-'+args[0].code, args[0].message|| 'mssql error', ctx.service_hash,  TextTypes.SQL, sql_step.hash); /*long*/
                             if (ctx.error.isZero()) { ctx.error = sql_step.error; }
                         }
                     }

package/lib/observers/mysql-observer.js

@@ -22,8 +22,7 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     Logger = require('../logger'),
     conf = require('../conf/configure'),
     DateUtil = require('../util/dateutil'),
-    Buffer = require('buffer').Buffer,
-    MessageStep = require("../step/message-step");
+    Buffer = require('buffer').Buffer;
 // const ResourceProfile = require('../util/resourceprofile');
 
 var MysqlObserver = function (agent) {
@@ -126,26 +125,21 @@ var queryHook = function (dbc, agent) {
                         if (errorStack.length > traceDepth) {
                             errorStack = errorStack.slice(0, traceDepth + 1);
                         }
-                        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);
+                        ctx.error_message = errorStack.join("\n");
+                        sql_step.error = ctx.error = StatError.addError('mysql-' + args[0].code, args[0].sqlMessage, ctx.service_hash, TextTypes.SQL, null);
                     }
                     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('mysql-' + args[0].code, args[0].message || 'mysql error', ctx.service_hash, TextTypes.SQL, step.hash); /*long*/
+                        sql_step.error = StatError.addError('mysql-' + args[0].code, args[0].message || 'mysql error', ctx.service_hash, TextTypes.SQL, 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('mysql-' + args[0].code, args[0].message || 'mysql error', ctx.service_hash, TextTypes.SQL, step.hash); /*long*/
+                        sql_step.error = StatError.addError('mysql-' + args[0].code, args[0].message || 'mysql error', ctx.service_hash, TextTypes.SQL, 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('mysql-' + args[0].code, args[0].message || 'mysql error', ctx.service_hash, TextTypes.SQL, step.hash); /*long*/
+                        sql_step.error = StatError.addError('mysql-' + args[0].code, args[0].message || 'mysql error', ctx.service_hash, TextTypes.SQL, sql_step.hash); /*long*/
                         if (ctx.error.isZero()) {
                             ctx.error = sql_step.error;
                         }

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/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.1",
-  "releaseDate": "20240828",
+  "version": "0.5.2",
+  "releaseDate": "20241017",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},