whatap 0.4.49 → 0.4.50

package/lib/conf/config-default.js

@@ -190,7 +190,34 @@ var ConfigDefault = {
     "mtid_mtrace_enabled": bool('mtid_mtrace_enabled' , false),
 
     // debug add
-    "network_debug_enabled" : bool('network_debug_enabled', false)
+    "network_debug_enabled" : bool('network_debug_enabled', false),
+    // reqlog add
+    "reqlog_rotation_enabled": true,
+    "reqlog_keep_days": 7,
+    "reqlog_enabled": false,
+    "reqlog_seperator" : str('reqlog_seperator', '|'),
+
+    "reqlog_x_etime" : bool('reqlog_x_etime', true),
+    "reqlog_x_elapsed" : bool('reqlog_x_elapsed', true),
+    "reqlog_x_url" : bool('reqlog_x_url', true),
+    "reqlog_x_httphost" : bool('reqlog_x_httphost', true),
+    "reqlog_x_method" : bool('reqlog_x_method', true),
+    "reqlog_x_ip" : bool('reqlog_x_ip', true),
+    "reqlog_x_wcid" : bool('reqlog_x_wcid', true),
+    "reqlog_x_status" : bool('reqlog_x_status', true),
+    "reqlog_x_error" : bool('reqlog_x_error', true),
+    "reqlog_x_errormsg" : bool('reqlog_x_errormsg', true),
+    "reqlog_x_useragent" : bool('reqlog_x_useragent', true),
+    "reqlog_x_txid" : bool('reqlog_x_txid', true),
+    "reqlog_x_custid" : bool('reqlog_x_custid', false),
+    "reqlog_x_gtid" : bool('reqlog_x_gtid', true),
+    "reqlog_x_mtid" : bool('reqlog_x_mtid', true),
+    "reqlog_x_mdepth" : bool('reqlog_x_mdepth', true),
+    "reqlog_x_httpc" : bool('reqlog_x_httpc', true),
+    "reqlog_x_sql" : bool('reqlog_x_sql', true),
+    "reqlog_x_dbc" : bool('reqlog_x_dbc', true),
+    "reqlog_x_login" : bool('reqlog_x_login', true),
+    "reqlog_x_rs" : bool('reqlog_x_rs', true),
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/core/agent.js

@@ -7,6 +7,7 @@
 var os = require('os'),
     fs = require('fs'),
     path = require('path');
+const RequestLog = require('../requestlog');
 
 var Interceptor      = require('./interceptor').Interceptor,
     HttpObserver     = require('../observers/http-observer').HttpObserver,
@@ -104,8 +105,8 @@ NodeAgent.prototype.init = function(cb) {
     self.starttime = Date.now();
 
     self.findRoot();
+    
     Logger.initializer.process();
-
     Logger.print('WHATAP-001', 'Start initialize WhaTap Agent...', true);
 
     if(self._conf['app.root'] == null || self._conf['app.root'].length == 0) {
@@ -122,6 +123,11 @@ NodeAgent.prototype.init = function(cb) {
             return;
         }
         Logger.print('WHATAP-101', 'Finish initialize configuration...', false);
+        if(self._conf['reqlog_enabled'] === true ) {
+            Logger.print("WHATAP-REQLOG" , "ReqLog Init Start !!!! " , false);
+            RequestLog.initializer.process();
+        }
+        
         self._securityMaster.run( function (err) {
             if(err) {
                 Logger.printError('WHATAP-104', 'Failed to connect to whatap server', err, false);

package/lib/logger.js

@@ -3,305 +3,305 @@
  * Use of this source code is governed by a license that
  * can be found in the LICENSE file.
  */
-var WHATAP_CONF  = process.env.WHATAP_CONF || 'whatap';
+ var WHATAP_CONF  = process.env.WHATAP_CONF || 'whatap';
 
-var conf     = require('./conf/configure'),
-    DateUtil = require('./util/dateutil'),
-    path     = require('path'),
-    fs       = require('fs');
-
-var PID=process.pid;
-
-var initializer = {
-    last : DateUtil.currentTime(),
-    lastDateUnit : DateUtil.getDateUnit(),
-    lastFileRotation : conf.log_rotation_enabled,
-    reset : function () {
-        if(Logger.printWriter)
-            Logger.printWriter.close();
-        Logger.logfile = null;
-        Logger.openFile();
-    },
-    process : function () {
-        conf  = require('./conf/configure');
-        var now = DateUtil.currentTime();
-        if(now > this.last + DateUtil.MILLIS_PER_HOUR) {
-            this.last = now;
-            Logger.clearOldLog();
-        }
-        if(this.lastFileRotation !== conf.log_rotation_enabled
-            || this.lastDateUnit !== DateUtil.getDateUnit()
-            || (Logger.logfile !== null && fs.existsSync(Logger.logfile) == false)) {
-            try {
-                if(Logger.printWriter){
-                    Logger.printWriter.close();
-                }
-                Logger.logfile = null;
-                this.lastFileRotation = conf.log_rotation_enabled;
-                this.lastDateUnit = DateUtil.getDateUnit();
-            } catch(e) {
-                console.log(e);
-            }
-        }
-        try {
-            Logger.openFile();
-        } catch(e) {
-            console.log(e);
-        }
-    }
-};
-
-var Logger = {
-    ONAME : null,
-    logfile : null,
-    lastLog : {},
-    printWriter : null,
-    printAll : function (id, message, sysout) {
-        try{
-            var b_msg = this.build(id, message);
-            if(this.printWriter != null) {
-                this.printWriter.write(b_msg);
-                this.printWriter.write('\n');
-            } else {
-                this.openFile();
-            }
-            sysout = (sysout || process.env.WHATAP_PRINT);
-            if(sysout) {
-                console.log(b_msg);
-            }
-        } catch (e){
-            if(sysout) {
-                console.log(e);
-            }
-        }
-    },
-    print : function (id, message, sysout) {
-        if(this.checkOk(id, 10) == false) {
-            return;
-        }
-        try{
-            var b_msg = this.build(id, message);
-            if(this.printWriter != null) {
-                this.printWriter.write(b_msg);
-                this.printWriter.write('\n');
-            } else {
-                this.openFile();
-            }
-            sysout = (sysout || process.env.WHATAP_PRINT);
-            if(sysout) {
-                console.log(b_msg);
-            }
-        } catch (e){
-            if(sysout) {
-                console.log(e);
-            }
-        }
-    },
-    printError : function (id, message, err, sysout) {
-        if(this.checkOk(id, 10) == false) {
-            return;
-        }
-        this.print(id, message, false);
-        sysout = (sysout || process.env.WHATAP_PRINT);
-        if(sysout) {
-            console.error(this.build(id, message));
-        }
-        if(err) {
-            if(this.printWriter != null) {
-                this.printWriter.write(err.stack);
-                this.printWriter.write('\n');
-            }
-        }
-    },
-    checkOk : function (id, sec) {
-        if(conf.log_print_enabled === false) { return false; }
-        if(conf.isIgnoreLog && conf.isIgnoreLog(id)) { return false; }
-
-        if(Object.keys(Logger.lastLog).length >= 1000) {
-            Logger.lastLog = {};
-        }
-
-        if(sec > 0) {
-            var last = Logger.lastLog[id];
-            if(last == null) {
-                last = 0;
-            }
-            var now = Date.now();
-            if(now < last + sec * 1000) {
-                return false;
-            }
-            Logger.lastLog[id] = now;
-        }
-        return true;
-    },
-    build : function (id, message) {
-        var str = DateUtil.datetime(Date.now());
-        str += ' [';
-        str += id;
-        str += '] <' + PID + '> ';
-        str += message;
-        return str;
-    },
-    openFile : function () {
-        if(conf.log_file_enabled === false ) { return; }
-        var log_prefix = WHATAP_CONF+"-";
-
-        var root = conf['app.root'];
-        if(root==null || root ==undefined){
-            console.log('[WHATAP]Logger Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
-            return;
-        }
-        var dir = path.join(root, 'logs');
-        if(fs.existsSync(dir) == false) {
-            fs.mkdirSync(dir);
-        }
-
-        if(conf.log_rotation_enabled) {
-            var file = path.join(dir, log_prefix + DateUtil.yyyymmdd() + '.log');
-            this.logfile = file;
-            this.printWriter = fs.createWriteStream(file, {flags : 'a'});
-        } else {
-            var file = path.join(dir, 'whatap.log');
-            this.logfile = file;
-            this.printWriter = fs.createWriteStream(file, {flags : 'a'});
-        }
-
-    },
-    clearOldLog : function () {
-        if(conf.log_rotation_enabled === false || conf.log_enabled === false) { return; }
-        if(conf.log_keep_days <= 0) { return; }
-
-        var nowUnit = DateUtil.getDateUnit(),
-            root = conf['app.root'],
-            dir = path.join(root, 'logs'),
-            log_prefix = WHATAP_CONF+"-";
-
-        fs.readdir(dir, function (err, files) {
-
-            for(var i=0; i<files.length; i++) {
-                var stat = fs.statSync(path.join(dir, files[i]));
-                if(stat.isDirectory()) {
-                    return true;
-                }
-                var name = files[i];
-                if(name.indexOf(log_prefix) < 0) {
-                    return true;
-                }
-                var x = name.lastIndexOf('.');
-                if(x < 0) {
-                    return true;
-                }
-                var date = name.substr(log_prefix.length + 1, (x - log_prefix.length - 1));
-                if(date.length != 8) {
-                    return true;
-                }
-                var d = DateUtil.yyyymmdd(date);
-                var fileUnit = DateUtil.getDateUnit(d);
-                try {
-                    if (nowUnit - fileUnit > conflog_keep_days) {
-                        fs.unlinkSync(path.join(dir, files[i]));
-                    }
-                } catch (e) { }
-            }
-
-        });
-    },
-    read : function( file,  endpos,  length , callback) {
-
-		if ( file == null || length === 0)
-			return null;
-		if (file.startsWith(WHATAP_CONF) == false)
-			return null;
-
-
-
-            var root = conf['app.root'];
-            if(root==null ){
-                return null;
-            }
-            var dir = path.join(root, 'logs');
-            var fileFullPath = path.join(dir, file);
-
-            if(fs.existsSync(fileFullPath) == false) {
-                return null;
-            }
-            const stats = fs.statSync(fileFullPath);
-
-        if (endpos < 0) {
-            endpos = stats.size;
-        }
+ var conf     = require('./conf/configure'),
+     DateUtil = require('./util/dateutil'),
+     path     = require('path'),
+     fs       = require('fs');
+ 
+ var PID=process.pid;
+ 
+ var initializer = {
+     last : DateUtil.currentTime(),
+     lastDateUnit : DateUtil.getDateUnit(),
+     lastFileRotation : true,
+     reset : function () {
+         if(Logger.printWriter)
+             Logger.printWriter.close();
+         Logger.logfile = null;
+         Logger.openFile();
+     },
+     process : function () {
+         conf  = require('./conf/configure');
+         var now = DateUtil.currentTime();
+         if(now > this.last + DateUtil.MILLIS_PER_HOUR) {
+             this.last = now;
+             Logger.clearOldLog();
+         }
+         if(this.lastFileRotation !== conf.log_rotation_enabled
+             || this.lastDateUnit !== DateUtil.getDateUnit()
+             || (Logger.logfile !== null && fs.existsSync(Logger.logfile) == false)) {
+             try {
+                 if(Logger.printWriter){
+                     Logger.printWriter.close();
+                 }
+                 Logger.logfile = null;
+                 this.lastFileRotation = conf.log_rotation_enabled;
+                 this.lastDateUnit = DateUtil.getDateUnit();
+             } catch(e) {
+                 console.log(e);
+             }
+         }
+         try {
+             Logger.openFile();
+         } catch(e) {
+             console.log(e);
+         }
+     }
+ };
+ 
+ var Logger = {
+     ONAME : null,
+     logfile : null,
+     lastLog : {},
+     printWriter : null,
+     printAll : function (id, message, sysout) {
+         try{
+             var b_msg = this.build(id, message);
+             if(this.printWriter != null) {
+                 this.printWriter.write(b_msg);
+                 this.printWriter.write('\n');
+             } else {
+                 this.openFile();
+             }
+             sysout = (sysout || process.env.WHATAP_PRINT);
+             if(sysout) {
+                 console.log(b_msg);
+             }
+         } catch (e){
+             if(sysout) {
+                 console.log(e);
+             }
+         }
+     },
+     print : function (id, message, sysout) {
+         if(this.checkOk(id, 10) == false) {
+             return;
+         }
+         try{
+             var b_msg = this.build(id, message);
+             if(this.printWriter != null) {
+                 this.printWriter.write(b_msg);
+                 this.printWriter.write('\n');
+             } else {
+                 this.openFile();
+             }
+             sysout = (sysout || process.env.WHATAP_PRINT);
+             if(sysout) {
+                 console.log(b_msg);
+             }
+         } catch (e){
+             if(sysout) {
+                 console.log(e);
+             }
+         }
+     },
+     printError : function (id, message, err, sysout) {
+         if(this.checkOk(id, 10) == false) {
+             return;
+         }
+         this.print(id, message, false);
+         sysout = (sysout || process.env.WHATAP_PRINT);
+         if(sysout) {
+             console.error(this.build(id, message));
+         }
+         if(err) {
+             if(this.printWriter != null) {
+                 this.printWriter.write(err.stack);
+                 this.printWriter.write('\n');
+             }
+         }
+     },
+     checkOk : function (id, sec) {
+         if(conf.log_print_enabled === false) { return false; }
+         if(conf.isIgnoreLog && conf.isIgnoreLog(id)) { return false; }
+ 
+         if(Object.keys(Logger.lastLog).length >= 1000) {
+             Logger.lastLog = {};
+         }
+ 
+         if(sec > 0) {
+             var last = Logger.lastLog[id];
+             if(last == null) {
+                 last = 0;
+             }
+             var now = Date.now();
+             if(now < last + sec * 1000) {
+                 return false;
+             }
+             Logger.lastLog[id] = now;
+         }
+         return true;
+     },
+     build : function (id, message) {
+         var str = DateUtil.datetime(Date.now());
+         str += ' [';
+         str += id;
+         str += '] <' + PID + '> ';
+         str += message;
+         return str;
+     },
+     openFile : function () {
+         if(conf.log_file_enabled === false ) { return; }
+         var log_prefix = WHATAP_CONF+"-";
+ 
+         var root = conf['app.root'];
+         if(root==null || root ==undefined){
+             console.log('[WHATAP]Logger Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
+             return;
+         }
+         var dir = path.join(root, 'logs');
+         if(fs.existsSync(dir) == false) {
+             fs.mkdirSync(dir);
+         }
+ 
+         if(conf.log_rotation_enabled) {
+             var file = path.join(dir, log_prefix + DateUtil.yyyymmdd() + '.log');
+             this.logfile = file;
+             this.printWriter = fs.createWriteStream(file, {flags : 'a'});
+         } else {
+             var file = path.join(dir, 'whatap.log');
+             this.logfile = file;
+             this.printWriter = fs.createWriteStream(file, {flags : 'a'});
+         }
+ 
+     },
+     clearOldLog : function () {
+         if(conf.log_rotation_enabled === false || conf.log_enabled === false) { return; }
+         if(conf.log_keep_days <= 0) { return; }
+ 
+         var nowUnit = DateUtil.getDateUnit(),
+             root = conf['app.root'],
+             dir = path.join(root, 'logs'),
+             log_prefix = WHATAP_CONF+"-";
+ 
+         fs.readdir(dir, function (err, files) {
+ 
+             for(var i=0; i<files.length; i++) {
+                 var stat = fs.statSync(path.join(dir, files[i]));
+                 if(stat.isDirectory()) {
+                     return true;
+                 }
+                 var name = files[i];
+                 if(name.indexOf(log_prefix) < 0) {
+                     return true;
+                 }
+                 var x = name.lastIndexOf('.');
+                 if(x < 0) {
+                     return true;
+                 }
+                 var date = name.substr(log_prefix.length + 1, (x - log_prefix.length - 1));
+                 if(date.length != 8) {
+                     return true;
+                 }
+                 var d = DateUtil.yyyymmdd(date);
+                 var fileUnit = DateUtil.getDateUnit(d);
+                 try {
+                     if (nowUnit - fileUnit > conflog_keep_days) {
+                         fs.unlinkSync(path.join(dir, files[i]));
+                     }
+                 } catch (e) { }
+             }
+ 
+         });
+     },
+     read : function( file,  endpos,  length , callback) {
+ 
+         if ( file == null || length === 0)
+             return null;
+         if (file.startsWith(WHATAP_CONF) == false)
+             return null;
+ 
+ 
+ 
+             var root = conf['app.root'];
+             if(root==null ){
+                 return null;
+             }
+             var dir = path.join(root, 'logs');
+             var fileFullPath = path.join(dir, file);
+ 
+             if(fs.existsSync(fileFullPath) == false) {
+                 return null;
+             }
+             const stats = fs.statSync(fileFullPath);
+ 
+         if (endpos < 0) {
+             endpos = stats.size;
+         }
+         
+         var start = Math.max(0, endpos - length);
+ 
+         if ( stats.size < start)
+             return null;
+             
+         var available = stats.size - start;
+         var readable = Math.min(available, length);
+         var next=-1;
+         var buffer = Buffer.alloc(readable);
+         fs.open(fileFullPath, 'r', function (err, fd) {
+             fs.read(fd, buffer, 0, buffer.length, start,function(e,l,b){
+                 next = endpos + l;
+                 if (next > stats.size) {
+                     next = -1;
+                 }
+                 callback(start, next,b.toString("utf8",0,l)) ;
+             });
+             fs.close(fd);
+         });
         
-		var start = Math.max(0, endpos - length);
-
-		if ( stats.size < start)
-            return null;
-            
-		var available = stats.size - start;
-        var readable = Math.min(available, length);
-        var next=-1;
-        var buffer = Buffer.alloc(readable);
-        fs.open(fileFullPath, 'r', function (err, fd) {
-            fs.read(fd, buffer, 0, buffer.length, start,function(e,l,b){
-                next = endpos + l;
-                if (next > stats.size) {
-                    next = -1;
-                }
-                callback(start, next,b.toString("utf8",0,l)) ;
-            });
-            fs.close(fd);
-        });
-       
-	},
-    getLogFiles : function () {
-        var MapValue = require('./value/map-value');
-        var log_prefix = WHATAP_CONF+"-";
-
-        var o = new MapValue();
-        if(conf.log_file_enabled === false ) { return o; }
-        var root = conf['app.root'];
-        if(root==null){
-            return o;
-        }
-        var dir = path.join(root, 'logs');
-        if(fs.existsSync(dir) === false) {
-            return o;
-        }
-        var agoOneMonthTime=DateUtil.getMonth(Date.now(), -1);
-
-        if(conf.log_rotation_enabled) {
-            var files = fs.readdirSync(dir);
-            files.forEach(function (file) {
-                if (file.startsWith(log_prefix) == false) {
-                    return;
-                }
-                var x = file.lastIndexOf('.');
-                if (x < 0) {
-                    return;
-                }
-                var date = file.substring(log_prefix.length , x);
-                if (date.length != 8) {
-                    return;
-                }
-                if (DateUtil.yyyymmdd(date) < agoOneMonthTime) {
-                    return;
-                }
-                const stats = fs.statSync(dir + '/'+file);
-                if(stats){
-                    o.putLong(file, stats.size);
-                }
-            });
-        } else {
-            if (fs.existsSync(dir + "/whatap.log")) {
-                const stats = fs.statSync(dir + "/whatap.log");
-                o.putLong(file, stats.size);
-            }
-        }
-        return o;
-    },
-    initializer : initializer,
-    CODE: {
-        
-    }
-};
-
-module.exports = Logger;
+     },
+     getLogFiles : function () {
+         var MapValue = require('./value/map-value');
+         var log_prefix = WHATAP_CONF+"-";
+ 
+         var o = new MapValue();
+         if(conf.log_file_enabled === false ) { return o; }
+         var root = conf['app.root'];
+         if(root==null){
+             return o;
+         }
+         var dir = path.join(root, 'logs');
+         if(fs.existsSync(dir) === false) {
+             return o;
+         }
+         var agoOneMonthTime=DateUtil.getMonth(Date.now(), -1);
+ 
+         if(conf.log_rotation_enabled) {
+             var files = fs.readdirSync(dir);
+             files.forEach(function (file) {
+                 if (file.startsWith(log_prefix) == false) {
+                     return;
+                 }
+                 var x = file.lastIndexOf('.');
+                 if (x < 0) {
+                     return;
+                 }
+                 var date = file.substring(log_prefix.length , x);
+                 if (date.length != 8) {
+                     return;
+                 }
+                 if (DateUtil.yyyymmdd(date) < agoOneMonthTime) {
+                     return;
+                 }
+                 const stats = fs.statSync(dir + '/'+file);
+                 if(stats){
+                     o.putLong(file, stats.size);
+                 }
+             });
+         } else {
+             if (fs.existsSync(dir + "/whatap.log")) {
+                 const stats = fs.statSync(dir + "/whatap.log");
+                 o.putLong(file, stats.size);
+             }
+         }
+         return o;
+     },
+     initializer : initializer,
+     CODE: {
+         
+     }
+ };
+ 
+ module.exports = Logger;

package/lib/observers/http-observer.js

@@ -4,7 +4,9 @@
  * can be found in the LICENSE file.
  */
 
+const { reqlog_x_txid } = require('../conf/config-default');
 const controlHandler = require('../control/control-handler');
+const RequestLog = require('../requestlog');
 var TraceContextManager = require('../trace/trace-context-manager'),
     URLPatternDetector  = require('../trace/serviceurl-pattern-detector').Detector,
     DataTextAgent       = require('../data/datatext-agent'),
@@ -124,6 +126,8 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
             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;
             }
 
             self.__endTransaction(null, ctx, req, res);
@@ -356,7 +360,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         wtx.endTime = DateUtil.currentTime();
         profile.time  = wtx.endTime;
         wtx.elapsed = ctx.getElapsedTime();
-        
+
         ctx.service_hash = HashUtil.hashFromString(ctx.service_name);
         DataTextAgent.SERVICE.add(ctx.service_hash, ctx.service_name);
 
@@ -385,7 +389,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         wtx.status = ctx.status;
 
         wtx.http_method=TxRecord.HTTP_METHOD[ctx.http_method] || TxRecord.WEB_GET;
-
+        wtx.http_host = ctx.http_host;
         wtx.mtid=ctx.mtid;
         wtx.mdepth=ctx.mdepth;
         wtx.mcaller=ctx.mcaller_txid;
@@ -398,7 +402,11 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
         profile.oid = SecurityMaster.OID;
         profile.service = wtx;
-
+        if(conf.reqlog_enabled === true) { 
+            ctx.endTime = wtx.endTime;
+            ctx.elapsed = wtx.elapsed;
+            RequestLog.setRecord(ctx);
+        }
         //duplicated executed... so end() first 
         TraceContextManager.end(ctx._id);
         setTimeout(function () {
@@ -406,6 +414,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
             TraceContextManager.end(ctx._id);
             ctx = null;
         }, 100);
+
     } catch (e) {
         Logger.printError('WHATAP-607', 'End transaction error..', e, false);
         TraceContextManager.end(ctx._id);
@@ -603,7 +612,11 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                     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;
+                        }
                     }
                 }
             })
@@ -613,7 +626,11 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                 if (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;
+                    }
                 }
 
                 endHttpc(ctx, step);
@@ -661,6 +678,8 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                             step.error = StatError.addError('Timeout','Timeout', ctx.service_hash);
                             if (ctx.error.isZero()) {
                                 ctx.error = step.error;
+                                ctx.statusCode = 'Timeout';
+                                ctx.statusMessage = 'Timeout';
                             }
                         }
                         endHttpc(ctx, step);

package/lib/requestlog.js

@@ -0,0 +1,327 @@
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+var WHATAP_CONF  = 'reqlog';
+
+var conf     = require('./conf/configure'),
+    DateUtil = require('./util/dateutil'),
+    IPUtil   = require('./util/iputil'),
+    path     = require('path'),
+    fs       = require('fs'),
+    LOGGER = require('./logger');
+
+var PID=process.pid;
+
+var initializer = {
+    last : DateUtil.currentTime(),
+    lastDateUnit : DateUtil.getDateUnit(),
+    lastFileRotation : true,
+    reset : function () {
+        if(RequestLog.printWriter) RequestLog.printWriter.close();
+        RequestLog.logfile = null;
+        RequestLog.openFile();
+    },
+    process : function () {
+        conf  = require('./conf/configure');
+        var now = DateUtil.currentTime();
+        if(now > this.last + DateUtil.MILLIS_PER_HOUR) {
+            this.last = now;
+            RequestLog.clearOldLog();
+        }
+        if(this.lastFileRotation !== conf.reqlog_rotation_enabled
+            || this.lastDateUnit !== DateUtil.getDateUnit()
+            || (RequestLog.logfile !== null && fs.existsSync(RequestLog.logfile) == false)) {
+            try {
+                if(RequestLog.printWriter){
+                    RequestLog.printWriter.close();
+                }
+                RequestLog.logfile = null;
+                this.lastFileRotation = conf.reqlog_rotation_enabled;
+                this.lastDateUnit = DateUtil.getDateUnit();
+            } catch(e) {
+                console.log(e);
+            }
+        }
+        try {
+            RequestLog.openFile();
+        } catch(e) {
+            console.log(e);
+            return false;
+        }
+        return true;
+    }
+};
+
+var RequestLog = {
+    ONAME : null,
+    logfile : null,
+    lastLog : {},
+    printWriter : null,
+    setRecord : async function (ctx) {
+        try{
+            if(this.printWriter != null) {
+                this.buildRecord(ctx).then(e => {
+                    this.printWriter.write(e + '\n');
+                }).catch((err)=> {
+                    LOGGER.printError('[WHATAP-LOG]' ,'setRecord_1' , err , false);
+                });
+            } else {
+                this.openFile();
+            }
+        } catch (e){
+            LOGGER.printError('[WHATAP-LOG]' ,'setRecord_2' , err , false);
+        }
+    },
+    checkOk : function (id, sec) {
+        if(Object.keys(RequestLog.lastLog).length >= 1000) {
+            RequestLog.lastLog = {};
+        }
+
+        if(sec > 0) {
+            var last = RequestLog.lastLog[id];
+            if(last == null) {
+                last = 0;
+            }
+            var now = Date.now();
+            if(now < last + sec * 1000) {
+                return false;
+            }
+            RequestLog.lastLog[id] = now;
+        }
+        return true;
+    },
+    buildRecord : async function (ctx) {
+        var str = '';
+        let seperator = conf.reqlog_seperator;
+        str += "stime=" + ctx.start_time;
+		if (conf.reqlog_x_etime) {
+            str += seperator + "etime=" + ctx.endTime;
+		}
+		if (conf.reqlog_x_elapsed) {
+            str += seperator + "elapsed=" + ctx.elapsed;
+		}
+		if (conf.reqlog_x_url) {
+            str += seperator + "url=" + ctx.service_name;
+		}
+		if (conf.reqlog_x_httphost && ctx.http_host!=null) {
+            str += seperator + "httphost=" + ctx.http_host;
+		}
+		if (conf.reqlog_x_method) {
+            str += seperator + "method=" + ctx.http_method;
+		}
+		if (conf.reqlog_x_ip && ctx.remoteIp != 0) {
+            str += seperator + "ip=" + IPUtil.intToString(ctx.remoteIp);
+		}
+		if (conf.reqlog_x_status) {
+            str += seperator + "status=" + ctx.status;
+		}
+        /*
+		if (conf.reqlog_x_wcid && x.wclientId != 0) {
+            str += seperator + "wcid=" + x.wclientId;
+		}
+        */
+		if (conf.reqlog_x_login && ctx.login != null) {
+            str += seperator + "login=" + ctx.login;
+		}
+
+		if (conf.reqlog_x_error && ctx.error != null && ctx.statusMessage !== undefined) {
+            str += seperator + "errMsg=" + ctx.statusMessage;
+		}
+		if (conf.reqlog_x_useragent) {
+            str += seperator + "userAgent=" + ctx.userAgentString;
+		}
+		if (conf.reqlog_x_txid) {
+            str += seperator + "txid=" + ctx.txid;
+		}
+		if (ctx.custid != null) {
+			if (conf.reqlog_x_custid) {
+                str += seperator + "custid=" + ctx.custid;
+			} else if (conf.reqlog_x_gtid) {
+                str += seperator + "gtid=" + ctx.custid;
+			}
+		}
+		if (conf.reqlog_x_mtid && ctx.mtid != 0) {
+            str += seperator + "mtid=" + ctx.mtid;
+			if (conf.reqlog_x_mdepth) {
+                str += seperator + "mdepth=" + ctx.mdepth;
+			}
+		}
+        /*
+		if (conf.reqlog_x_dbc && x.dbc_time > 0) {
+            str += seperator + "dbcTime=" + x.dbc_time;
+		}
+        */
+		if (conf.reqlog_x_sql && ctx.sql_count > 0) {
+            str += seperator + "sqlCnt=" + ctx.sql_count;
+			str += seperator + "sqlTime=" + ctx.sql_time;
+		}
+		if (conf.reqlog_x_httpc && ctx.httpc_count > 0) {
+            str += seperator + "httpCallCnt=" + ctx.httpc_count;
+			str += seperator + "httpCallTime=" + ctx.httpc_time;
+		}
+		if (conf.reqlog_x_rs && ctx.rs_count > 0) {
+            str += seperator + "rsCnt=" + ctx.rs_count;
+			str += seperator + "rsTime=" + ctx.rs_time;
+		}
+		
+		return str;
+    },
+    openFile : function () {
+        if(conf.log_file_enabled === false ) { return; }
+        var log_prefix = WHATAP_CONF+"-";
+
+        var root = conf['app.root'];
+        if(root==null || root ==undefined){
+            console.log('[WHATAP]RequestLog Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
+            return;
+        }
+        var dir = path.join(root, 'logs');
+        if(fs.existsSync(dir) == false) {
+            fs.mkdirSync(dir);
+        }
+
+        if(conf.reqlog_rotation_enabled) {
+            var file = path.join(dir, log_prefix + DateUtil.yyyymmdd() + '.log');
+            this.logfile = file;
+            this.printWriter = fs.createWriteStream(file, {flags : 'a'});
+        } else {
+            var file = path.join(dir, 'reqlog.log');
+            this.logfile = file;
+            this.printWriter = fs.createWriteStream(file, {flags : 'a'});
+        }
+
+    },
+    clearOldLog : function () {
+        if(conf.reqlog_rotation_enabled === false || conf.reqlog_enabled === false) { return; }
+        if(conf.reqlog_keep_days <= 0) { return; }
+
+        var nowUnit = DateUtil.getDateUnit(),
+            root = conf['app.root'],
+            dir = path.join(root, 'logs'),
+            log_prefix = WHATAP_CONF+"-";
+
+        fs.readdir(dir, function (err, files) {
+
+            for(var i=0; i<files.length; i++) {
+                var stat = fs.statSync(path.join(dir, files[i]));
+                if(stat.isDirectory()) {
+                    return true;
+                }
+                var name = files[i];
+                if(name.indexOf(log_prefix) < 0) {
+                    return true;
+                }
+                var x = name.lastIndexOf('.');
+                if(x < 0) {
+                    return true;
+                }
+                var date = name.substr(log_prefix.length + 1, (x - log_prefix.length - 1));
+                if(date.length != 8) {
+                    return true;
+                }
+                var d = DateUtil.yyyymmdd(date);
+                var fileUnit = DateUtil.getDateUnit(d);
+                try {
+                    if (nowUnit - fileUnit > conflog_keep_days) {
+                        fs.unlinkSync(path.join(dir, files[i]));
+                    }
+                } catch (e) { }
+            }
+
+        });
+    },
+    read : function( file,  endpos,  length , callback) {
+
+		if ( file == null || length === 0)
+			return null;
+		if (file.startsWith(WHATAP_CONF) == false) return null;
+
+        var root = conf['app.root'];
+        if(root==null ){
+            return null;
+        }
+        var dir = path.join(root, 'logs');
+        var fileFullPath = path.join(dir, file);
+
+        if(fs.existsSync(fileFullPath) == false) {
+            return null;
+        }
+        const stats = fs.statSync(fileFullPath);
+
+        if (endpos < 0) {
+            endpos = stats.size;
+        }
+        
+		var start = Math.max(0, endpos - length);
+
+		if ( stats.size < start)
+            return null;
+            
+		var available = stats.size - start;
+        var readable = Math.min(available, length);
+        var next=-1;
+        var buffer = Buffer.alloc(readable);
+        fs.open(fileFullPath, 'r', function (err, fd) {
+            fs.read(fd, buffer, 0, buffer.length, start,function(e,l,b){
+                next = endpos + l;
+                if (next > stats.size) {
+                    next = -1;
+                }
+                callback(start, next,b.toString("utf8",0,l)) ;
+            });
+            fs.close(fd);
+        });
+       
+	},
+    getLogFiles : function () {
+        var MapValue = require('./value/map-value');
+        var log_prefix = WHATAP_CONF+"-";
+
+        var o = new MapValue();
+        if(conf.log_file_enabled === false ) { return o; }
+        var root = conf['app.root'];
+        if(root==null){
+            return o;
+        }
+        var dir = path.join(root, 'logs');
+        if(fs.existsSync(dir) === false) {
+            return o;
+        }
+        var agoOneMonthTime=DateUtil.getMonth(Date.now(), -1);
+
+        if(conf.reqlog_rotation_enabled) {
+            var files = fs.readdirSync(dir);
+            files.forEach(function (file) {
+                if (file.startsWith(log_prefix) == false) {
+                    return;
+                }
+                var x = file.lastIndexOf('.');
+                if (x < 0) {
+                    return;
+                }
+                var date = file.substring(log_prefix.length , x);
+                if (date.length != 8) {
+                    return;
+                }
+                if (DateUtil.yyyymmdd(date) < agoOneMonthTime) {
+                    return;
+                }
+                const stats = fs.statSync(dir + '/'+file);
+                if(stats){
+                    o.putLong(file, stats.size);
+                }
+            });
+        } else {
+            if (fs.existsSync(dir + "/reqlog.log")) {
+                const stats = fs.statSync(dir + "/reqlog.log");
+                o.putLong(file, stats.size);
+            }
+        }
+        return o;
+    },
+    initializer : initializer
+};
+
+module.exports = RequestLog;

package/lib/trace/trace-context.js

@@ -104,10 +104,11 @@ TraceContext.prototype.footprint=function(desc){
 }
 TraceContext.prototype.getElapsedTime = function () {
     return Date.now() - this.start_time;
-};
+}
 TraceContext.prototype.resetStartTime = function () {
     this.start_time = Date.now();
-};
+}
+
 var poids= new StringKeyLinkedMap(7, 1).setMax(301);
 TraceContext.prototype.setCallerPOID= function (poidStr) {
     try {

package/lib/util/resourceprofile.js

@@ -45,6 +45,7 @@ function ResourceProfile() {
     /** Process cpu */
     setInterval(function () {
         pusage.stat(process.pid, function(err, stat) {
+            if(err || stat == null) return;
             self.pcpu = stat.cpu;
             self.cpu_info.proc = stat.cpu;
         });

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.49",
-  "releaseDate": "20220614",
+  "version": "0.4.50",
+  "releaseDate": "20220711",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},