whatap 0.4.95 → 0.4.97

package/lib/conf/conf-sys-mon.js

@@ -76,7 +76,7 @@ ConfSysMon.prototype.findType = function(){
     // dynamic reload!!!
     var Configure = require('./configure');
 
-    if (Configure.whatap_micro_enabled) {
+    if (Configure.whatap_micro_enabled || process.env.WHATAP_MICRO_ENABLED === "true") {
         t = this.SysType.KUBE;
     } else if (this.aws_ecs_enabled) {
         t = this.SysType.ECS;

package/lib/conf/config-default.js

@@ -65,7 +65,7 @@ var ConfigDefault = {
     "profile_http_header_url_prefix": "/",
     "profile_connection_open_enabled": true,
     "profile_zip_enabled": bool('profile_zip_enabled', false),
-    "profile_zip_queue_size": num('profile_zip_queue_size', 1000),
+    "profile_zip_queue_size": num('profile_zip_queue_size', 500),
     "profile_zip_max_buffer_size": num('profile_zip_max_buffer_size', 1024*1024),
     "profile_zip_min_size": num('profile_zip_min_size', 100),
     "debug_profile_zip_enabled": bool('debug_profile_zip_enabled', false),
@@ -107,7 +107,7 @@ var ConfigDefault = {
     "trace_sql_error_depth": num('trace_sql_error_depth', 50),
     "transaction_status_error_enable": bool("transaction_status_error_enable", true),
 
-    "trace_sampling_enabled": bool("trace_sampling_enabled", false),
+    "trace_sampling_enabled": bool("trace_sampling_enabled", true),
     "trace_sampling_tps": bool("trace_sampling_tps", 1000),
 
     "profile_error_sql_time_max": num("profile_error_sql_time_max", 30000),
@@ -154,6 +154,8 @@ var ConfigDefault = {
     "httpc_not_found_ignore": bool('httpc_not_found_ignore', false),
     "httpc_not_found_ignore_time": num('httpc_not_found_ignore', 300000),
     "ignore_sql_error_code_set": str('ignore_sql_error_code_set', ''),
+    "ignore_nextjs_build_file_enabled": bool('ignore_nextjs_build_file_enabled', true),
+    "ignore_nextjs_build_file_path": str('ignore_nextjs_build_file_path', '/_next/'),
 
     //2017.05.02 AUTO ONAME
     "auto_oname_enabled" : bool('auto_oname_enabled',false),

package/lib/conf/configure.js

@@ -150,7 +150,7 @@ Configuration.prototype.apply = function(properties) {
     var ips = Array.from(set);
     this.whatap_server_host = ips;
 
-    if( this.getProperty('whatap_micro_enabled') === true){
+    if( this.getProperty('whatap_micro_enabled') === true || process.env.WHATAP_MICRO_ENABLED === "true"){
         this.kubeNodeName(properties);
     }
     

package/lib/core/agent.js

@@ -19,6 +19,7 @@ var Interceptor      = require('./interceptor').Interceptor,
     MysqlObserver    = require('../observers/mysql-observer').MysqlObserver,
     MariaObserver    = require('../observers/maria-observer').MariaObserver,
     SocketioObserver = require('../observers/socket.io-observer').SocketIOObserver,
+    WebsocketObserver = require('../observers/websocket-observer').WebsocketObserver,
     ProcessObserver  = require('../observers/process-observer').ProcessObserver,
     FileObserver     = require('../observers/file-observer').FileObserver,
     MongoObserver    = require('../observers/mongo-observer').MongoObserver,
@@ -253,6 +254,7 @@ NodeAgent.prototype.loadObserves = function() {
     observes.push(MysqlObserver);
     observes.push(MariaObserver);
     observes.push(SocketioObserver);
+    observes.push(WebsocketObserver);
     observes.push(ExpressObserver);
     observes.push(FileObserver);
     observes.push(MongoObserver);

package/lib/counter/counter-manager.js

@@ -59,7 +59,7 @@ CounterManager.prototype.run = function () {
         self.process(tasks);
     });
 
-    if(conf.whatap_micro_enabled){
+    if(conf.whatap_micro_enabled || process.env.WHATAP_MICRO_ENABLED === "true"){
         KubeUtil.loadContainerId();
         if (conf.enabled_master_agent_call) KubeClient.run();
     }

package/lib/net/security-master.js

@@ -70,7 +70,7 @@ var SecurityMaster = {
         OidUtil.setType(process.env.name || Configuration.getProperty("whatap.type", "NODE"));
 
         var name_pattern;
-        if(Configuration.getProperty('whatap_micro_enabled', false) === true){
+        if(Configuration.getProperty('whatap_micro_enabled', false) === true || process.env.WHATAP_MICRO_ENABLED === "true"){
             name_pattern = process.env.WHATAP_NAME || "{okind}-{ip2}-{ip3}";
         }else if(require('cluster').isMaster){
             name_pattern=process.env.WHATAP_NAME || "{type}-{ip2}-{ip3}";
@@ -90,7 +90,7 @@ var SecurityMaster = {
             this.OKIND_NAME=null;
         }
 
-        if(Configuration.getProperty('whatap_micro_enabled', false) === false) {
+        if(Configuration.getProperty('whatap_micro_enabled', false) === false || process.env.WHATAP_MICRO_ENABLED === "true") {
             var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
             console.log(onodeStr)
             if(onodeStr && onodeStr.length>0){
@@ -140,7 +140,7 @@ var SecurityMaster = {
             this.OKIND_NAME=null;
         }
 
-        if(Configuration.getProperty('whatap_micro_enabled', false) === false) {
+        if(Configuration.getProperty('whatap_micro_enabled', false) === false || process.env.WHATAP_MICRO_ENABLED === "true") {
             var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
             if(onodeStr && onodeStr.length>0){
                 this.ONODE = HashUtil.hashFromString(onodeStr);

package/lib/observers/http-observer.js

@@ -59,6 +59,8 @@ var httpc_not_found_ignore_time = conf.getProperty('httpc_not_found_ignore_time'
 var profile_http_header_ignore_keys = conf.getProperty('profile_http_header_ignore_keys', 'Cookie,cookie,accept,user-agent,referer');
 var profile_http_parameter_enabled = conf.getProperty('profile_http_parameter_enabled', true);
 var profile_http_parameter_keys = conf.getProperty('profile_http_parameter_keys', '');
+var ignore_nextjs_build_file_enabled = conf.getProperty('ignore_nextjs_build_file_enabled', true);
+var ignore_nextjs_build_file_path = conf.getProperty('ignore_nextjs_build_file_path', '/_next/');
 conf.on('trace_http_client_ip_header_key', function(newProperty) {
     configIpHeaderKey = newProperty;
 });
@@ -116,6 +118,12 @@ conf.on('profile_http_parameter_enabled', function (newProps) {
 conf.on('profile_http_parameter_keys', function (newProps) {
     profile_http_parameter_keys = newProps;
 })
+conf.on('ignore_nextjs_build_file_enabled', function (newProps) {
+    ignore_nextjs_build_file_enabled = newProps;
+})
+conf.on('ignore_nextjs_build_file_path', function (newProps) {
+    ignore_nextjs_build_file_path = newProps;
+})
 var staticConents = function (newProps) {
     var x=new Set();
     var words = !newProps?[]:newProps.split(',');
@@ -231,8 +239,11 @@ function isStatic(u){
 }
 function initCtx(req, res) {
     /*url이 없으면 추적하지 않는다*/
-    if(req.url == null) { return null; }
+    if(!req.url) { return null; }
     if(ignore_http_method && ignore_http_method.toUpperCase().split(',').includes(req.method)) { return null; }
+    if (ignore_nextjs_build_file_enabled && ignore_nextjs_build_file_path && ignore_nextjs_build_file_path.split(',').some(path => req.url.startsWith(path))) {
+        return null;
+    }
 
     var ctx = TraceContextManager.start();
     if(ctx == null) { return null; }
@@ -738,6 +749,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
 
             var ctx = lctx.context;
             if (ctx == null || ( args[0].host == null && args[0].hostname == null)) { return; }
+            var is_ignore_error = false;
 
             ret.on('response', function(response){
                 var statusCode = response.statusCode;
@@ -757,7 +769,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                 if (TraceContextManager.resume(ctx._id) == null) { return; }
                 ctx.is_httpc_error = true;
 
-                if (transaction_status_error_enable && step.error.isZero()) {
+                if (transaction_status_error_enable && step.error.isZero() && !is_ignore_error) {
                     step.error = StatError.addError(err.code, err.message, ctx.service_hash,
                         TextTypes.HTTPC_URL, step.url);
                     if (ctx.error.isZero()) {
@@ -807,16 +819,17 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
 
                     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 (transaction_status_error_enable && ctx.error.isZero()) {
-                                ctx.error = step.error;
-                                ctx.statusCode = 'Timeout';
-                                ctx.statusMessage = 'Timeout';
-                            }
-                        }
-                        endHttpc(ctx, step);
+                        is_ignore_error = true;
+                        // if (step.error.isZero()) {
+                        //     var msgObj = { 'class': 'Timeout', 'msg': 'Timeout' };
+                        //     step.error = StatError.addError('Timeout','Timeout', ctx.service_hash);
+                        //     if (transaction_status_error_enable && ctx.error.isZero()) {
+                        //         ctx.error = step.error;
+                        //         ctx.statusCode = 'Timeout';
+                        //         ctx.statusMessage = 'Timeout';
+                        //     }
+                        // }
+                        // endHttpc(ctx, step);
                     });
                 }
             });

package/lib/observers/socket.io-observer.js

@@ -28,7 +28,7 @@ var trace_background_socket_enabled = conf.getProperty('trace_background_socket_
 conf.on('trace_background_socket_enabled', function (newProps) {
     trace_background_socket_enabled = newProps;
 })
-var trace_sampling_enabled = conf.getProperty('trace_sampling_enabled', false);
+var trace_sampling_enabled = conf.getProperty('trace_sampling_enabled', true);
 conf.on('trace_sampling_enabled', function (newProps) {
     trace_sampling_enabled = newProps;
 })

package/lib/observers/websocket-observer.js

@@ -0,0 +1,195 @@
+/**
+ * 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 MeterSocketio = require('../counter/meter/meter-socket.io'),
+    TraceContextManager = require('../trace/trace-context-manager'),
+    SocketStep = require('../step/socket-step'),
+    conf = require('../conf/configure'),
+    IPUtil = require('../util/iputil'),
+    Logger = require('../logger');
+const {Detector: URLPatternDetector} = require("whatap/lib/trace/serviceurl-pattern-detector");
+const HashUtil = require("whatap/lib/util/hashutil");
+const DataTextAgent = require("whatap/lib/data/datatext-agent");
+const ResourceProfile = require("whatap/lib/util/resourceprofile");
+const ProfilePack         = require('../pack/profile-pack');
+const TxRecord            = require('../service/tx-record');
+const DateUtil            = require('../util/dateutil');
+const SecurityMaster      = require('../net/security-master');
+const DataProfileAgent    = require('../data/dataprofile-agent');
+const MessageStep = require("whatap/lib/step/message-step");
+const MeterUsers = require("whatap/lib/counter/meter/meter-users");
+const DataPackSender = require("whatap/lib/data/datapack-sender");
+const MeterService        = require('../counter/meter/meter-service').MeterService;
+
+var trace_background_socket_enabled = conf.getProperty('trace_background_socket_enabled', false);
+conf.on('trace_background_socket_enabled', function (newProps) {
+    trace_background_socket_enabled = newProps;
+})
+var trace_sampling_enabled = conf.getProperty('trace_sampling_enabled', true);
+conf.on('trace_sampling_enabled', function (newProps) {
+    trace_sampling_enabled = newProps;
+})
+var trace_sampling_tps = conf.getProperty('trace_sampling_tps', 1000);
+conf.on('trace_sampling_tps', function (newProps) {
+    trace_sampling_tps = newProps;
+})
+
+var WebsocketObserver = function(agent){
+    this.agent = agent;
+    this.packages = ['websocket'];
+};
+
+var socket_count = {
+    count: 0,
+    start_time: null
+};
+
+WebsocketObserver.prototype.inject = function (mod, moduleName) {
+    if (mod.__whatap_observe__) {
+        return;
+    }
+    mod.__whatap_observe__ = true;
+    Logger.initPrint("WebsocketObserver");
+
+    var self = this;
+    var aop = self.agent.aop;
+
+    aop.after(mod.server.prototype, 'on', function (obj, args, ret, lctx){
+        aop.after(mod.connection.prototype, ['send', 'sendUTF', 'sendBytes'], function (obj, args, ret, lctx) {
+            if(!trace_background_socket_enabled) {
+                return;
+            }
+            if(trace_sampling_enabled){
+                var now = Date.now();
+                if(!socket_count.start_time) {
+                    socket_count.start_time = now;
+                }
+
+                if ((now - socket_count.start_time) > 5000) {
+                    socket_count.start_time = now;
+                    socket_count.count = 0;
+                }
+
+                socket_count.count++;
+                if(socket_count.count > trace_sampling_tps) {
+                    MeterService.add(0, 1, 0, 0, 0, 0);
+                    return;
+                }
+            }
+
+            var protocol = obj.protocol;
+            var remoteAddress = obj.remoteAddress;
+
+            TraceContextManager._asyncLocalStorage.run(initCtx(obj, args), () => {
+                try{
+                    var ctx = TraceContextManager._asyncLocalStorage.getStore();
+                    if (!ctx) {
+                        return;
+                    }
+
+                    var host;
+                    if (remoteAddress && remoteAddress.includes(':')) {
+                        host = remoteAddress.substring(remoteAddress.lastIndexOf(':') + 1);
+                    }
+
+                    ctx.socket_connecting = true;
+                    ctx.footprint('Websocket Connecting: ' + host);
+
+                    if (protocol) {
+                        var protocol_hash = HashUtil.hashFromString('Protocol');
+                        var step = new MessageStep();
+                        step.hash = protocol_hash;
+                        step.start_time = ctx.getElapsedTime();
+                        step.desc = protocol;
+
+                        DataTextAgent.MESSAGE.add(protocol_hash, 'Protocol');
+                        ctx.profile.add(step);
+                    }
+
+                    var step = new SocketStep();
+                    step.start_time = ctx.getElapsedTime();
+                    step.ipaddr = Buffer.from(IPUtil.stringToBytes(host));
+                    // step.port = port;
+
+                    ctx.socket_connecting = false;
+                    step.elapsed = ctx.getElapsedTime() - step.start_time;
+                    ctx.profile.push(step);
+
+                    ctx.footprint('Websocket Connecting Done');
+
+                    self.__endTransaction(null, ctx);
+                    return;
+                }catch (e) {
+                    Logger.printError('WHATAP-616', 'Websocket transaction error..', e, false);
+                    return;
+                }
+            });
+        })
+    })
+};
+
+WebsocketObserver.prototype.__endTransaction = function(error, ctx) {
+    try {
+        var profile = new ProfilePack();
+        var wtx = new TxRecord();
+        wtx.endTime = DateUtil.currentTime();
+        profile.time  = wtx.endTime;
+        wtx.elapsed = ctx.getElapsedTime();
+
+        DataTextAgent.SERVICE.add(ctx.service_hash, ctx.service_name);
+
+        wtx.seq = ctx.txid;
+        wtx.service = ctx.service_hash;
+        wtx.cpuTime = ResourceProfile.getCPUTime() - ctx.start_cpu;
+        wtx.malloc = ResourceProfile.getUsedHeapSize()-ctx.start_malloc;
+        if(wtx.malloc < 0) { wtx.malloc = 0; }
+        wtx.status = 2;
+
+        wtx.ipaddr = ctx.remoteIp;
+
+        MeterService.add(wtx.service, wtx.elapsed,
+            wtx.errorLevel, ctx.mcaller_pcode, ctx.mcaller_okind, ctx.mcaller_oid);
+
+        profile.oid = SecurityMaster.OID;
+        profile.service = wtx;
+
+        TraceContextManager.end(ctx._id);
+
+        setTimeout(function () {
+            DataProfileAgent.sendProfile(ctx, profile, false);
+            TraceContextManager.end(ctx._id);
+            ctx = null;
+        }, 100);
+    } catch (e) {
+        Logger.printError('WHATAP-615', 'Websocket end transaction error..', e, false);
+        TraceContextManager.end(ctx._id);
+        ctx = null;
+    }
+
+};
+
+function initCtx(socket, args) {
+    const ctx = TraceContextManager.start();
+    if (!ctx) {return;}
+
+    var remote_addr;
+    const address = socket.remoteAddress;
+    if(address && address.includes(':')){
+        remote_addr = address.substring(address.lastIndexOf(':')+1);
+    }
+
+    ctx.start_malloc = ResourceProfile.getUsedHeapSize();
+    ctx.start_cpu = ResourceProfile.getCPUTime();
+
+    remote_addr=IPUtil.checkIp4(remote_addr);
+    ctx.remoteIp = IPUtil.stringToInt(remote_addr);
+    ctx.userid = Long.fromNumber(ctx.remoteIp);
+    MeterUsers.add(ctx.userid);
+
+    return ctx;
+}
+
+exports.WebsocketObserver = WebsocketObserver;

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

@@ -160,6 +160,8 @@ TraceContextManager.prototype.endTrace = function (ctx) {
     service.endTime = DateUtil.currentTime();
     service.elapsed = ctx.getElapsedTime();
     service.service = ctx.service_hash;
+    DataTextAgent.SERVICE.add(ctx.service_hash, ctx.service_name);
+
     service.cpuTime = ResourceProfile.getCPUTime() - ctx.start_cpu;
     service.malloc = ResourceProfile.getUsedHeapSize() - ctx.start_malloc;
     if(service.malloc < 0) { service.malloc = 0; }

package/lib/util/index.js

@@ -33,11 +33,11 @@ function getRandomInteger(min, max) {
 }
 function printWhatap() {
     var str =
-        ' _      ____       ______NODE-AGENT  '     + (Configure.whatap_micro_enabled === true ? "\t\t\t| |        | |                        | |           " : '')+ '\n'+
-        '| | /| / / /  ___ /_  __/__ ____' + ''     + (Configure.whatap_micro_enabled === true ? "\t\t\t| | ___   _| |__   ___ _ __ _ __   ___| |_ ___  ___ " : '')+ '\n'+
-        '| |/ |/ / _ \\/ _ `// / / _ `/ _ \\' + ''  + (Configure.whatap_micro_enabled === true ? "\t\t\t| |/ / | | | '_ \\ / _ \\ '__| '_ \\ / _ \\ __/ _ \\/ __|" : '')+ '\n'+
-        '|__/|__/_//_/\\_,_//_/  \\_,_/ .__/' + ''  + (Configure.whatap_micro_enabled === true ? "\t\t\t|   <| |_| | |_) |  __/ |  | | | |  __/ ||  __/\\__ \\" : '')+ '\n'+
-        '                          /_/      ' + ''        + (Configure.whatap_micro_enabled === true ? "\t\t\t|_|\\_\\\\__,_|_.__/ \\___|_|  |_| |_|\\___|\\__\\___||___/" : '')+ '\n'+
+        ' _      ____       ______NODE-AGENT  '     + (Configure.whatap_micro_enabled === true || process.env.WHATAP_MICRO_ENABLED === "true" ? "\t\t\t| |        | |                        | |           " : '')+ '\n'+
+        '| | /| / / /  ___ /_  __/__ ____' + ''     + (Configure.whatap_micro_enabled === true || process.env.WHATAP_MICRO_ENABLED === "true" ? "\t\t\t| | ___   _| |__   ___ _ __ _ __   ___| |_ ___  ___ " : '')+ '\n'+
+        '| |/ |/ / _ \\/ _ `// / / _ `/ _ \\' + ''  + (Configure.whatap_micro_enabled === true || process.env.WHATAP_MICRO_ENABLED === "true" ? "\t\t\t| |/ / | | | '_ \\ / _ \\ '__| '_ \\ / _ \\ __/ _ \\/ __|" : '')+ '\n'+
+        '|__/|__/_//_/\\_,_//_/  \\_,_/ .__/' + ''  + (Configure.whatap_micro_enabled === true || process.env.WHATAP_MICRO_ENABLED === "true" ? "\t\t\t|   <| |_| | |_) |  __/ |  | | | |  __/ ||  __/\\__ \\" : '')+ '\n'+
+        '                          /_/      ' + ''        + (Configure.whatap_micro_enabled === true || process.env.WHATAP_MICRO_ENABLED === "true" ? "\t\t\t|_|\\_\\\\__,_|_.__/ \\___|_|  |_| |_|\\___|\\__\\___||___/" : '')+ '\n'+
         'Just Tap, Always Monitoring' + '\n'+
         'WhaTap Node Agent version ' + NodeUtil.getVersion() + ', ' + NodeUtil.getReleaseDate();
     console.log(str);

package/lib/util/paramsecurity.js

@@ -50,7 +50,8 @@ ParamSecurity.prototype.reload = function () {
             self.key = Buffer.from(self.key);
         });
     } catch (e) {
-        self.key = self.getKey();
+        // self.key = self.getKey();
+        self.key = 'WHATAP';
         var printWriter = fs.createWriteStream(file, {flags : 'w'});
         printWriter.write(self.key);
         self.key = Buffer.from(self.key);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.95",
-  "releaseDate": "20240429",
+  "version": "0.4.97",
+  "releaseDate": "20240603",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},