whatap 1.0.1-canary.2 → 1.0.2

package/lib/observers/maria-observer.js

@@ -5,277 +5,258 @@
  */
 
 var TraceContextManager = require('../trace/trace-context-manager'),
-    ParsedSql = require('../trace/parsed-sql'),
-    conf = require('../conf/configure'),
-    IntKeyMap = require('../util/intkey-map'),
-    EscapeLiteralSQL = require('../util/escape-literal-sql'),
-    HashUtil = require('../util/hashutil'),
-    Logger = require('../logger'),
-    DateUtil = require('../util/dateutil'),
-    AsyncSender = require('../udp/async_sender'),
-    PacketTypeEnum = require('../udp/packet_type_enum'),
-    shimmer = require('../core/shimmer'),
-    TraceSQL = require('../trace/trace-sql');
-const { AsyncResource } = require('async_hooks');
+    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'),
+    conf                = require('../conf/configure'),
+    IntKeyMap           = require('../util/intkey-map'),
+    EscapeLiteralSQL    = require('../util/escape-literal-sql'),
+    HashUtil            = require('../util/hashutil'),
+    StatError           = require('../stat/stat-error'),
+    TextTypes           = require('../lang/text-types'),
+    ParamSecurity       = require('../util/paramsecurity'),
+    Logger              = require('../logger'),
+    DateUtil            = require('../util/dateutil'),
+    Buffer              = require('buffer').Buffer,
+    shimmer             = require('../core/shimmer'),
+    TraceSQL            = require('../trace/trace-sql');
 
 var MariaObserver = function (agent) {
     this.agent = agent;
     this.packages = ['mariadb'];
 };
 
-var dbc_hash = 0;
-var dbc = 'mariadb://';
+var dbc, dbc_hash;
+MariaObserver.prototype.inject = function (mod, moduleName) {
+    if (mod.__whatap_observe__) { return; }
+    mod.__whatap_observe__ = true;
 
-// 후킹된 객체 추적
-var hookedInstances = new WeakSet();
+    Logger.initPrint("MariaObserver");
 
-function handleSqlError(ctx, err, sqlHash) {
-    if (!err) return;
+    if (!conf.sql_enabled) return;
 
-    try {
-        var errorClass = err.code || err.name || err.constructor?.name || 'MariaDBError';
-        var errorMessage = err.message || err.sqlMessage || 'mariadb error';
-        var errorStack = '';
-
-        if (conf.trace_sql_error_stack && conf.trace_sql_error_depth && err.stack) {
-            var traceDepth = conf.trace_sql_error_depth;
-            var stackLines = err.stack.split("\n");
-            if (stackLines.length > traceDepth) {
-                stackLines = stackLines.slice(0, traceDepth + 1);
-            }
-            errorStack = stackLines.join("\n");
-            ctx.error_message = errorStack;
-        }
+    // shimmer.wrap(mod, 'createConnection', wrapCreateConnection(mod));
+    shimmer.wrap(mod, 'createConnection', wrapConnection(mod));
+    shimmer.wrap(mod, 'createPool', wrapCreatePool(mod));
+};
 
-        var shouldAddError = false;
-        if (conf._is_trace_ignore_err_cls_contains === true && errorClass &&
-            errorClass.indexOf(conf.trace_ignore_err_cls_contains) < 0) {
-            shouldAddError = true;
-        } else if (conf._is_trace_ignore_err_msg_contains === true && errorMessage &&
-            errorMessage.indexOf(conf.trace_ignore_err_msg_contains) < 0) {
-            shouldAddError = true;
-        } else if (conf._is_trace_ignore_err_cls_contains === false &&
-            conf._is_trace_ignore_err_msg_contains === false) {
-            shouldAddError = true;
-        }
+var _finishQuery = function (ctx, sql_step) {
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
+    TraceSQL.isSlowSQL(ctx);
 
-        if (shouldAddError) {
-            if(!ctx.error) ctx.error = 1;
-            ctx.status = 500;
-            ctx.error_message = errorMessage;
-            ctx.errClass = errorClass;
-            ctx.errMessage = errorMessage;
+    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);
+};
 
-            var errors = [errorClass];
-            if (errorMessage) {
-                errors.push(errorMessage);
-            }
-            if (errorStack || err.stack) {
-                errors.push(errorStack || err.stack);
-            }
-            AsyncSender.send_packet(PacketTypeEnum.TX_ERROR, ctx, errors);
-        }
-    } catch (e) {
-        Logger.printError('WHATAP-214', 'Error handling MariaDB error', e, false);
-    }
-}
+var _handleError = function (ctx, sql_step, err) {
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
+    TraceSQL.isSlowSQL(ctx);
 
-function setupDbcInfo(args) {
-    if (dbc_hash === 0 && args.length > 0) {
-        var info = args[0] || {};
-        dbc = 'mariadb://';
-        dbc += info.user || '';
-        dbc += "@";
-        dbc += info.host || '';
-        dbc += '/';
-        dbc += info.database || '';
-        dbc_hash = HashUtil.hashFromString(dbc);
-    }
+    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);
+};
+
+function wrapCreateConnection(agent) {
+    return function (original) {
+        return async function (...args) {
+            const ctx = TraceContextManager.getCurrentContext();
+            if (!ctx || ctx.db_opening) return original.apply(this, args);
+
+            ctx.db_opening = true;
+            ctx.footprint('Maria Connecting Start');
+
+            // const dbc_step = new DBCStep();
+            // dbc_step.start_time = ctx.getElapsedTime();
+
+            const connection = await original.apply(this, args);
+            wrapConnectionMethods(connection, agent);
+
+            ctx.footprint('Maria Connecting Done');
+            ctx.db_opening = false;
+
+            getDBCHash(args);
+            // dbc_step.hash = dbc_hash;
+            // ctx.profile.push(dbc_step);
+
+            return connection;
+        };
+    };
 }
 
-function hookConnectionMethods(connection, agent) {
-    if (connection && !hookedInstances.has(connection)) {
-        hookedInstances.add(connection);
-        Logger.print('WHATAP-MARIADB-CONNECTION', 'Hooking new connection object', false);
+function wrapConnection(agent) {
+    return function (original) {
+        return function (...args) {
+            const connectionPromise = original.apply(this, args);
+            getDBCHash(args);
 
-        // query와 execute 메서드 후킹
-        if (connection.query && !connection.query.__whatap_wrapped__) {
-            shimmer.wrap(connection, 'query', createQueryWrapper(agent, dbc));
-            connection.query.__whatap_wrapped__ = true;
-        }
-        if (connection.execute && !connection.execute.__whatap_wrapped__) {
-            shimmer.wrap(connection, 'execute', createQueryWrapper(agent, dbc));
-            connection.execute.__whatap_wrapped__ = true;
+            return connectionPromise.then(connection => {
+                shimmer.wrap(connection, 'query', createQueryHook(agent));
+                return connection;
+            });
         }
     }
 }
 
-// 쿼리 래핑 함수
-var createQueryWrapper = function(agent, dbcUrl) {
-    return function(original) {
-        return function wrappedQuery() {
-            var args = Array.prototype.slice.call(arguments);
-            var ctx = TraceContextManager.getCurrentContext();
+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;
+                };
+            });
 
-            if (ctx == null || args[0] == null) {
-                return original.apply(this, arguments);
-            }
+            return pool;
+        };
+    };
+}
 
-            if (args[0].sql == null && typeof args[0] != 'string') {
-                return original.apply(this, arguments);
-            }
+function wrapConnectionMethods(connection, agent) {
+    shimmer.wrap(connection, 'query', createQueryHook(agent));
+    shimmer.wrap(connection, 'execute', createQueryHook(agent));
+}
 
-            // AsyncResource 생성
-            const asyncResource = new AsyncResource('mariadb-query');
+function createQueryHook(agent) {
+    return function (original) {
+        return function (...args) {
+            const ctx = TraceContextManager.getCurrentContext();
+            if (!ctx || !args[0]) return original.apply(this, args);
 
-            return asyncResource.runInAsyncScope(() => {
-                // HTTP Observer 패턴을 따라 시작 시간 설정
-                ctx.start_time = Date.now();
+            ctx.db_opening = true;
+            ctx.footprint('Maria Connecting Start');
 
-                // DB 연결 패킷 전송 (elapsed = 0으로 설정)
-                ctx.elapsed = 0;
-                AsyncSender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, [dbcUrl]);
+            const dbc_step = new DBCStep();
+            ctx.footprint('Maria Connecting Done');
+            ctx.db_opening = false;
 
-                // SQL 시작 시간 기록
-                var sql_start_time = Date.now();
-                ctx.footprint('MariaDB Query Start');
-                ctx.sql_count++;
+            dbc_step.hash = dbc_hash;
+            ctx.profile.push(dbc_step);
 
-                var sql = args.length > 0 ? args[0] : undefined;
-                var params = args.length > 1 && Array.isArray(args[1]) ? args[1] : undefined;
+            const sql_step = new SqlStepX();
+            sql_step.start_time = ctx.getElapsedTime();
+            ctx.profile.push(sql_step);
 
-                if (typeof sql !== 'string') {
-                    sql = args[0].sql || undefined;
-                    if (args[0].values && Array.isArray(args[0].values)) {
-                        params = args[0].values;
-                    }
-                }
+            ctx.footprint('Maria Query Start');
+            ctx.sql_count++;
 
-                // 최종 SQL 생성 (파라미터 바인딩)
-                var finalSql = sql || '';
-                if (typeof sql === 'string' && sql.length > 0 && params && params.length > 0) {
-                    try {
-                        // MariaDB는 mysql2 스타일의 파라미터 바인딩 지원
-                        const result = params.map((param) => {
-                            if(typeof param === 'string'){
-                                return `'${param.replace(/'/g, "''")}'` // SQL injection 방지
-                            }
-                            return param
-                        }).join(', ');
-
-                        // 간단한 파라미터 치환 (? 기준)
-                        var paramIndex = 0;
-                        finalSql = sql.replace(/\?/g, function() {
-                            if (paramIndex < params.length) {
-                                var param = params[paramIndex++];
-                                if (typeof param === 'string') {
-                                    return `'${param.replace(/'/g, "''")}'`;
-                                }
-                                return param;
-                            }
-                            return '?';
-                        });
-                    } catch (e) {
-                        Logger.printError('WHATAP-SQL-BINDING', 'Error binding parameters', e, false);
-                        finalSql = sql; // 바인딩 실패 시 원본 사용
-                    }
-                }
-
-                var psql = null;
-                if (typeof finalSql === 'string' && finalSql.length > 0) {
-                    try {
-                        psql = escapeLiteral(finalSql);
-                        // Logger.print('WHATAP-SQL-DEBUG', 'Processing SQL: ' + finalSql.substring(0, 200), false);
-                    } catch (e) {
-                        Logger.printError('WHATAP-215', 'MariaObserver escapeliteral error', e, false);
-                    }
-                } else {
-                    finalSql = '';
-                    psql = escapeLiteral(finalSql);
-                }
+            var sql = args.length > 0 ? args[0] : undefined,
+                psql = null;
 
-                var sqlHash = psql ? psql.sql : 0;
-                ctx.active_sqlhash = true;
+            if(typeof sql !== 'string') {
+                sql = args[0].sql || undefined;
+            }
 
-                const result = 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);
+            }
 
-                // Promise 기반 처리
-                if (result && typeof result.then === 'function') {
-                    return result.then(res => {
-                        var currentCtx = TraceContextManager.getCurrentContext();
-                        if (currentCtx == null) {
-                            currentCtx = ctx;
-                        }
+            if(psql != null) {
+                sql_step.hash = psql.sql;
+                // sql_step.crud = psql.type.charCodeAt(0);
+            }
 
-                        var sql_elapsed = Date.now() - sql_start_time;
-                        var resultCount = 0;
-
-                        // 결과 개수 계산
-                        if (res) {
-                            if (Array.isArray(res)) {
-                                resultCount = res.length;
-                            } else if (res.affectedRows !== undefined) {
-                                resultCount = res.affectedRows;
-                            } else if (res.changedRows !== undefined) {
-                                resultCount = res.changedRows;
-                            }
-                        }
+            var els = new EscapeLiteralSQL(sql);
+            els.process();
 
-                        // TraceSQL 처리
-                        try {
-                            TraceSQL.isSlowSQL(currentCtx);
+            ctx.active_sqlhash = sql_step.hash;
 
-                            // ResultSet 처리 (SELECT 쿼리)
-                            if (res && psql && psql.type === 'S') {
-                                TraceSQL.isTooManyRecords(resultCount, currentCtx);
-                            }
-                        } catch (e) {
-                            Logger.printError('WHATAP-TRACESQL', 'Error in TraceSQL processing', e, false);
+            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;
+            }
 
-                        currentCtx.elapsed = sql_elapsed;
-                        currentCtx.active_sqlhash = false;
-                        AsyncSender.send_packet(PacketTypeEnum.TX_SQL, currentCtx, [dbcUrl, finalSql, String(resultCount)]);
-
-                        currentCtx.footprint('MariaDB Query Done');
-                        return res;
-                    }).catch(err => {
-                        var currentCtx = TraceContextManager.getCurrentContext();
-                        if (currentCtx == null) {
-                            currentCtx = ctx;
-                        }
+            const result = original.apply(this, args);
 
-                        var sql_elapsed = Date.now() - sql_start_time;
+            return result.then(res => {
+                if (Array.isArray(res) && psql && psql.type === "S") {
+                    var result_step = new ResultSetStep();
+                    result_step.start_time = ctx.getElapsedTime();
+                    result_step.elapsed = 0;
+                    result_step.fetch = res.length;
+                    result_step.sqlhash = psql.sql;
+                    result_step.dbc = dbc_hash;
+                    ctx.profile.push(result_step);
 
-                        // 에러 처리
-                        handleSqlError(currentCtx, err, sqlHash);
+                    ctx.rs_count = ctx.rs_count ? ctx.rs_count + res.length : res.length;
 
-                        currentCtx.elapsed = sql_elapsed;
-                        currentCtx.active_sqlhash = false;
-                        AsyncSender.send_packet(PacketTypeEnum.TX_SQL, currentCtx, [dbcUrl, finalSql, '0']);
+                    MeterSql.addFetch(result_step.dbc, result_step.fetch, 0);
+                    StatSql.addFetch(result_step.dbc, result_step.sqlhash, result_step.fetch, 0);
 
-                        currentCtx.footprint('MariaDB Query Error');
-                        throw err;
-                    });
+                    TraceSQL.isTooManyRecords(sql_step, result_step.fetch, ctx);
                 }
-
-                return result;
+                var isSelectQuery = psql && psql.type === "S"? true : false;
+                _finishQuery(ctx, sql_step, isSelectQuery, res);
+                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();
 
 function escapeLiteral(sql) {
-    if (sql == null) {
-        sql = '';
-    }
+    if(sql == null) { sql = ''; }
 
-    if (date !== DateUtil.yyyymmdd()) {
+    if(date !== DateUtil.yyyymmdd()) {
         checkedSql.clear();
         nonLiteSql.clear();
         date = DateUtil.yyyymmdd();
@@ -285,12 +266,12 @@ function escapeLiteral(sql) {
     var sqlHash = HashUtil.hashFromString(sql);
     var psql = nonLiteSql.get(sqlHash);
 
-    if (psql != null) {
+    if(psql != null) {
         return psql;
     }
     psql = checkedSql.get(sqlHash);
 
-    if (psql != null) {
+    if(psql != null) {
         return psql;
     }
 
@@ -298,7 +279,9 @@ function escapeLiteral(sql) {
     els.process();
 
     var hash = HashUtil.hashFromString(els.getParsedSql());
-    if (hash === sqlHash) {
+    DataTextAgent.SQL.add(hash, els.getParsedSql());
+
+    if(hash === sqlHash) {
         psql = new ParsedSql(els.sqlType, hash, null);
         nonLiteSql.put(sqlHash, psql);
     } else {
@@ -308,145 +291,4 @@ function escapeLiteral(sql) {
     return psql;
 }
 
-// 메인 inject 함수
-MariaObserver.prototype.inject = function (mod, moduleName) {
-    if (mod.__whatap_observe__) {
-        return;
-    }
-    mod.__whatap_observe__ = true;
-    Logger.initPrint("MariaObserver");
-
-    if (conf.sql_enabled === false) {
-        return;
-    }
-
-    var self = this;
-
-    // createConnection 래핑
-    if (mod.createConnection && !mod.createConnection.__whatap_wrapped__) {
-        shimmer.wrap(mod, 'createConnection', function(original) {
-            return function wrappedCreateConnection() {
-                var args = Array.prototype.slice.call(arguments);
-                var ctx = TraceContextManager.getCurrentContext();
-
-                setupDbcInfo(args);
-
-                if (ctx && !ctx.db_opening) {
-                    ctx.db_opening = true;
-                    ctx.footprint('MariaDB Connecting Start');
-                    ctx.start_time = Date.now();
-                }
-
-                const result = original.apply(this, args);
-
-                // Promise 기반 처리
-                if (result && typeof result.then === 'function') {
-                    return result.then(connection => {
-                        hookConnectionMethods(connection, self.agent);
-
-                        if (ctx) {
-                            ctx.elapsed = Date.now() - ctx.start_time;
-                            ctx.footprint('MariaDB Connecting Done');
-                            ctx.db_opening = false;
-                        }
-                        return connection;
-                    }).catch(error => {
-                        if (ctx) {
-                            ctx.elapsed = Date.now() - ctx.start_time;
-                            ctx.footprint('MariaDB Connecting Error');
-                            ctx.db_opening = false;
-                            handleSqlError(ctx, error, 0);
-                        }
-                        throw error;
-                    });
-                } else {
-                    // 동기 처리
-                    hookConnectionMethods(result, self.agent);
-
-                    if (ctx) {
-                        ctx.elapsed = Date.now() - ctx.start_time;
-                        ctx.footprint('MariaDB Connecting Done');
-                        ctx.db_opening = false;
-                    }
-                }
-
-                return result;
-            };
-        });
-        mod.createConnection.__whatap_wrapped__ = true;
-    }
-
-    // createPool 래핑
-    if (mod.createPool && !mod.createPool.__whatap_wrapped__) {
-        shimmer.wrap(mod, 'createPool', function(original) {
-            return function wrappedCreatePool() {
-                var args = Array.prototype.slice.call(arguments);
-                setupDbcInfo(args);
-
-                var pool = original.apply(this, args);
-
-                if (pool && !hookedInstances.has(pool)) {
-                    hookedInstances.add(pool);
-
-                    // Pool의 직접 쿼리 메서드들 후킹
-                    if (pool.query && !pool.query.__whatap_wrapped__) {
-                        shimmer.wrap(pool, 'query', createQueryWrapper(self.agent, dbc));
-                        pool.query.__whatap_wrapped__ = true;
-                    }
-                    if (pool.execute && !pool.execute.__whatap_wrapped__) {
-                        shimmer.wrap(pool, 'execute', createQueryWrapper(self.agent, dbc));
-                        pool.execute.__whatap_wrapped__ = true;
-                    }
-
-                    // getConnection 메서드 후킹
-                    if (pool.getConnection && !pool.getConnection.__whatap_wrapped__) {
-                        shimmer.wrap(pool, 'getConnection', function(original) {
-                            return function wrappedGetConnection() {
-                                var args = Array.prototype.slice.call(arguments);
-                                var ctx = TraceContextManager.getCurrentContext();
-
-                                if (ctx == null) {
-                                    return original.apply(this, args);
-                                }
-
-                                const connectionResource = new AsyncResource('mariadb-getConnection');
-
-                                return connectionResource.runInAsyncScope(() => {
-                                    ctx.start_time = Date.now();
-
-                                    const result = original.apply(this, args);
-
-                                    // Promise 기반 처리
-                                    if (result && typeof result.then === 'function') {
-                                        return result.then(connectionResource.bind(function(connection) {
-                                            TraceContextManager.resume(ctx.id);
-                                            ctx.elapsed = Date.now() - ctx.start_time;
-
-                                            if (connection && !connection.__query_hook__) {
-                                                connection.__query_hook__ = true;
-                                                hookConnectionMethods(connection, self.agent);
-                                            }
-
-                                            return connection;
-                                        }));
-                                    }
-
-                                    // 동기 처리
-                                    hookConnectionMethods(result, self.agent);
-                                    ctx.elapsed = Date.now() - ctx.start_time;
-                                    return result;
-                                });
-                            };
-                        });
-                        pool.getConnection.__whatap_wrapped__ = true;
-                    }
-                }
-
-                return pool;
-            };
-        });
-        mod.createPool.__whatap_wrapped__ = true;
-    }
-};
-
 exports.MariaObserver = MariaObserver;