whatap 1.0.6 → 1.0.7

package/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(chmod:*)",
+      "Bash(./fix_whatap_context.sh)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/lib/core/agent.js

@@ -9,7 +9,9 @@ var os = require('os'),
     path = require('path'),
     child_process = require('child_process'),
     properLock = require('proper-lockfile'),
-    crypto = require('crypto');
+    crypto = require('crypto'),
+    cluster = require('cluster');
+
 
 const RequestLog = require('../requestlog');
 
@@ -364,6 +366,9 @@ NodeAgent.prototype.openPortFile = function(filepath) {
  * @returns {number|null} - Allocated port number or null if failed
  */
 NodeAgent.prototype.getPortNumber = function(port, home) {
+    // Node.js cluster 모드 감지 (isPM2ClusterMode 호출 전에 실행)
+    this.isClusterMode();
+
     port = port || 6600;
     home = home || process.env.WHATAP_HOME;
 
@@ -615,6 +620,29 @@ NodeAgent.prototype.updateConfig = function(home, optKey, optValue) {
     }
 };
 
+/**
+ * Detect Node.js cluster mode and set environment variables
+ * This allows Node.js cluster to work the same way as PM2 cluster mode
+ */
+NodeAgent.prototype.isClusterMode = function() {
+    // PM2 환경 변수가 이미 있으면 skip
+    if (process.env.pm_id !== undefined) {
+        return;
+    }
+
+    // Node.js cluster worker인 경우 PM2 cluster 형태로 환경 변수 설정
+    if (cluster.worker) {
+        process.env.pm_id = cluster.worker.id.toString();
+
+        // instances 값은 실제로는 알 수 없지만, 2 이상으로 설정하여 클러스터 모드 활성화
+        if (!process.env.instances) {
+            process.env.instances = '2';
+        }
+
+        Logger.print("WHATAP-120", `Node.js cluster mode detected: worker ${cluster.worker.id}`, false);
+    }
+};
+
 /**
  * Check if running in PM2 cluster mode
  * @returns {boolean} - True if PM2 cluster mode

package/lib/observers/http-observer.js

@@ -139,6 +139,7 @@ HttpObserver.prototype.__createTransactionObserver = function (callback, isHttps
                 String(ctx.isStaticContents),
                 req.method
             ];
+            console.log(`ctx.userid: ${ctx.userid}`)
 
             aop.after(res, 'end', function (obj, args) {
                 if (ctx == null) {
@@ -219,16 +220,12 @@ function initCtx(req, res) {
             remote_addr = remote_addr.split(',')[0].trim();
         }
         ctx.remoteIp = IPUtil.checkIp4(remote_addr);
-        switch (conf.trace_user_using_type || 3) {
-            case 1:
-                ctx.userid = Long.fromNumber(ctx.remoteIp);
-                break;
-            case 2:
-                // MeterUsers.add(ctx.userid);
-                break;
-            case 3:
+        if(conf.getProperty('trace_user_enabled', true)){
+            if(conf.getProperty('trace_user_using_ip', true)){
+                ctx.userid = ctx.remoteIp;
+            }else{
                 ctx.userid = UserIdUtil.getUserId(req, res, 0);
-                break;
+            }
         }
     } catch (e) {
     }

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

@@ -521,6 +521,8 @@ SocketIOObserver.prototype.__initCtx = function(socket, args, emitType, contextI
     const ctx = TraceContextManager.start();
     if (!ctx) return null;
 
+    ctx.service_name = "/socket.io";
+
     var remote_addr;
     var remoteAddress = contextInfo.remoteAddress || (socket && socket.conn && socket.conn.remoteAddress);
 
@@ -530,12 +532,11 @@ SocketIOObserver.prototype.__initCtx = function(socket, args, emitType, contextI
         }
     }
 
-    ctx.service_name = "/socket.io";
-
-    if (remote_addr) {
-        remote_addr = IPUtil.checkIp4(remote_addr);
-        ctx.remoteIp = IPUtil.stringToInt(remote_addr);
-        ctx.userid = ctx.remoteIp;
+    if(remote_addr){
+        ctx.remoteIp = IPUtil.checkIp4(remote_addr);
+        if(conf.getProperty('trace_user_enabled', true)){
+            ctx.userid = ctx.remoteIp;
+        }
     }
 
     // 기본값 설정

package/lib/observers/websocket-observer.js

@@ -9,10 +9,7 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     IPUtil = require('../util/iputil'),
     Logger = require('../logger');
 const {Detector: URLPatternDetector} = require("../trace/serviceurl-pattern-detector");
-const DateUtil = require('../util/dateutil');
-const SecurityMaster = require('../net/security-master');
 const shimmer = require('../core/shimmer');
-const HashUtil = require('../util/hashutil');
 const AsyncSender = require('../udp/async_sender');
 const PacketTypeEnum = require('../udp/packet_type_enum');
 const os = require('os');
@@ -390,6 +387,8 @@ WebsocketObserver.prototype.__initCtx = function(connection, data, emitType, con
     const ctx = TraceContextManager.start();
     if (!ctx) return null;
 
+    ctx.service_name = "/websocket";
+
     var remote_addr;
     var remoteAddress = contextInfo.remoteAddress;
 
@@ -399,12 +398,11 @@ WebsocketObserver.prototype.__initCtx = function(connection, data, emitType, con
         }
     }
 
-    ctx.service_name = "/websocket";
-
-    if (remote_addr) {
-        remote_addr = IPUtil.checkIp4(remote_addr);
-        ctx.remoteIp = IPUtil.stringToInt(remote_addr);
-        ctx.userid = ctx.remoteIp;
+    if(remote_addr){
+        ctx.remoteIp = IPUtil.checkIp4(remote_addr);
+        if(conf.getProperty('trace_user_enabled', true)){
+            ctx.userid = ctx.remoteIp;
+        }
     }
 
     // 기본값 설정

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "1.0.6",
-  "releaseDate": "20251030",
+  "version": "1.0.7",
+  "releaseDate": "20251106",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},