whatap 0.4.91 → 0.4.93

package/README.md

@@ -7,7 +7,7 @@ Whatap allows for application performance monitoring.
 
 Works on Linux(32bit, 64bit), MacOSx(32bit, 64bit), Windows(32bit, 64bit).
 
-*Node.js 지원 버젼: 4.3.2 이상
+*Node.js 지원 버젼: 16.4.0 이상
 
 ![step01](http://apm.whatap.io/images/icon_step01.png)
 
@@ -15,7 +15,7 @@ Works on Linux(32bit, 64bit), MacOSx(32bit, 64bit), Windows(32bit, 64bit).
 
 npm 에서 다음과 같은 명령어를 통해 whatap을 설치 할 수 있습니다.
 
-    $ npm install --save whatap
+    $ npm install whatap
 
 
 
@@ -37,11 +37,22 @@ whatap.conf 파일은 다음과 같은 내용을 포함합니다.
 
 #### Usage
 
-루트 디렉토리의 Node.js Application에 다음과 같은 코드를 추가 해 주세요.
+루트 디렉토리에 위치한 Node.js 애플리케이션에서 Whatap 모니터링 기능을 활성화하려면, 
+애플리케이션의 진입점 파일에 Whatap 에이전트를 초기화하는 코드를 추가해야 합니다.
 
+Node.js 애플리케이션에 Whatap 모니터링을 적용하는 방법은 모듈 시스템의 종류(CommonJS 또는 ECMAScript Modules, ESM)에 따라 약간 다릅니다. 아래에서는 두 가지 모듈 시스템에 대해 Whatap 에이전트를 초기화하고 사용하는 방법을 설명합니다.
+
+
+#### CommonJS 모듈 시스템 사용 시
+Whatap 에이전트를 CommonJS 방식으로 가져오고 초기화하려면, 다음 코드를 애플리케이션의 진입점 파일에 추가하세요:
+    
     var WhatapAgent = require('whatap').NodeAgent;
 
+#### ECMAScript 모듈(ESM) 시스템 사용 시
+ESM 방식으로 Whatap 에이전트를 가져오고 사용하려면, 다음과 같이 코드를 작성하세요:
 
+    import WhatapAgent from 'whatap';
+    WhatapAgent.NodeAgent;
 
 ![step04](http://apm.whatap.io/images/icon_step04.png)
 

package/lib/conf/config-default.js

@@ -36,7 +36,7 @@ var ConfigDefault = {
     "web_static_content_extensions": str("web_static_content_extensions" , "js, htm, html, gif, png, jpg, css, txt, ico"),
     "trace_auto_service_enabled": false,
     "trace_auto_service_backstack_enabled": true,
-    "trace_background_socket_enabled": true,
+    "trace_background_socket_enabled": bool('trace_background_socket_enabled', true),
     "trace_node_schedule_enabled": bool('trace_node_schedule_enabled',false),
     "trace_active_callstack_depth": 40,
     "trace_activeserivce_yellow_time": 3000,

package/lib/observers/net-observer.js

@@ -5,25 +5,26 @@
  */
 
 var TraceContextManager = require('../trace/trace-context-manager'),
-    SocketStep = require('../step/socket-step'),
-    conf = require('../conf/configure'),
-    IPUtil = require('../util/iputil'),
-    Logger = require('../logger');
+    SocketStep           = require('../step/socket-step'),
+    conf                = require('../conf/configure'),
+    IPUtil              = require('../util/iputil'),
+    Logger              = require('../logger');
 
-var NetObserver = function (agent) {
+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 NetObserver = function(agent){
     this.agent = agent;
-    this.packages = ['net', 'dgram'];
+    this.packages = ['net'];
 };
 
 NetObserver.prototype.inject = function (mod, moduleName) {
-    if (mod.__whatap_observe__) {
-        return;
-    }
+    if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
     Logger.initPrint("NetObserver");
-    if (conf.trace_background_socket_enabled === false) {
-        return;
-    }
+    if ( !trace_background_socket_enabled ) { return; }
 
     var self = this;
     var aop = self.agent.aop;
@@ -31,80 +32,46 @@ NetObserver.prototype.inject = function (mod, moduleName) {
     aop.both(mod.Socket.prototype, ['connect'],
         function (obj, args, lctx) {
             var ctx = lctx.context;
-            if (ctx == null) {
+            if(!ctx || !trace_background_socket_enabled){
                 return;
             }
-            var host, port;
-            if (args.length > 1) {
-                host = args[1];
-                port = args[0];
+            var info, host, port;
+            if(args.length > 0){
+                info = args[0];
+                host = info.host;
+                port = info.port;
             }
-            if (port == undefined) {
+            if(port == undefined){
                 lctx.step = null;
                 return;
             }
-            ctx.socket_connecting = true;
+            ctx.socket_connecting=true;
 
-            ctx.footprint('Socket Connecting: ' + host + ':' + port);
+            ctx.footprint('Socket Connecting: ' + host+':'+port);
 
             var step = new SocketStep();
             step.start_time = ctx.getElapsedTime();
             step.ipaddr = Buffer.from(IPUtil.stringToBytes(host));
             step.port = port;
+            // obj.on('lookup', function(err, ip, addressType){
+            //     if(step != null) {
+            //         step.ipaddr = new Buffer(IPUtil.stringToBytes(ip));
+            //     }
+            // });
             ctx.profile.push(step);
             lctx.step = step;
         },
         function (obj, args, ret, lctx) {
             var ctx = lctx.context;
             var step = lctx.step;
-            if (ctx == null || step == null) {
+            if(!ctx || !step || !trace_background_socket_enabled){
                 return;
             }
-            ctx.socket_connecting = false;
+            ctx.socket_connecting=false;
             step.elapsed = ctx.getElapsedTime() - step.start_time;
             ctx.footprint('Socket Connecting Done');
         }
     );
-
-    aop.both(mod, ['createSocket'],
-        function (obj, args, lctx) {
-            var ctx = lctx.context;
-            if (ctx == null) {
-                return;
-            }
-        },
-        function (obj, args, ret, lctx) {
-            var ctx = lctx.context;
-            if (ctx == null) {
-                return;
-            }
-            aop.after(ret, 'send', function (_obj, _args, _ret, _lctx) {
-                var host, port;
-                if (_args.length > 2) {
-                    host = _args[2];
-                    port = _args[1];
-                }
-                if (port == undefined) {
-                    lctx.step = null;
-                    return;
-                }
-                ctx.socket_connecting = true;
-
-                ctx.footprint('Socket Connecting: ' + host + ':' + port);
-
-                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');
-            })
-        }
-    );
 };
 
 exports.NetObserver = NetObserver;

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

@@ -4,137 +4,51 @@
  * 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 MeterService        = require('../counter/meter/meter-service').MeterService;
+var MeterSocketio = require('../counter/meter/meter-socket.io');
 
 var SocketIOObserver = function(agent){
     this.agent = agent;
     this.packages = ['socket.io'];
 };
 
-SocketIOObserver.prototype.inject = function (mod, moduleName) {
-    if (mod.__whatap_observe__) {
-        return;
-    }
-    mod.__whatap_observe__ = true;
-    Logger.initPrint("SocketIOObserver");
-    if (conf.trace_background_socket_enabled === false) {
-        return;
-    }
-
+SocketIOObserver.prototype.inject = function( mod ){
     var self = this;
     var aop = self.agent.aop;
 
-    aop.before(mod.Server?.prototype, 'on', function (obj, args, ret, lctx) {
-        args[args.length-1] = self.__createTransactionObserver(args[args.length-1]);
-    })
-};
-
-SocketIOObserver.prototype.__createTransactionObserver = function (callback) {
-    var self = this;
-
-    return function (){
-        TraceContextManager._asyncLocalStorage.run(initCtx(), () => {
-            var ctx = TraceContextManager._asyncLocalStorage.getStore();
-            if(!ctx) {
-                return;
-            }
-
-            MeterSocketio.connected(1);
-
-            var host;
-            const socket = arguments[0];
-            const address = socket.handshake.address;
-            if(address && address.includes(':')){
-                host = address.substring(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;
-        })
-    }
-}
-
-SocketIOObserver.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();
-
-        ctx.service_hash = HashUtil.hashFromString(ctx.service_name);
-        DataTextAgent.SERVICE.add(ctx.service_hash, ctx.service_name);
-
-        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;
-
-        MeterService.add(wtx.service, wtx.elapsed,
-            wtx.errorLevel, ctx.mcaller_pcode, ctx.mcaller_okind, ctx.mcaller_oid);
+    if(mod.__whatap_observe__) { return; }
+    mod.__whatap_observe__ = true;
 
-        profile.oid = SecurityMaster.OID;
-        profile.service = wtx;
+    aop.after(mod.prototype, ['listen','attach'], function(obj, args, ret) {
+        if (!ret.sockets) return;
 
-        TraceContextManager.end(ctx._id);
-        setTimeout(function () {
-            DataProfileAgent.sendProfile(ctx, profile, false);
-            ctx = null;
-        }, 100);
+        aop.before(ret.sockets, ['on', 'addListener'], function(obj, args) {
+            if (args[0] !== 'connection') return;
 
-    } catch (e) {
-        Logger.printError('WHATAP-607', 'End transaction error..', e, false);
-        TraceContextManager.end(ctx._id);
-        ctx = null;
-    }
+            aop.functionHook(args, -1, function(obj, args) {
+                if (!args[0]) return; //no client socket
 
-};
+                var socket = args[0];
 
-function initCtx() {
-    const ctx = TraceContextManager.start();
-    if (!ctx) {
-        return;
-    }
+                MeterSocketio.connected(1);
 
-    ctx.start_malloc = ResourceProfile.getUsedHeapSize();
-    ctx.start_cpu = ResourceProfile.getCPUTime();
+                socket.on('disconnect', function() {
+                    MeterSocketio.disconnected();
+                });
 
-    var remote_addr = IPUtil.checkIp4("0.0.0.0");
-    ctx.remoteIp = IPUtil.stringToInt(remote_addr);
+                aop.before(socket, ['emit', 'send'], function(obj, args) {
+                    if (args[0] === 'newListener') return;
+                    MeterSocketio.send(null, args);
+                });
 
-    return ctx;
+                aop.before(socket, ['on', 'addListener'], function(obj, args) {
+                    if (args[0] === 'disconnect') return;
+                    aop.functionHook(args, -1, function (obj, args) {
+                        MeterSocketio.receive(null, args[0]);
+                    });
+                });
+            });
+        });
+    });
 }
 
 exports.SocketIOObserver = SocketIOObserver;

package/lib/util/iputil.js

@@ -33,19 +33,23 @@ function charToInt(ch) {
 function IPUtil() {
 }
 IPUtil.prototype.stringToBytes = function (ipStr) {
-    if(ipStr ===null || ipStr === undefined){
+    try{
+        if (ipStr === null || ipStr === undefined) {
+            return emptyBytes;
+        }
+        var ipArr = ipStr.split(".");
+        if (ipArr.length < 4)
+            return emptyBytes;
+
+        var buf = [0, 0, 0, 0];
+        buf[0] = wordToInt(ipArr[0]) & 0xFF;
+        buf[1] = wordToInt(ipArr[1]) & 0xFF;
+        buf[2] = wordToInt(ipArr[2]) & 0xFF;
+        buf[3] = wordToInt(ipArr[3]) & 0xFF;
+        return buf;
+    }catch (e) {
         return emptyBytes;
     }
-    var ipArr = ipStr.split(".");
-    if (ipArr.length < 4)
-        return emptyBytes;
-
-    var buf = [0,0,0,0];
-    buf[0] = wordToInt(ipArr[0]) & 0xFF;
-    buf[1] = wordToInt(ipArr[1]) & 0xFF;
-    buf[2] = wordToInt(ipArr[2]) & 0xFF;
-    buf[3] = wordToInt(ipArr[3]) & 0xFF;
-    return buf;
 }
 
 IPUtil.prototype.stringToInt = function (ip) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.91",
-  "releaseDate": "20240205",
+  "version": "0.4.93",
+  "releaseDate": "20240214",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},