whatap 0.5.0 → 0.5.1

package/lib/conf/config-default.js

@@ -264,6 +264,8 @@ var ConfigDefault = {
     "grpc_profile_stream_client_enabled": bool("grpc_profile_stream_client_enabled", true),
     "grpc_profile_stream_server_enabled": bool("grpc_profile_stream_server_enabled", true),
     "grpc_profile_ignore_method": bool("grpc_profile_ignore_method", true),
+
+    "oname_port_postfix_enabled": bool("oname_port_postfix_enabled", false),
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/net/security-master.js

@@ -105,7 +105,7 @@ var SecurityMaster = {
         }
 
         //OidUtil.setCmd(Configuration.getProperty("sun.java.command"));
-        this.ONAME = OidUtil.mkOname(Configuration.getProperty("whatap.name", name_pattern));
+        this.ONAME = OidUtil.mkOname(Configuration.getProperty("whatap.name", name_pattern), port);
         this.OID = OidUtil.mkOid(this.ONAME);
 
         if (lastOid != this.OID) {

package/lib/observers/global-observer.js

@@ -15,12 +15,20 @@ const KeyGen = require("../util/keygen");
 const HashUtil = require("../util/hashutil");
 const DataTextAgent = require("../data/datatext-agent");
 const shimmer = require('../core/shimmer');
+const StatError = require("../stat/stat-error");
+const TextTypes = require("../lang/text-types");
+const URLPatternDetector  = require('../trace/serviceurl-pattern-detector').Detector;
 
 var GlobalObserver = function (agent) {
     this.agent = agent;
     this.packages = ['global'];
 }
 
+var transaction_status_error_enable = conf.getProperty('transaction_status_error_enable', true);
+conf.on('transaction_status_error_enable', function (newProps) {
+    transaction_status_error_enable = newProps;
+})
+
 GlobalObserver.prototype.inject = function (mod, moduleName) {
     var self = this;
 
@@ -37,7 +45,7 @@ GlobalObserver.prototype.inject = function (mod, moduleName) {
     });
 
     shimmer.wrap(mod, 'fetch', function(original) {
-        return function(...args) {
+        return async function(...args) {
             var info = args[1] ? args[1] : {};
             var ctx = TraceContextManager._asyncLocalStorage.getStore();
 
@@ -45,51 +53,103 @@ GlobalObserver.prototype.inject = function (mod, moduleName) {
                 interTxTraceAutoOn(ctx);
 
                 if (conf.mtrace_enabled) {
-                    if (info.headers) {
-                        info.headers['x-wtap-po'] = transferPOID(ctx);
-                    } else {
-                        info.headers = {
-                            'x-wtap-po': transferPOID(ctx)
-                        };
-                    }
-                    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);
-                    }
+                    addTraceHeaders(info, ctx);
                     args[1] = info;
                 }
             }
 
-            const promise = original.apply(this, args);
-
-            promise.then(response => {
-                var ctx = TraceContextManager._asyncLocalStorage.getStore();
-                if (ctx && args[0]) {
-                    const url = new URL(args[0]);
-                    ctx.httpc_host = url.hostname;
-                    ctx.httpc_url = url.pathname;
-                    ctx.httpc_port = url.port || (url.protocol === 'https:' ? 443 : 80);
-
-                    var step = new HttpStepX();
-                    step.start_time = ctx.getElapsedTime();
-                    step.url = HashUtil.hashFromString(ctx.httpc_url);
-                    DataTextAgent.HTTPC_URL.add(step.url, ctx.httpc_url);
-                    step.host = HashUtil.hashFromString(ctx.httpc_host);
-                    DataTextAgent.HTTPC_HOST.add(step.host, ctx.httpc_host);
-                    step.port = ctx.httpc_port;
-
-                    ctx.profile.push(step);
-                }
-            }).catch(e => {
-                Logger.printError("WHATAP-704", "Promise error occurred during fetch: " + e, false);
-            });
-            return promise;
+            try {
+                const response = await original.apply(this, args);
+                handleResponse(ctx, args, response);
+                return response;
+            } catch (e) {
+                handleError(ctx, args, e);
+                throw e;
+            }
         };
     });
 };
 
+function addTraceHeaders(info, ctx) {
+    if (info.headers) {
+        info.headers['x-wtap-po'] = transferPOID(ctx);
+    } else {
+        info.headers = {
+            'x-wtap-po': transferPOID(ctx)
+        };
+    }
+    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);
+    }
+}
+
+function handleResponse(ctx, args, response) {
+    if (!ctx || !args[0]) return;
+
+    const url = new URL(args[0]);
+    setupContext(ctx, url);
+
+    var step = createStep(ctx, url);
+
+    if (!response.ok && transaction_status_error_enable) {
+        recordError(ctx, step, response);
+    }
+
+    ctx.profile.push(step);
+}
+
+function handleError(ctx, args, error) {
+    if (!ctx || !args[0]) return;
+
+    const url = new URL(args[0]);
+    setupContext(ctx, url);
+
+    var step = createStep(ctx, url);
+
+    if (transaction_status_error_enable) {
+        recordError(ctx, step, error);
+    }
+
+    ctx.profile.push(step);
+}
+
+function setupContext(ctx, url) {
+    ctx.httpc_host = url.hostname;
+    ctx.httpc_url = url.pathname;
+    ctx.httpc_port = url.port || (url.protocol === 'https:' ? 443 : 80);
+}
+
+function createStep(ctx, url) {
+    var step = new HttpStepX();
+    step.start_time = ctx.getElapsedTime();
+    step.url = HashUtil.hashFromString(ctx.httpc_url);
+    DataTextAgent.HTTPC_URL.add(step.url, ctx.httpc_url);
+    step.host = HashUtil.hashFromString(ctx.httpc_host);
+    DataTextAgent.HTTPC_HOST.add(step.host, ctx.httpc_host);
+    step.port = ctx.httpc_port;
+    return step;
+}
+
+function recordError(ctx, step, response) {
+    if (step.error.isZero()) {
+        var cleanUrl = ctx.httpc_url.split('?')[0];
+        ctx.service_name = URLPatternDetector.normalize(cleanUrl);
+        ctx.service_hash = HashUtil.hashFromString(ctx.service_name);
+
+        const errorMessage = response.statusText || (response.cause ? response.cause.message : '') || response.message || 'Unknown error';
+        step.error = StatError.addError(response.status || null, errorMessage, ctx.service_hash, TextTypes.HTTPC_URL, step.url);
+
+        if (ctx.error.isZero()) {
+            ctx.error = step.error;
+            ctx.statusCode = response.status || null;
+            ctx.statusMessage = errorMessage;
+        }
+    }
+}
+
 var transfer_poid;
 function transferPOID(ctx) {
     if (transfer_poid)

package/lib/observers/grpc-observer.js

@@ -51,13 +51,10 @@ const types = {
     bidi: 'bidi'
 };
 
-var _module;
-
 GRpcObserver.prototype.inject = function(mod, moduleName) {
     if (mod.__whatap_observe__) {
         return;
     }
-    _module = mod;
     mod.__whatap_observe__ = true;
     Logger.initPrint("GRpcObserver");
 

package/lib/observers/http-observer.js

@@ -244,6 +244,9 @@ function initCtx(req, res) {
     if (ignore_build_file_enabled && ignore_build_file_path && ignore_build_file_path.split(',').some(path => req.url.startsWith(path))) {
         return null;
     }
+    if( conf.getProperty('profile_enabled', true) === false ) {
+        return null;
+    }
 
     var ctx = TraceContextManager.start();
     if(ctx == null) { return null; }
@@ -649,7 +652,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
     Logger.initPrint("HttpObserver");
-    if( conf.profile_enabled === false ) { return; }
+    if( conf.getProperty('profile_enabled', true) === false ) { return; }
 
     aop.after(mod, 'createServer', function (obj, args, ret) {
         aop.before(ret, 'listen', function (obj, args) {

package/lib/observers/process-observer.js

@@ -41,7 +41,6 @@ ProcessObserver.prototype._hookNextTick = function (mod) {
 ProcessObserver.prototype._hookStdOutWrite = function () {
     this.agent.aop.after(process.stdout, 'write', (obj, args) => {
         if (conf.getProperty('logsink_enabled', false) && args[0]) {
-            return;
             let content = typeof args[0] === 'string' ? args[0] : (args[0].message || '');
             try {
                 const parsedContent = JSON.parse(content);
@@ -58,7 +57,6 @@ ProcessObserver.prototype._hookStdOutWrite = function () {
 ProcessObserver.prototype._hookStdErrWrite = function () {
     this.agent.aop.after(process.stderr, 'write', (obj, args) => {
         if (conf.getProperty('logsink_enabled', false) && args[0]) {
-            return;
             let content = typeof args[0] === 'string' ? args[0] : (args[0].message || '');
             try {
                 const parsedContent = JSON.parse(content);

package/lib/observers/redis-observer.js

@@ -169,8 +169,13 @@ RedisObserver.prototype.inject = function (mod, modName) {
             }
         }
     }, function (obj, args, ret, lctx) {
+        var ctx = lctx.context;
+        if (!ctx) {
+            return;
+        }
+
         var selectCommand = new Set(['get', 'hget', 'hmget', 'zrange', 'smembers', 'lrange']);
-        var insertCommand = new Set(['set', 'hset', 'hmset', 'zadd', 'lset', 'sadd', 'lpush', 'rpush']);
+        var insertCommand = new Set(['set', 'hset', 'hmset', 'zadd', 'lset', 'sadd', 'lpush', 'rpush', 'evalsha']);
         var updateCommand = new Set(['set', 'lset', 'hset', 'zadd']);
         var deleteCommand = new Set(['del', 'lrem', 'srem', 'hdel', 'zrem']);
         var commands = new Set([...selectCommand, ...insertCommand, ...updateCommand, ...deleteCommand]);
@@ -180,10 +185,10 @@ RedisObserver.prototype.inject = function (mod, modName) {
         }
         var command = args[0].name;
         if(commands.has(command.toLowerCase())){
-            var ctx = TraceContextManager.getCurrentContext();
-            if (ctx == null) {
-                return;
-            }
+            // var ctx = TraceContextManager.getCurrentContext();
+            // if (ctx == null) {
+            //     return;
+            // }
 
             var dbc_step = new DBCStep();
             dbc_step.hash = ioredis_dbc_hash;

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

@@ -4,27 +4,24 @@
  * can be found in the LICENSE file.
  */
 
-var MeterSocketio = require('../counter/meter/meter-socket.io'),
-    TraceContextManager = require('../trace/trace-context-manager'),
+var 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 {Detector: URLPatternDetector} = require("../trace/serviceurl-pattern-detector");
+const DataTextAgent = require("../data/datatext-agent");
+const ResourceProfile = require("../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 MeterUsers = require("../counter/meter/meter-users");
 const MeterService        = require('../counter/meter/meter-service').MeterService;
+const shimmer = require('../core/shimmer');
 
-var trace_background_socket_enabled = conf.getProperty('trace_background_socket_enabled', false);
+var trace_background_socket_enabled = conf.getProperty('trace_background_socket_enabled', true);
 conf.on('trace_background_socket_enabled', function (newProps) {
     trace_background_socket_enabled = newProps;
 })
@@ -55,66 +52,78 @@ SocketIOObserver.prototype.inject = function (mod, moduleName) {
     Logger.initPrint("SocketIOObserver");
 
     var self = this;
-    var aop = self.agent.aop;
 
-    aop.after(mod.Server.prototype, 'on', function (obj, args, ret, lctx) {
-        aop.after(mod.Socket.prototype, 'emit', function (_obj, _args, _ret, _lctx) {
-            if(!trace_background_socket_enabled) {
-                return;
+    shimmer.wrap(mod.prototype, 'on', function (original) {
+        return function (event, listener) {
+            if (event === 'connection') {
+                return original.call(this, event, function (socket) {
+                    shimmer.wrap(socket, 'emit', function (origEmit) {
+                        return function (emitEvent, ...args) {
+                            if (trace_background_socket_enabled) {
+                                self.__handleSocketEmitEvent(socket, emitEvent, args);
+                            }
+
+                            return origEmit.apply(this, [emitEvent, ...args]);
+                        };
+                    });
+
+                    return listener.apply(this, [socket]);
+                });
             }
-            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;
-                }
+
+            return original.call(this, event, listener);
+        };
+    });
+};
+
+SocketIOObserver.prototype.__handleSocketEmitEvent = function(socket, event, args) {
+    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;
+        }
+    }
+
+    TraceContextManager._asyncLocalStorage.run(initCtx(socket, args), () => {
+        try {
+            var ctx = TraceContextManager._asyncLocalStorage.getStore();
+            if (!ctx) return;
+
+            ctx.footprint('Socket Emit Event: ' + event);
+
+            var host;
+            if (socket.conn && socket.conn.remoteAddress && socket.conn.remoteAddress.includes(':')) {
+                host = socket.conn.remoteAddress.substring(socket.conn.remoteAddress.lastIndexOf(':') + 1);
             }
 
-            TraceContextManager._asyncLocalStorage.run(initCtx(_obj, _args), () => {
-                try{
-                    var ctx = TraceContextManager._asyncLocalStorage.getStore();
-                    if (!ctx) {
-                        return;
-                    }
-
-                    var socket = _obj;
-                    var host;
-                    if (socket.handshake && socket.handshake.address && socket.handshake.address.includes(':')) {
-                        host = socket.handshake.address.substring(socket.handshake.address.lastIndexOf(':') + 1);
-                    }
-
-                    ctx.socket_connecting = true;
-                    ctx.footprint('Socket Connecting: ' + host);
-
-                    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('Socket Connecting Done');
-
-                    self.__endTransaction(null, ctx);
-                    return;
-                }catch (e) {
-                    Logger.printError('WHATAP-616', 'socket.io transaction error..', e, false);
-                    return;
-                }
-            });
-        });
+            ctx.socket_connecting = true;
+            ctx.footprint('Socket Connecting: ' + host);
+
+            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)
+
+            this.__endTransaction(null, ctx);
+
+        } catch (e) {
+            Logger.printError('WHATAP-616', 'socket.io emit transaction error..', e, false);
+        }
     });
 };
 
@@ -163,7 +172,7 @@ function initCtx(socket, args) {
     if (!ctx) {return;}
 
     var remote_addr;
-    const address = socket.handshake.address;
+    const address = socket.conn.remoteAddress;
     if(address && address.includes(':')){
         remote_addr = address.substring(address.lastIndexOf(':')+1);
     }

package/lib/util/oidutil.js

@@ -54,7 +54,7 @@ var OidUtil = {
     mkOid: function(oname){
         return HashUtil.hash(Buffer.from(oname));
     },
-    mkOname: function(pattern){
+    mkOname: function(pattern, port){
         var conf = require('./../conf/configure');
         var startBrace = "{";
         var endBrace = "}";
@@ -83,6 +83,9 @@ var OidUtil = {
                 pattern = pattern.replace(keyFull, key);
             }
         };
+        if(conf.getProperty('oname_port_postfix_enabled', false) && port){
+            pattern = pattern + '-' + port;
+        }
         return pattern;
     },
     toString: function(){

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.0",
-  "releaseDate": "20240812",
+  "version": "0.5.1",
+  "releaseDate": "20240828",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},