whatap 0.5.0 → 0.5.2

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.2",
+  "releaseDate": "20241017",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},