whatap 0.4.77 → 0.4.79

package/lib/conf/config-default.js

@@ -19,14 +19,14 @@ function str(k, defValue){
 };
 var ConfigDefault = {
     "whatap.home": '',
-    "whatap.enabled": true,
+    "whatap.enabled": bool('whatap.enabled',true),
     "license" : str("license", null),
-    "counter_enabled": true,
-    "stat_enabled": true,
+    "counter_enabled": bool('counter_enabled',true),
+    "stat_enabled": bool('stat_enabled',true),
 
-    "profile_enabled": true,
-    "sql_enabled": true,
-    "httpc_enabled": true,
+    "profile_enabled": bool('profile_enabled',true),
+    "sql_enabled": bool('sql_enabled',true),
+    "httpc_enabled": bool('httpc_enabled',true),
     "profile_max_time" : num('profile_max_time',300000),
     "profile_max_count" : num('profile_max_count',10000),
     "prepared_sql_max": 5001,
@@ -37,7 +37,7 @@ var ConfigDefault = {
     "trace_auto_service_enabled": false,
     "trace_auto_service_backstack_enabled": true,
     "trace_background_socket_enabled": true,
-    "trace_node_schedule_enabled": false,
+    "trace_node_schedule_enabled": bool('trace_node_schedule_enabled',false),
     "trace_active_callstack_depth": 40,
     "trace_activeserivce_yellow_time": 3000,
     "trace_activeservice_red_time": 8000,
@@ -47,7 +47,7 @@ var ConfigDefault = {
     "log_ignore_set": null,
     "whatap.server.host": str('whatap_server_host',"127.0.0.1,127.0.0.1"),
     "whatap.server.port": num('whatap_server_port',6600),
-    "tcp_connection_timeout": 10000,
+    "tcp_connection_timeout": num('tcp_connection_timeout',10000),
     "tcp_so_timeout": 60000,
     "net_send_max_bytes": 5 * 1024 * 1024,
     "net_send_queue1_size": 512,
@@ -55,7 +55,7 @@ var ConfigDefault = {
     "hook_connection_open_patterns": "",
     "log_datasource_lookup_enabled": true,
 
-    "profile_http_querystring_enabled": false,
+    "profile_http_querystring_enabled": bool('profile_http_querystring_enabled',false),
     "profile_http_header_enabled": bool('profile_http_header_enabled',false),
     "profile_http_parameter_enabled": bool('profile_http_parameter_enabled',false),
     "profile_httpc_parameter_enabled": bool('profile_httpc_parameter_enabled',false),
@@ -63,7 +63,7 @@ var ConfigDefault = {
     "profile_http_header_url_prefix": "/",
     "profile_connection_open_enabled": true,
 
-    "hook_method_patterns": "",
+    "hook_method_patterns": str('hook_method_patterns',""),
     "hook_method_access_public_enabled": true,
     "hook_method_access_protected_enabled": true,
     "hook_method_access_private_enabled": false,
@@ -81,29 +81,27 @@ var ConfigDefault = {
     "profile_step_max_count": 1024,
     "profile_fullstack_max_lines": 0,
     "profile_basetime": num('profile_basetime',500),
-    "trace_http_client_ip_header_key": "x-forwarded-for",
-    "trace_user_agent_header_key": "",
-    "trace_referer_header_key": "",
+    "trace_http_client_ip_header_key": str('trace_http_client_ip_header_key','x-forwarded-for'),
+    "trace_user_agent_header_key": str('trace_user_agent_header_key',''),
+    "trace_referer_header_key": str('trace_referer_header_key',''),
     "profile_sql_param_enabled": bool('profile_sql_param_enabled',false),
-
     "error_snap_enabled" : true,
-    
-    "trace_user_enabled": true,
-    "trace_user_using_ip": true,
+    "trace_user_enabled": bool('trace_user_enabled',true),
+    "trace_user_using_ip": bool('trace_user_using_ip',true),
     "trace_user_using_jsession": false,
-    "user_header_ticket": "",
-    "user_header_ticket_enabled": false,
+    "user_header_ticket": str('user_header_ticket',''),
+    "user_header_ticket_enabled": bool('user_header_ticket_enabled',false),
     "trace_user_cookie_limit": 2048,
 
     "profile_error_sql_time_max": 30000,
     "hook_direct_patch_classes": "",
     
-    "log_rotation_enabled": true,
-    "log_keep_days": 7,
-    "log_print_enabled": true,
-    "log_file_enabled" : true,
-    "thread_dump_enabled": false,
-    "debug_cpu_enabled": false,
+    "log_rotation_enabled": bool('log_rotation_enabled',true),
+    "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,
@@ -120,21 +118,21 @@ var ConfigDefault = {
     // "_profile_position_method_hash": 0,
     // "profile_position_method": "",
     // "profile_position_depth": 50,
-    "trace_normalize_urls" : "",
-    "trace_auto_normalize_enabled" : false,
-    "trace_normalize_enabled" : true,
-    "trace_active_transaction_yellow_time" : 3000,
-    "trace_active_transaction_red_time" : 8000,
-    "trace_active_transaction_hang_time" : 30000,
+    "trace_normalize_urls" : str('trace_normalize_urls',''),
+    "trace_auto_normalize_enabled" : bool('trace_auto_normalize_enabled',false),
+    "trace_normalize_enabled" : bool('trace_normalize_enabled',true),
+    "trace_active_transaction_yellow_time" : num('trace_active_transaction_yellow_time', 3000),
+    "trace_active_transaction_red_time" : num('trace_active_transaction_red_time', 8000),
+    "trace_active_transaction_hang_time" : num('trace_active_transaction_hang_time', 30000),
     "realtime_user_thinktime_max" : 300000,
-    "trace_service_port_enabled" : false,
+    "trace_service_port_enabled" :  bool('trace_service_port_enabled',false),
     
     "trace_sql_normalize_enabled" : true,
 
     //2017.05.02 AUTO ONAME
     "auto_oname_enabled" : bool('auto_oname_enabled',false),
     "auto_oname_prefix" : str('auto_oname_prefix','nodejs'),
-    "auto_oname_reset" : 0,
+    "auto_oname_reset" : num('auto_oname_reset',0) ,
     "log_pack_data" : false,
 
     //2018.10.02 MT
@@ -158,7 +156,7 @@ var ConfigDefault = {
 
     "debug_tcpsend" : bool('debug_tcpsend',false),
 
-    "trace_ignore_url_set": bool('trace_ignore_url_set',false),
+    "trace_ignore_url_set": str('trace_ignore_url_set',""),
     "_trace_ignore_url_set": {},
     "trace_ignore_url_prefix": str('trace_ignore_url_prefix',''),
     "_is_trace_ignore_url_prefix": false,

package/lib/observers/http-observer.js

@@ -144,7 +144,7 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
 };
 
 function isStatic(u){
-    var x = u.indexOf('.');
+    var x = u.lastIndexOf('.');
     if(x<=0) return false;
     
     var ext = u.substring(x);

package/lib/service/tx-record.js

@@ -276,10 +276,14 @@ TxRecord.prototype.toObject = function(b) {
     return service;
 };
 
-TxRecord.HTTP_METHOD={"GET":1,"POST":2,"PUT":3,"DELETE":4};
+TxRecord.HTTP_METHOD={"GET":1,"POST":2,"PUT":3,"DELETE":4,"PATCH":5,"OPTIONS":6,"HEAD":7,"TRACE":8};
 TxRecord.WEB_GET = 1;
 TxRecord.WEB_POST = 2;
 TxRecord.WEB_PUT = 3;
 TxRecord.WEB_DELETE = 4;
+TxRecord.WEB_PATCH = 5;
+TxRecord.WEB_OPTIONS = 6;
+TxRecord.WEB_HEAD = 7;
+TxRecord.WEB_TRACE = 8;
 
 module.exports = TxRecord;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.77",
-  "releaseDate": "20230623",
+  "version": "0.4.79",
+  "releaseDate": "20230711",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},