whatap 0.4.84 → 0.4.85

package/lib/counter/counter-manager.js

@@ -91,7 +91,7 @@ CounterManager.prototype.process = function (tasks) {
         if (ctx.getElapsedTime() > conf.profile_max_time) {
             //TraceContextManager.end(ctx._id);
             var obj = TraceContextManager.resume(ctx._id);
-            TraceContextManager.addStep("Lost Connection","");
+            TraceContextManager.addStep("Lost Connection","", ctx);
             //ctx.status = 5;
             //ctx.error = StatError.addError(500, "Lost Connection", ctx.service_hash);
             TraceContextManager.endTrace(ctx);

package/lib/observers/http-observer.js

@@ -46,7 +46,9 @@ var trace_origin_url = conf.getProperty('trace_origin_url', false);
 var ignore_http_method = conf.getProperty('ignore_http_method', 'PATCH,OPTIONS,HEAD,TRACE');
 var transaction_status_error_enable = conf.getProperty('transaction_status_error_enable', true);
 var status_ignore = conf.getProperty('status_ignore', '');
+var httpc_status_ignore = conf.getProperty('httpc_status_ignore', '');
 var status_ignore_set = conf.getProperty('status_ignore_set', '');
+var httpc_status_ignore_set = conf.getProperty('httpc_status_ignore_set', '');
 var profile_error_step_enabled = conf.getProperty('profile_error_step_enabled', '');
 conf.on('trace_http_client_ip_header_key', function(newProperty) {
     configIpHeaderKey = newProperty;
@@ -78,9 +80,15 @@ conf.on('transaction_status_error_enable', function (newProps) {
 conf.on('status_ignore', function (newProps) {
     status_ignore = !newProps ? "" : String(newProps);
 })
+conf.on('httpc_status_ignore', function (newProps) {
+    httpc_status_ignore = !newProps ? "" : String(newProps);
+})
 conf.on('status_ignore_set', function (newProps) {
     status_ignore_set = newProps;
 })
+conf.on('httpc_status_ignore_set', function (newProps) {
+    httpc_status_ignore_set = newProps;
+})
 conf.on('profile_error_step_enabled', function (newProps) {
     profile_error_step_enabled = newProps;
 })
@@ -155,7 +163,13 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
                 var requestPath = '';
                 if(req.route && req.route.path)
                     requestPath = req.route.path;
-                var is_ignore = shouldIgnoreError(res.statusCode, requestPath, status_ignore, status_ignore_set);
+                var is_ignore;
+                if(ctx.is_httpc_error){
+                    is_ignore = shouldIgnoreError(res.statusCode, requestPath, httpc_status_ignore, httpc_status_ignore_set);
+                } else {
+                    is_ignore = shouldIgnoreError(res.statusCode, requestPath, status_ignore, status_ignore_set);
+                }
+
                 if(!is_ignore)
                     self.__endTransaction(null, ctx, req, res);
                 else{
@@ -675,6 +689,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             })
             ret.on('error', function(err) {
                 if (TraceContextManager.resume(ctx._id) == null) { return; }
+                ctx.is_httpc_error = true;
 
                 if (transaction_status_error_enable && step.error.isZero()) {
                     step.error = StatError.addError(err.code, err.message, ctx.service_hash,

package/lib/observers/maria-observer.js

@@ -4,7 +4,7 @@
  * can be found in the LICENSE file.
  */
 
- var TraceContextManager = require('../trace/trace-context-manager'),
+var TraceContextManager = require('../trace/trace-context-manager'),
     ParsedSql           = require('../trace/parsed-sql'),
     SqlStepX            = require('../step/sql-stepx'),
     DBCStep             = require('../step/dbc-step'),
@@ -26,332 +26,310 @@
     MessageStep = require("../step/message-step");
 
 var MariaObserver = function (agent) {
- this.agent = agent;
- this.packages = ['mariadb/callback'];
+    this.agent = agent;
+    this.packages = ['mariadb'];
 };
 
-var queryHook = function (dbc_hash, agent) {
-
- return function (obj, args) {
-     var ctx = TraceContextManager.getCurrentContext();
-
-     if (ctx == null || args[0] == null) { return; }
-     if(args[0].sql == null && typeof args[0] != 'string') { return; }
-
-     var sql_step = new SqlStepX();
-     sql_step.start_time = ctx.getElapsedTime();
-     ctx.profile.push(sql_step);
-
-     ctx.footprint('Maria Query Start'); 
-
-     ctx.sql_count++;
-
-     var sql = args.length > 0 ? args[0] : undefined,
-         psql = null;
-
-     if(typeof sql !== 'string') {
-         sql = args[0].sql || undefined;
-     }
-
-     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);
-     }
-
-     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;
-     }
-
-     var lastCallback = false;
-
-     function queryCallback(obj, args) {
-         if (ctx == null) { return; }
-         TraceContextManager.resume(ctx._id);
-
-         if(args[0]) {
-             try{
-                 if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
-                     var traceDepth = conf.trace_sql_error_depth;
-
-                     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; }
+var queryHook = function (dbc, agent) {
+
+    return function (obj, args) {
+        var ctx = TraceContextManager.getCurrentContext();
+
+        if (ctx == null || args[0] == null) { return; }
+        if(args[0].sql == null && typeof args[0] != 'string') { return; }
+
+        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)
+
+        dbc_step.hash = dbc_hash;
+        dbc_step.start_time = ctx.getElapsedTime();
+        ctx.profile.push(dbc_step);
+
+        var sql_step = new SqlStepX();
+        sql_step.start_time = ctx.getElapsedTime();
+        ctx.profile.push(sql_step);
+
+        ctx.footprint('Maria Query Start');
+
+        ctx.sql_count++;
+
+        var sql = args.length > 0 ? args[0] : undefined,
+            psql = null;
+
+        if(typeof sql !== 'string') {
+            sql = args[0].sql || undefined;
+        }
+
+        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);
+        }
+
+        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;
+        }
+
+        var lastCallback = false;
+
+        function queryCallback(obj, args) {
+            if (ctx == null) { return; }
+            TraceContextManager.resume(ctx._id);
+
+            if(args[0]) {
+                try{
+                    if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
+                        var traceDepth = conf.trace_sql_error_depth;
+
+                        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) {
+
                 }
-             }catch(e) {
-
-             }
-         }
-
-         sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
-         ctx.sql_time += sql_step.elapsed;
-
-         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);
-         }
-
-         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);
-         }
-     }
-
-     lastCallback = agent.aop.functionHook(args, -1, queryCallback);
-
-     if(lastCallback === false && args.length>0 && args[0]._callback){
-         agent.aop.both(args[0], '_callback', queryCallback);
-     }
- }
+            }
+
+            sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
+            ctx.sql_time += sql_step.elapsed;
+
+            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);
+            }
+
+            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);
+            }
+        }
+
+        lastCallback = agent.aop.functionHook(args, -1, queryCallback);
+
+        if(lastCallback === false && args.length>0 && args[0]._callback){
+            agent.aop.both(args[0], '_callback', queryCallback);
+        }
+    }
 };
 
 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;
- }
+    if(p == null || p.length === 0) {
+        return null;
+    }
+    try{
+        return ParamSecurity.encrypt(Buffer.from(p), crc);
+    } catch(e) {
+        return null;
+    }
 };
 
 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, ctx.service_hash, step.dbc, step.hash, step.elapsed, true, 0);
-     }
-
-     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*/
+    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, ctx.service_hash, step.dbc, step.hash, step.elapsed, true, 0);
+        }
+
+        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) {
-     }
- }
+        } catch(e) {
+        }
+    }
 };
 
 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;
-
- if( conf.sql_enabled === false ) { return; }
- var dbc_hash=0;
- aop.both(mod, 'createConnection',
-     function (obj, args, lctx) {
-         var ctx = lctx.context;
-         if(ctx == null || ctx.db_opening) { return; }
-         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){
-             var dbc;
-             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);
-             }
-         }
-
-         aop.both(ret, 'query', queryHook(dbc_hash, self.agent), function (obj, args, ret, lctx) {
-             var ctx = lctx.context;
-             TraceContextManager.resume(ctx);
-         });
-         
-         aop.both(ret, 'execute', queryHook(dbc_hash, 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; }
-         
-         TraceContextManager.resume(ctx);
-         ctx.footprint('Maria Connecting Done'); 
-         ctx.db_opening = false;
-         step.hash = dbc_hash;
-
-         aop.both(ret, 'connect', function (obj, args) {
-                 var ctx = TraceContextManager.getCurrentContext();
-                 if (ctx == null) { return; }
-
-               ctx.footprint('Maria Connecting Start');
-
-                 ctx.db_opening=true;
-
-                 aop.functionHook(args, -1, function (obj, args) {
-                     if (args[0] && step.error.isZero()) {
-                         step.error = StatError.addError('Maria-'+args[0].code, 
-                             args[0].message, ctx.service_hash);
-                         step.elapsed = ctx.getElapsedTime() - step.start_time;
-                     }
-                     TraceContextManager.resume(ctx._id);
-                 });
-                 ctx.profile.push(step);
-             }
-             ,
-             function (obj, args, ret, lctx) {
-                 if(lctx.context){
-                     ctx.db_opening=false;
-                     ctx.footprint('Maria Connecting Done');
-                 }
-             }
-         );
-     });
-
-     
- var dbc_pool_hash=0;
- aop.after(mod, ['createPool', 'createPoolCluster'], function (obj, args, ret) {
-
-     var dbc = 'maria://';
-     if(dbc_pool_hash==0){
-         if(args.length > 0) {
-             var info = args[0];
-             //Open [DatabaseName] connection 메세지 보여줄때 필요함.
-             dbc += info.user || '';
-             dbc += "@";
-             dbc += info.host || '';
-             dbc += '/';
-             dbc += info.database || '';
-         }
-
-         dbc_pool_hash = HashUtil.hashFromString(dbc);
-         DataTextAgent.DBC.add(dbc_pool_hash, dbc);
-         DataTextAgent.METHOD.add(dbc_pool_hash, dbc);
-         DataTextAgent.ERROR.add(dbc_pool_hash, dbc);
-     }
-     aop.both(ret, 'getConnection', function (obj, args, lctx) {
-         var ctx = TraceContextManager.getCurrentContext();
-         if(ctx == null) {return;}
-
-         var dbc_step = new DBCStep();
-         dbc_step.hash = dbc_pool_hash;
-         dbc_step.start_time = ctx.getElapsedTime();
-         
-         aop.functionHook(args, -1, function (obj, args) {
-             dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
-             ctx.profile.push(dbc_step);
-             
-             TraceContextManager.resume(ctx._id);
-             DataTextAgent.DBC.add(dbc_hash, dbc);
-
-             if(args[0] != null) { return; }
-             var conn = args[1];
-             if(conn.__query_hook__) { return; }
-             conn.__query_hook__ = true;
-             aop.before(conn, 'query', queryHook(dbc_pool_hash, self.agent));
-             aop.before(conn, 'execute', queryHook(dbc_pool_hash, self.agent));
-             aop.before(conn._protocol, '_delegateError', errorDelegate(ctx));
-         });
-     }, function (obj, args, ret, lctx) {
-         MeterSql.setConnection(1, 0, dbc);
-     });
- });
+    if (mod.__whatap_observe__) {
+        return;
+    }
+    mod.__whatap_observe__ = true;
+    Logger.initPrint("MariaObserver");
+    var self = this;
+    var aop = self.agent.aop;
+
+    if (conf.sql_enabled === false) {
+        return;
+    }
+
+    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;
+            }
+            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);
+                }
+            }
+
+            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;
+            }
+
+            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 || '';
+            }
+        }
+
+        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);
+                });
+            })
+        })
+    });
 };
 
 var checkedSql = new IntKeyMap(2000).setMax(2000);
@@ -359,41 +337,41 @@ var nonLiteSql = new IntKeyMap(5000).setMax(5000);
 var date = DateUtil.yyyymmdd();
 
 function escapeLiteral(sql) {
- if(sql == null) { sql = ''; }
-
- if(date !== DateUtil.yyyymmdd()) {
-    checkedSql.clear();
-    nonLiteSql.clear();
-    date = DateUtil.yyyymmdd();
-    Logger.print('WHATAP-SQL-CLEAR', 'MariaObserver CLEAR OK!!!!!!!!!!!!!!!!', false);
- }
-
- var sqlHash = HashUtil.hashFromString(sql);
- var psql = nonLiteSql.get(sqlHash);
-
- if(psql != null) {
-     return psql;
- }
- psql = checkedSql.get(sqlHash);
-
- if(psql != null) {
-     return psql;
- }
-
- var els = new EscapeLiteralSQL(sql);
- els.process();
-
- var hash = HashUtil.hashFromString(els.getParsedSql());
- DataTextAgent.SQL.add(hash, els.getParsedSql());
-
- if(hash === sqlHash) {
-     psql = new ParsedSql(els.sqlType, hash, null);
-     nonLiteSql.put(sqlHash, psql);
- } else {
-     psql = new ParsedSql(els.sqlType, hash, els.getParameter());
-     checkedSql.put(sqlHash, psql);
- }
- return psql;
+    if(sql == null) { sql = ''; }
+
+    if(date !== DateUtil.yyyymmdd()) {
+        checkedSql.clear();
+        nonLiteSql.clear();
+        date = DateUtil.yyyymmdd();
+        Logger.print('WHATAP-SQL-CLEAR', 'MariaObserver CLEAR OK!!!!!!!!!!!!!!!!', false);
+    }
+
+    var sqlHash = HashUtil.hashFromString(sql);
+    var psql = nonLiteSql.get(sqlHash);
+
+    if(psql != null) {
+        return psql;
+    }
+    psql = checkedSql.get(sqlHash);
+
+    if(psql != null) {
+        return psql;
+    }
+
+    var els = new EscapeLiteralSQL(sql);
+    els.process();
+
+    var hash = HashUtil.hashFromString(els.getParsedSql());
+    DataTextAgent.SQL.add(hash, els.getParsedSql());
+
+    if(hash === sqlHash) {
+        psql = new ParsedSql(els.sqlType, hash, null);
+        nonLiteSql.put(sqlHash, psql);
+    } else {
+        psql = new ParsedSql(els.sqlType, hash, els.getParameter());
+        checkedSql.put(sqlHash, psql);
+    }
+    return psql;
 }
 
 exports.MariaObserver = MariaObserver;

package/lib/observers/mssql-observer.js

@@ -70,6 +70,11 @@ MssqlObserver.prototype.inject = function (mod, modName) {
                         }
                     }
                 }
+                var dbc_step = new DBCStep();
+                dbc_step.hash = dbc_hash;
+                dbc_step.start_time = ctx.getElapsedTime();
+                ctx.profile.push(dbc_step);
+
                 sql_step.dbc = dbc_hash;
 
                 try {

package/lib/observers/mysql-observer.js

@@ -30,7 +30,7 @@ var MysqlObserver = function (agent) {
     this.packages = ['mysql', 'mysql2'];
 };
 
-var queryHook = function (dbc_hash, agent) {
+var queryHook = function (dbc, agent) {
 
     return function (obj, args) {
         var ctx = TraceContextManager.getCurrentContext();
@@ -42,6 +42,16 @@ var queryHook = function (dbc_hash, agent) {
             return;
         }
 
+        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)
+
+        dbc_step.hash = dbc_hash;
+        dbc_step.start_time = ctx.getElapsedTime();
+        ctx.profile.push(dbc_step);
+
         var sql_step = new SqlStepX();
         sql_step.start_time = ctx.getElapsedTime();
         ctx.profile.push(sql_step);
@@ -261,6 +271,7 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
     }
 
     var dbc_hash = 0;
+    var dbc = 'mysql://';
     aop.both(mod, 'createConnection',
         function (obj, args, lctx) {
             var ctx = lctx.context;
@@ -277,7 +288,6 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
         function (obj, args, ret, lctx) {
 
             if (dbc_hash === 0) {
-                var dbc;
                 if (args.length > 0) {
                     var info = (args[0] || {});
                     dbc = 'mysql://';
@@ -293,12 +303,12 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
                 }
             }
 
-            aop.both(ret, 'query', queryHook(dbc_hash, self.agent), function (obj, args, ret, lctx) {
+            aop.both(ret, 'query', queryHook(dbc, self.agent), function (obj, args, ret, lctx) {
                 var ctx = lctx.context;
                 TraceContextManager.resume(ctx);
             });
 
-            aop.both(ret, 'execute', queryHook(dbc_hash, self.agent), function (obj, args, ret, lctx) {
+            aop.both(ret, 'execute', queryHook(dbc, self.agent), function (obj, args, ret, lctx) {
                 var ctx = lctx.context;
                 TraceContextManager.resume(ctx);
             });
@@ -350,7 +360,6 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
 
     var dbc_pool_hash = 0;
     aop.after(mod, ['createPool', 'createPoolCluster'], function (obj, args, ret) {
-        var dbc = 'mysql://';
         if (dbc_pool_hash == 0) {
             if (args.length > 0) {
                 var info = args[0];
@@ -362,10 +371,10 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
                 dbc += info.database || '';
             }
 
-            dbc_pool_hash = HashUtil.hashFromString(dbc);
-            DataTextAgent.DBC.add(dbc_pool_hash, dbc);
-            DataTextAgent.METHOD.add(dbc_pool_hash, dbc);
-            DataTextAgent.ERROR.add(dbc_pool_hash, dbc);
+            // dbc_pool_hash = HashUtil.hashFromString(dbc);
+            // DataTextAgent.DBC.add(dbc_pool_hash, dbc);
+            // DataTextAgent.METHOD.add(dbc_pool_hash, dbc);
+            // DataTextAgent.ERROR.add(dbc_pool_hash, dbc);
         }
         aop.both(ret, 'getConnection', function (obj, args, lctx) {
             var ctx = TraceContextManager.getCurrentContext();
@@ -373,14 +382,7 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
                 return;
             }
 
-            var dbc_step = new DBCStep();
-            dbc_step.hash = dbc_pool_hash;
-            dbc_step.start_time = ctx.getElapsedTime();
-
             aop.functionHook(args, -1, function (obj, args) {
-                dbc_step.elapsed = ctx.getElapsedTime() - dbc_step.start_time;
-                ctx.profile.push(dbc_step);
-
                 TraceContextManager.resume(ctx._id);
                 DataTextAgent.DBC.add(dbc_hash, dbc);
 
@@ -392,8 +394,8 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
                     return;
                 }
                 conn.__query_hook__ = true;
-                aop.before(conn, 'query', queryHook(dbc_pool_hash, self.agent));
-                aop.before(conn, 'execute', queryHook(dbc_pool_hash, self.agent));
+                aop.before(conn, 'query', queryHook(dbc, self.agent));
+                aop.before(conn, 'execute', queryHook(dbc, self.agent));
                 aop.before(conn._protocol, '_delegateError', errorDelegate(ctx));
             });
         }, function (obj, args, ret, lctx) {

package/lib/trace/trace-context-manager.js

@@ -99,8 +99,8 @@ TraceContextManager.prototype.isExist = function (id) {
 };
 var DataTextAgent = require('../data/datatext-agent');
 var MessageStep = require('../step/message-step');
-TraceContextManager.prototype.addStep = function (title, desc) {
-    var ctx = this.getCurrentContext();
+TraceContextManager.prototype.addStep = function (title, desc, ctx) {
+    // var ctx = this.getCurrentContext();
     if(ctx == null) {
         return null;
     }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.84",
-  "releaseDate": "20231214",
+  "version": "0.4.85",
+  "releaseDate": "20240104",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},
@@ -11,7 +11,7 @@
   },
   "license": "UNLICENSED",
   "engines": {
-    "node": ">=v12.17.0"
+    "node": ">=v16.4.0"
   },
   "dependencies": {
     "crypto": "^1.0.1",