whatap 0.4.80 → 0.4.82

package/lib/conf/config-default.js

@@ -42,7 +42,7 @@ var ConfigDefault = {
     "trace_activeserivce_yellow_time": 3000,
     "trace_activeservice_red_time": 8000,
     "trace_activeservice_hang_time": 6000,
-    
+
     "trace_httpc_normalize_urls": "",
     "log_ignore_set": null,
     "whatap.server.host": str('whatap_server_host',"127.0.0.1,127.0.0.1"),
@@ -71,7 +71,7 @@ var ConfigDefault = {
     "hook_method_ignore_prefixes": "get,set",
     "hook_method_ignore_classes": "",
     "profile_method_enabled": true,
-    
+
     "hook_service_patterns": "",
     "hook_httpc_patterns": "",
     "hook_httpc_info_patterns": "",
@@ -92,25 +92,30 @@ var ConfigDefault = {
     "user_header_ticket": str('user_header_ticket',''),
     "user_header_ticket_enabled": bool('user_header_ticket_enabled',false),
     "trace_user_cookie_limit": 2048,
+    "trace_sql_error_stack": bool('trace_sql_error_stack', false),
+    "trace_sql_error_depth": num('trace_sql_error_depth', 50),
+    "transaction_status_error_enable": bool("transaction_status_error_enable", true),
 
-    "profile_error_sql_time_max": 30000,
+    "profile_error_sql_time_max": num("profile_error_sql_time_max", 30000),
+    "profile_error_step_enabled": bool('profile_error_step_enabled', true),
     "hook_direct_patch_classes": "",
-    
+
     "log_rotation_enabled": bool('log_rotation_enabled',true),
+    "log_oname_enabled": bool('log_oname_enabled',false),
     "log_keep_days": num('log_keep_days' , 7),
     "log_print_enabled": bool('log_print_enabled',true),
     "log_file_enabled" : bool('log_file_enabled',true),
     "thread_dump_enabled": bool('thread_dump_enabled',false),
     "debug_cpu_enabled": bool('debug_cpu_enabled',false),
-    
+
     "cipher_net_enabled": true,
     "cipher_level": 2,
     'cypher_level': 128,
     "boot_redefine_size": 100,
-    
+
     "counter_interval": 5000,
     "CONFIG_INITED": true,
-    
+
     // "_profile_position_httpc_hash": 0,
     // "profile_position_httpc": "",
     // "_profile_position_sql_hash": 0,
@@ -126,7 +131,9 @@ var ConfigDefault = {
     "trace_active_transaction_hang_time" : num('trace_active_transaction_hang_time', 30000),
     "realtime_user_thinktime_max" : 300000,
     "trace_service_port_enabled" :  bool('trace_service_port_enabled',false),
-    
+    "ignore_http_method": str('ignore_http_method', 'PATCH,OPTIONS,HEAD,TRACE'),
+    "status_ignore": str('status_ignore', ''),
+    "status_ignore_set": str('status_ignore_set', ''),
     "trace_sql_normalize_enabled" : true,
 
     //2017.05.02 AUTO ONAME
@@ -173,25 +180,25 @@ var ConfigDefault = {
     "whatap_micro_enabled": bool('whatap_micro_enabled',false),
     "master_agent_host": str('master_agent_host', 'whatap-master-agent.whatap-monitoring.svc.cluster.local'),
     "master_agent_port": num('master_agent_port', 6600),
-    "enabled_master_agent_call": bool('enabled_master_agent_call' , false), 
+    "enabled_master_agent_call": bool('enabled_master_agent_call' , false),
 
     "simula_agent_count": num('simula_agent_count', 0),
     "correction_factor_cpu": num('correction_factor_cpu', 1),
     "aws_ecs_enabled": bool('aws_ecs_enabled', true),
     "aws_ecs_stat_interval": num('aws_ecs_stat_interval', 3000),
-    
+
     // stat_service1_enabled
     "stat_service1_enabled": bool('stat_service1_enabled', true),
     "stat_mtrace_max_count": num('stat_mtrace_max_count', 7000),
 
     "_trace_mtrace_poid_key": str("mtrace_poid_key", "x-wtap-po"),
-	"_trace_mtrace_caller_key": str("mtrace_caller_key","x-wtap-mst"),
+    "_trace_mtrace_caller_key": str("mtrace_caller_key","x-wtap-mst"),
     "_trace_mtrace_spec_key1": str("mtrace_spec_key", "x-wtap-sp1"),
-    
+
     // add apdex 2020.11.13
     "apdex_time_t": num('apdex_time_t', 1200),
-	"apdex_time_4t": num('apdex_time_4t', 1200 * 4),
-	"debug_apdex_enabled": bool('debug_apdex_enabled', false),
+    "apdex_time_4t": num('apdex_time_4t', 1200 * 4),
+    "debug_apdex_enabled": bool('debug_apdex_enabled', false),
     "mtid_mtrace_enabled": bool('mtid_mtrace_enabled' , false),
 
     // debug add

package/lib/logger.js

@@ -149,7 +149,11 @@
      },
      build : function (id, message) {
          var str = DateUtil.datetime(Date.now());
-         str += ' [';
+         // str += ' ';
+         // if(conf.getProperty('log_oname_enabled') && this.ONAME) {
+         //     str += '['  + this.ONAME + ']'
+         // }
+         str += '[';
          str += id;
          str += '] <' + PID + '> ';
          str += message;

package/lib/observers/http-observer.js

@@ -39,10 +39,15 @@ var TraceContextManager = require('../trace/trace-context-manager'),
 
 var _exts=new Set([".css",".js",".png", ".htm", ".html", ".gif", ".jpg", ".css", ".txt", ".ico"]);
 
-var configIpHeaderKey = conf.trace_http_client_ip_header_key;
-var configUserAgentKey = undefined;
-var configRefererKey = undefined;
-var trace_origin_url = conf.trace_origin_url;
+var configIpHeaderKey = conf.getProperty('trace_http_client_ip_header_key', 'x-forwarded-for');
+var configUserAgentKey = conf.getProperty('trace_user_agent_header_key', '');
+var configRefererKey = conf.getProperty('trace_referer_header_key', '');
+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 status_ignore_set = conf.getProperty('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;
 });
@@ -64,7 +69,21 @@ conf.on('trace_referer_header_key', function (newProps) {
 conf.on('trace_origin_url', function (newProps) {
     trace_origin_url = newProps;
 })
-
+conf.on('ignore_http_method', function (newProps) {
+    ignore_http_method = newProps;
+})
+conf.on('transaction_status_error_enable', function (newProps) {
+    transaction_status_error_enable = newProps;
+})
+conf.on('status_ignore', function (newProps) {
+    status_ignore = !newProps ? "" : String(newProps);
+})
+conf.on('status_ignore_set', function (newProps) {
+    status_ignore_set = newProps;
+})
+conf.on('profile_error_step_enabled', function (newProps) {
+    profile_error_step_enabled = newProps;
+})
 var staticConents = function (newProps) {
     var x=new Set();
     var words = !newProps?[]:newProps.split(',');
@@ -78,7 +97,7 @@ var staticConents = function (newProps) {
             }
         }
     }
-    
+
     _exts =x;
 };
 conf.on('web_static_content_extensions', staticConents);
@@ -95,64 +114,79 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
     var aop = this.agent.aop;
 
     return function (req, res) {
-        var ctx = initCtx(req, res);
-        if( ctx == null ) { return callback(req, res); }
-        
-        PluginLoaderManager.do('httpservicestart', ctx, req, res);
-        if(trace_origin_url === true){
-            var originUrlHash = HashUtil.hashFromString('Origin url');
-            var step = new MessageStep();
-            step.hash = originUrlHash;
-            step.start_time = ctx.getElapsedTime();
-            step.desc = req.url;
-            
-            DataTextAgent.MESSAGE.add(originUrlHash, 'Origin url');
-            ctx.profile.add(step);
-        }
+        TraceContextManager._asyncLocalStorage.run(initCtx(req, res), () => {
+            var ctx = TraceContextManager._asyncLocalStorage.getStore();
+            if(!ctx) {
+                return callback(req, res);
+            }
 
-        aop.after(res, 'end', function(obj, args) {
-            if(TraceContextManager.resume(ctx._id) == null) { return; }
-            PluginLoaderManager.do('httpserviceend', ctx, req, res);
+            PluginLoaderManager.do('httpservicestart', ctx, req, res);
+            if(trace_origin_url === true){
+                var originUrlHash = HashUtil.hashFromString('Origin url');
+                var step = new MessageStep();
+                step.hash = originUrlHash;
+                step.start_time = ctx.getElapsedTime();
+                // step.desc = req.url;
 
-            ctx.isStaticContents = isStatic(req.url);
-            ctx.http_method = req.method;
-            if(conf.profile_http_querystring_enabled){
-                ctx.http_query = JSON.stringify(req.query);
-            }
-            ctx.http_content_type = (req.headers['content_type'] || '');
-            ctx.status = Math.floor(obj.statusCode / 100);
-
-            // 에러가 발생했지만 스택수집안했을 경우
-            if (ctx.status >= 4 && ctx.error.isZero()) {
-                ctx.error = StatError.addError(obj.statusCode, obj.statusMessage,
-                     ctx.service_hash);
-                ctx.statusCode = obj.statusCode;
-                ctx.statusMessage = obj.statusMessage;
+                DataTextAgent.MESSAGE.add(originUrlHash, 'Origin url');
+                ctx.profile.add(step);
             }
 
-            self.__endTransaction(null, ctx, req, res);
-        });
+            aop.after(res, 'end', function(obj, args) {
+                if(ctx == null) { return; }
+                PluginLoaderManager.do('httpserviceend', ctx, req, res);
 
-        try {
-            return callback.apply(this, arguments);
-        } catch (e) {
-            Logger.printError("WHATAP-606", 'Hooking request failed..', e, false);
-            self.__endTransaction(e, ctx, req, res);
-            throw e;
-        }
+                ctx.isStaticContents = isStatic(req.url);
+                ctx.http_method = req.method;
+                if(conf.profile_http_querystring_enabled){
+                    ctx.http_query = JSON.stringify(req.query);
+                }
+                ctx.http_content_type = (req.headers['content_type'] || '');
+                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);
+                    ctx.statusCode = obj.statusCode;
+                    ctx.statusMessage = obj.statusMessage;
+                }
+
+                var requestPath = '';
+                if(req.route && req.route.path)
+                    requestPath = req.route.path;
+                var is_ignore = shouldIgnoreError(res.statusCode, requestPath, status_ignore, status_ignore_set);
+                if(!is_ignore)
+                    self.__endTransaction(null, ctx, req, res);
+                else{
+                    TraceContextManager.end(ctx._id);
+                    ctx = null;
+                }
+            });
+
+            try {
+                return callback.apply(this, arguments);
+            } catch (e) {
+                Logger.printError("WHATAP-606", 'Hooking request failed..', e, false);
+                self.__endTransaction(e, ctx, req, res);
+                throw e;
+            }
+        });
     };
+
 };
 
 function isStatic(u){
     var x = u.lastIndexOf('.');
     if(x<=0) return false;
-    
+
     var ext = u.substring(x);
     return _exts.has(ext);
 }
 function initCtx(req, res) {
     /*url이 없으면 추적하지 않는다*/
     if(req.url == null) { return null; }
+    if(ignore_http_method && ignore_http_method.toUpperCase().split(',').includes(req.method)) { return null; }
 
     var ctx = TraceContextManager.start();
     if(ctx == null) { return null; }
@@ -211,6 +245,7 @@ function initCtx(req, res) {
         DataTextAgent.HTTP_DOMAIN.add(ctx.http_host_hash, ctx.http_host);
     }
 
+    ctx.originUrl = req.url;
     ctx.start_malloc = ResourceProfile.getUsedHeapSize();
     ctx.start_cpu = ResourceProfile.getCPUTime();
     ctx.http_method = req.method;
@@ -229,7 +264,7 @@ function initCtx(req, res) {
                 MeterUsers.add(ctx.userid);
                 break;
             case 2:
-               // MeterUsers.add(ctx.userid);
+                // MeterUsers.add(ctx.userid);
                 break;
             case 3:
                 ctx.userid = UserIdUtil.getUserId(req, res, 0);
@@ -239,9 +274,9 @@ function initCtx(req, res) {
 
     } catch (e) {
     }
-    /************************************/ 
+    /************************************/
     /*   Header / param Trace           */
-    /************************************/ 
+    /************************************/
     var header_enabled = false;
     if(conf.profile_http_header_enabled === true && req.headers) {
         header_enabled = true;
@@ -250,7 +285,7 @@ function initCtx(req, res) {
             header_enabled = false;
         }
     }
-    
+
     if(header_enabled) {
         var step = new MessageStep();
         step.hash = HashUtil.hashFromString("HTTP-HEADERS");
@@ -259,9 +294,9 @@ function initCtx(req, res) {
         DataTextAgent.MESSAGE.add(step.hash, "HTTP-HEADERS");
         ctx.profile.push(step);
     }
-    /************************************/ 
+    /************************************/
     /*   Multi Server Transaction Trace */
-    /************************************/ 
+    /************************************/
     if(conf.mtrace_enabled) {
         var poid=req.headers['x-wtap-po'];
         if (poid != null) {
@@ -282,6 +317,13 @@ function initCtx(req, res) {
                                     ctx.mcaller_txid = Hexa32.toLong32(mt_caller.substring(y + 1));
                                 } else {
                                     ctx.mcaller_txid = Hexa32.toLong32(mt_caller.substring(y + 1, z));
+
+                                    var z2 = mt_caller.indexOf(',', z + 1);
+                                    if (z2 < 0) {
+                                        ctx.mcaller_stepId = Hexa32.toLong32(mt_caller.substring(z + 1));
+                                    } else {
+                                        ctx.mcaller_stepId = Hexa32.toLong32(mt_caller.substring(z + 1, z2));
+                                    }
                                 }
                             }
                         }
@@ -300,7 +342,7 @@ function initCtx(req, res) {
             }
         }
     }
-    
+
     return ctx;
 };
 
@@ -330,7 +372,16 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         DataTextAgent.MESSAGE.add(step.hash, "HTTP-PARAMETERS");
         ctx.profile.push(step);
     }
-    
+
+    if(profile_error_step_enabled && ctx.statusMessage){
+        var step = new MessageStep();
+        step.hash = HashUtil.hashFromString("EXCEPTION");
+        step.start_time = ctx.getElapsedTime();
+        step.desc = ctx.statusMessage;
+        DataTextAgent.MESSAGE.add(step.hash, "EXCEPTION");
+        ctx.profile.push(step);
+    }
+
     if(error) {
         TraceContextManager.end(ctx != null ? ctx._id : null);
         ctx = null;
@@ -368,6 +419,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         wtx.cpuTime = ResourceProfile.getCPUTime() - ctx.start_cpu;
         wtx.malloc = ResourceProfile.getUsedHeapSize()-ctx.start_malloc;
         if(wtx.malloc < 0) { wtx.malloc = 0; }
+        wtx.originUrl = ctx.originUrl;
 
         wtx.seq = ctx.txid;
         wtx.sqlCount = ctx.sql_count;
@@ -380,7 +432,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         if (ctx.error.isZero() === false) {
             wtx.error = ctx.error;
             wtx.errorLevel = EventLevel.WARNING;
-        } 
+        }
         wtx.userAgent = ctx.userAgent;
         wtx.referer = ctx.referer;
 
@@ -393,21 +445,22 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         wtx.mtid=ctx.mtid;
         wtx.mdepth=ctx.mdepth;
         wtx.mcaller=ctx.mcaller_txid;
+        wtx.mcallerStepId = ctx.mcaller_stepId;
         wtx.mcaller_pcode = ctx.mcaller_pcode;
         wtx.mcaller_okind = ctx.mcaller_okind;
         wtx.mcaller_oid = ctx.mcaller_oid;
 
-        MeterService.add(wtx.service, wtx.elapsed, 
+        MeterService.add(wtx.service, wtx.elapsed,
             wtx.errorLevel, ctx.mcaller_pcode, ctx.mcaller_okind, ctx.mcaller_oid);
 
         profile.oid = SecurityMaster.OID;
         profile.service = wtx;
-        if(Boolean(conf.reqlog_enabled) == true) { 
+        if(Boolean(conf.reqlog_enabled) == true) {
             ctx.endTime = wtx.endTime;
             ctx.elapsed = wtx.elapsed;
             RequestLog.setRecord(ctx);
         }
-        //duplicated executed... so end() first 
+        //duplicated executed... so end() first
         TraceContextManager.end(ctx._id);
         setTimeout(function () {
             DataProfileAgent.sendProfile(ctx, profile, false);
@@ -428,14 +481,14 @@ function transferPOID(ctx) {
     if (transfer_poid)
         return transfer_poid;
     transfer_poid=Hexa32.toString32(SecurityMaster.PCODE)+','
-    +Hexa32.toString32(SecurityMaster.OKIND)+','+Hexa32.toString32(SecurityMaster.OID);
+        +Hexa32.toString32(SecurityMaster.OKIND)+','+Hexa32.toString32(SecurityMaster.OID);
     return transfer_poid;
 }
 
 function transferMTID_CALLERTX(ctx) {
     if (ctx.transfer_id)
         return ctx.transfer_id;
-    var x = Hexa32.toString32(ctx.mtid) + ',' + (ctx.mdepth + 1) + ',' + Hexa32.toString32(ctx.txid);   
+    var x = Hexa32.toString32(ctx.mtid) + ',' + (ctx.mdepth + 1) + ',' + Hexa32.toString32(ctx.txid);
     ctx.transfer_id = x;
     return ctx.transfer_id;
 }
@@ -515,7 +568,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
 
     aop.before(mod.Server.prototype, ['on', 'addListener'], function (obj, args) {
         if(args[0] !== 'request') {return;}
-        
+
         args[args.length-1] = self.__createTransactionObserver(args[args.length-1],
             moduleName === 'https', obj);
     });
@@ -535,7 +588,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             if(moduleName === 'http' && args[0].__isHttps) {
                 isHttpsRepeat = true;
             }
-            
+
             if(!isHttpsRepeat) {
                 try {
                     if(args[0].method === 'OPTION') {
@@ -543,12 +596,12 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                     }
 
                     var dataConsumption = false;
-                   
+
                     if(args.length > 0) {
                         var info = args[0];
-                        
-                        interTxTraceAutoOn(ctx);                        
-            
+
+                        interTxTraceAutoOn(ctx);
+
                         if(conf.mtrace_enabled){
                             if(info.headers){
                                 info.headers['x-wtap-po']=transferPOID(ctx);
@@ -560,8 +613,8 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                             if(conf.stat_mtrace_enabled){
                                 info.headers[conf._trace_mtrace_spec_key1]=transferSPEC_URL(ctx);
                             }
-                            if(conf.mtid_mtrace_enabled && ctx.mtid.isZero()===false){   
-                                info.headers[conf._trace_mtrace_caller_key]=transferMTID_CALLERTX(ctx);  
+                            if(conf.mtid_mtrace_enabled && ctx.mtid.isZero()===false){
+                                info.headers[conf._trace_mtrace_caller_key]=transferMTID_CALLERTX(ctx);
                             }
 
                         }
@@ -569,11 +622,11 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                         ctx.httpc_host = info.host || info.hostname || '';
                         ctx.httpc_port = info.port || -1;
                     }
-                    ctx.footprint('Http Call Start'); 
+                    ctx.footprint('Http Call Start');
 
                     if (ctx.httpc_port < 0) { ctx.httpc_port = 80 };
 
-                } catch(e) { 
+                } catch(e) {
                     return Logger.printError('WHATAP-852', 'Http Repeat ', e, true);
                 }
 
@@ -608,12 +661,12 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
 
             ret.on('response', function(response){
                 var statusCode = response.statusCode;
-                if(statusCode >= 400){
+                if(transaction_status_error_enable && statusCode >= 400){
                     if (step.error.isZero()) {
                         step.error = StatError.addError(statusCode, response.statusMessage , ctx.service_hash,
                             TextTypes.HTTPC_URL, step.url);
-                        if (ctx.error.isZero()) { 
-                            ctx.error = step.error; 
+                        if (ctx.error.isZero()) {
+                            ctx.error = step.error;
                             ctx.statusCode = statusCode;
                             ctx.statusMessage = response.statusMessage;
                         }
@@ -623,11 +676,11 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             ret.on('error', function(err) {
                 if (TraceContextManager.resume(ctx._id) == null) { return; }
 
-                if (step.error.isZero()) {
+                if (transaction_status_error_enable && step.error.isZero()) {
                     step.error = StatError.addError(err.code, err.message, ctx.service_hash,
                         TextTypes.HTTPC_URL, step.url);
-                    if (ctx.error.isZero()) { 
-                        ctx.error = step.error; 
+                    if (ctx.error.isZero()) {
+                        ctx.error = step.error;
                         ctx.statusCode = err.code;
                         ctx.statusMessage = err.message;
                     }
@@ -656,7 +709,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                     }
                 }
             });
-            
+
             aop.before(ret, 'end', function (obj, args) {
                 ctx.active_httpc_hash = step.url;
                 ctx.profile.push(step);
@@ -670,13 +723,13 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                         TraceContextManager.resume(ctx._id);
                         endHttpc(ctx, step);
                     });
-                    
+
                     socket.on('timeout', function () {
                         if (TraceContextManager.resume(ctx._id) == null) { return; }
                         if (step.error.isZero()) {
                             var msgObj = { 'class': 'Timeout', 'msg': 'Timeout' };
                             step.error = StatError.addError('Timeout','Timeout', ctx.service_hash);
-                            if (ctx.error.isZero()) {
+                            if (transaction_status_error_enable && ctx.error.isZero()) {
                                 ctx.error = step.error;
                                 ctx.statusCode = 'Timeout';
                                 ctx.statusMessage = 'Timeout';
@@ -688,7 +741,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             });
         });
 
-    function endHttpc(ctx, step) {  
+    function endHttpc(ctx, step) {
         if(ctx == null || step == null) { return; }
 
         step.elapsed = ctx.getElapsedTime() - step.start_time;
@@ -698,8 +751,27 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
 
         MeterHttpC.add(step.host, step.elapsed, step.error.isZero()===false);
         StatHttpc.addHttpcTime(ctx.service_hash, step.url, step.host, step.port, step.elapsed, step.error.isZero()===false);
-        ctx.footprint('Http Call Done'); 
+        ctx.footprint('Http Call Done');
     }
 };
 
+function shouldIgnoreError(statusCode, url, statusCodeIgnore, statusIgnoreSet) {
+    if (statusCodeIgnore) {
+        var ignoreCodes = statusCodeIgnore.split(',');
+        if (ignoreCodes.includes(String(statusCode))) {
+            return true;
+        }
+    }
+
+    if (statusIgnoreSet) {
+        var ignoreSet = statusIgnoreSet.split(',');
+        var setValue = url + ":" + statusCode;
+        if (ignoreSet.includes(setValue)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 exports.HttpObserver = HttpObserver;

package/lib/observers/maria-observer.js

@@ -22,7 +22,8 @@
     Logger              = require('../logger'),
     conf                = require('../conf/configure'),
     DateUtil            = require('../util/dateutil'),
-    Buffer              = require('buffer').Buffer;
+    Buffer              = require('buffer').Buffer,
+    MessageStep = require("../step/message-step");
 
 var MariaObserver = function (agent) {
  this.agent = agent;
@@ -101,6 +102,21 @@ var queryHook = function (dbc_hash, agent) {
 
          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; }