whatap 0.4.48 → 0.4.51

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,
@@ -15,6 +16,7 @@ var Interceptor      = require('./interceptor').Interceptor,
     ExpressObserver  = require('../observers/express-observer').ExpressObserver,
     GlobalObserver   = require('../observers/global-observer').GlobalObserver,
     MysqlObserver    = require('../observers/mysql-observer').MysqlObserver,
+    MariaObserver    = require('../observers/maria-observer').MariaObserver,
     SocketioObserver = require('../observers/socket.io-observer').SocketIOObserver,
     ProcessObserver  = require('../observers/process-observer').ProcessObserver,
     FileObserver     = require('../observers/file-observer').FileObserver,
@@ -103,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) {
@@ -121,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);
@@ -244,6 +251,7 @@ NodeAgent.prototype.loadObserves = function() {
     observes.push(NetObserver);
     observes.push(ClusterObserver);
     observes.push(MysqlObserver);
+    observes.push(MariaObserver);
     observes.push(SocketioObserver);
     observes.push(ExpressObserver);
     observes.push(FileObserver);