whatap 2.0.0-canary.0 → 2.0.0

package/.claude/settings.local.json

@@ -7,7 +7,8 @@
       "Bash(ls -l \"$\\(go env GOPATH\\)/bin/govulncheck\")",
       "Bash(brew list *)",
       "Bash(brew search *)",
-      "Bash(brew info *)"
+      "Bash(brew info *)",
+      "Bash(echo \"--- exit $? ---\")"
     ]
   }
 }

package/lib/conf/config-default.js

@@ -289,7 +289,6 @@ var ConfigDefault = {
 
     // LLM monitoring
     "llm_enabled": bool("llm_enabled", false),
-    "trace_llm_log_enabled": bool("trace_llm_log_enabled", false),
     "llm_net_udp_port": num("llm_net_udp_port", 0),
     "llm_model_pricing": str("llm_model_pricing", "")
 

package/lib/core/agent.js

@@ -997,7 +997,7 @@ NodeAgent.prototype.startGoAgent = function(opts = {}) {
     if (pid) {
         try {
             if (this.isGoAgentRunning(pid)) {
-                // Windows: 기존 프로세스가 실행 중이면 스킵 (Python agent와 동일한 동작)
+                // Windows: 기존 프로세스가 실행 중이면 스킵
                 // Unix/Linux: 기존 프로세스 종료 후 새로 시작
                 if (process.platform === 'win32') {
                     Logger.print("WHATAP-106", `Agent already running (PID: ${pid}). Skipping duplicate execution.`, false);
@@ -1252,7 +1252,6 @@ NodeAgent.prototype.startGoAgent = function(opts = {}) {
 
 /**
  * Start a separate Go Agent for LLM monitoring (with --llm flag)
- * Python equivalent: go(llm=True)
  */
 NodeAgent.prototype.startLlmGoAgent = function () {
     var self = this;
@@ -1299,7 +1298,7 @@ NodeAgent.prototype.startLlmGoAgent = function () {
             } catch (e) {}
         }
 
-        // Build environment (python equivalent: WHATAP_NET_UDP_PORT, WHATAP_PID_FILE, *_PARENT_APP_PID)
+        // Build environment
         var newEnv = Object.assign({}, process.env);
         newEnv['WHATAP_NET_UDP_PORT'] = String(llmPort);
         newEnv['WHATAP_PID_FILE'] = AGENT_NAME + '.pid.llm';
@@ -1315,7 +1314,7 @@ NodeAgent.prototype.startLlmGoAgent = function () {
             cwd: whatapHome,
             env: newEnv,
             stdio: ['pipe', 'pipe', 'pipe'],
-            detached: true, // python: start_new_session=True
+            detached: true, //
         };
 
         if (platform === 'win32') {

package/lib/counter/counter-manager.js

@@ -22,7 +22,6 @@ CounterManager.prototype.run = function () {
         var tasks = [];
         tasks.push(new GCAction());
 
-        // LLM 메트릭 6종 (5초 주기). llm_meter는 python-apm과 일치 — 제거됨.
         // 호출 카운트는 ACTIVE_STATS 꼬리의 "LLM:count=N"으로 전송 (_llmMeterCount).
         tasks.push(new LlmStatTasks.LLMActiveStatTask());
         tasks.push(new LlmStatTasks.LLMApiStatusTask());

package/lib/counter/task/llm-stat-tasks.js

@@ -26,7 +26,6 @@ const { getLlmPcode } = require('../../llm/llm-pcode');
 const _PID = process.pid;
 
 function _enabled() {
-    // python-apm과 일치: llm_enabled 단일 gate
     return conf.getProperty('llm_enabled', false);
 }
 
@@ -256,7 +255,6 @@ LLMTokenUsageTask.prototype.process = function () {
     });
 };
 
-// NOTE: llm_meter TagCountPack은 python-apm에서도 제거됨.
 // LLM 호출 카운트는 _llmMeterCount로 유지되어 ACTIVE_STATS 패킷 꼬리에
 // "LLM:count=N" 형태로 append 송신됨 (udp_session.js:161).
 

package/lib/io/data-outputx.js

@@ -275,7 +275,7 @@ DataOutputX.prototype.writeInt40BE = function(value) {
     return this.writeLong5(value);
 };
 
-// 새롭게 구현된 writeLong - Python 구현과 동일하게 작동
+// 새롭게 구현된 writeLong
 DataOutputX.prototype.writeLong = function(value) {
     if (isNumOk(value) == false) {
         value = 0;

package/lib/llm/llm-sender.js

@@ -137,7 +137,7 @@ function _accumulateTxSummary(ctx, pack) {
 
 function sendLlmTxStatus(ctx) {
     if (!ctx) return;
-    if (!conf.getProperty('trace_llm_log_enabled', false)) return;
+    if (!conf.getProperty('llm_enabled', false)) return;
     const summary = ctx._llm_tx_summary;
     if (!summary || summary.call_count === 0) return;
 
@@ -270,7 +270,7 @@ function _processPack(pack) {
         // active count 감소
         statCollector.onCallEnd(model, opType, provider, url, ctx);
 
-        // perf — TPOT 공식 python-apm 일치: (latency - ttft) / (output_tokens - 1)
+        // perf — TPOT 공식: (latency - ttft) / (output_tokens - 1)
         // 조건: ttft/latency non-null AND output_tokens > 1. stream 여부 무관.
         let tpot = null;
         if (pack.ttft != null && pack.latency != null && (pack.output_tokens || 0) > 1) {

package/lib/observers/cron-observer.js

@@ -40,7 +40,7 @@ CronObserver.prototype.__createCronJobObserver = function (callback, cronExpress
                     '0.0.0.0',
                     '',
                     '',
-                    String(0),
+                    String(ctx.userid || ""),
                     String(false),
                     ''
                 ];
@@ -161,7 +161,7 @@ CronObserver.prototype.__initCtx = function (cronExpression, jobName) {
 
     ctx.service_name = jobName || '/';
     ctx.remoteIp = 0;
-    ctx.userid = 0;
+    ctx.userid = "";
     ctx.userAgentString = '';
     ctx.referer = '';
     ctx.status = 200;

package/lib/observers/global-observer.js

@@ -88,8 +88,8 @@ GlobalObserver.prototype.inject = function (mod, moduleName) {
                             } catch (e) {
                             }
 
-                            // python equivalent: if not ctx.step_id: ctx.step_id = random.getrandbits(63)
-                            // 모든 httpc 호출에 step_id 생성 (python-apm 동작과 일치).
+                            // if not ctx.step_id: ctx.step_id = random.getrandbits(63)
+                            // 모든 httpc 호출에 step_id 생성
                             if (!ctx.step_id) {
                                 ctx.step_id = KeyGen.next();
                             }
@@ -214,7 +214,7 @@ function endHttpc(ctx) {
 
     ctx.active_httpc_hash = false;
     let urls = `${ctx.httpc_host}:${ctx.httpc_port}${ctx.httpc_url}`;
-    // python equivalent: datas = [ctx.httpc_url, ctx.step_id, ctx.driver]
+    // datas = [ctx.httpc_url, ctx.step_id, ctx.driver]
     // 모든 httpc에 step_id 사용 (mcallee는 mtrace 외에는 Long.ZERO라 의미 없음).
     let stepIdRaw = ctx.step_id || 0;
     let stepIdStr = LlmIdUtil.stepIdStr(stepIdRaw);
@@ -224,11 +224,11 @@ function endHttpc(ctx) {
     TraceHttpc.isSlowHttpc(ctx);
     AsyncSender.send_packet(PacketTypeEnum.TX_HTTPC, ctx, httpcDatas);
 
-    // python equivalent: if ctx.is_llm: ctx._llm_step_id = ctx.step_id
+    // if ctx.is_llm: ctx._llm_step_id = ctx.step_id
     if (ctx.is_llm) {
         ctx._llm_step_id = ctx.step_id;
     }
-    // python equivalent: ctx.active_httpc_hash=0; ctx.httpc_url=None; ctx.step_id=0
+    // ctx.active_httpc_hash=0; ctx.httpc_url=None; ctx.step_id=0
     ctx.driver = '';
     ctx.httpc_url = '';
     ctx.step_id = 0;

package/lib/observers/grpc-observer.js

@@ -94,7 +94,7 @@ function wrapHandler(handler, methodName, type) {
                     ctx.remoteIp || '0.0.0.0',
                     '', // userAgent
                     '', // referer
-                    '',
+                    String(ctx.userid || ""),
                     'false', // isStaticContents
                     method_name
                 ];
@@ -193,7 +193,7 @@ function wrapStreamHandler(handler, methodName, type) {
                     ctx.remoteIp || '0.0.0.0',
                     '', // userAgent
                     '', // referer
-                    '',
+                    String(ctx.userid || ""),
                     'false', // isStaticContents
                     method_name
                 ];
@@ -320,6 +320,8 @@ function initCtx(call, methodName) {
             // Remote IP 추출 시도
             const metadata = call.metadata.getMap();
             ctx.remoteIp = metadata['x-forwarded-for'] || metadata['x-real-ip'] || '0.0.0.0';
+            // WClientId를 빈 문자열로 보내 go-agent가 int64(RemoteIp) 분기를 타도록 함.
+            ctx.userid = "";
         }
     } catch (e) {
         Logger.printError('WHATAP-264', 'gRPC metadata parsing error: ' + e, false);

package/lib/observers/http-observer.js

@@ -155,7 +155,7 @@ HttpObserver.prototype.__createTransactionObserver = function (callback, isHttps
                 ctx.remoteIp,
                 ctx.userAgentString,
                 ctx.referer,
-                "",
+                String(ctx.userid || ""),
                 String(ctx.isStaticContents),
                 req.method
             ];
@@ -278,7 +278,9 @@ function initCtx(req, res) {
         ctx.remoteIp = IPUtil.checkIp4(remote_addr);
         if(conf.getProperty('trace_user_enabled', true)){
             if(conf.getProperty('trace_user_using_ip', true)){
-                ctx.userid = ctx.remoteIp;
+                // WClientId를 빈 문자열로 보내 go-agent가 int64(RemoteIp) 분기를 타도록 함.
+                // Java agent와 동일한 키 공간 유지 → cross-agent merge 정상화.
+                ctx.userid = "";
             }else{
                 ctx.userid = UserIdUtil.getUserId(req, res, 0);
             }
@@ -601,7 +603,7 @@ HttpObserver.prototype.inject = function (mod, moduleName) {
                         ctx.httpc_port = 80
                     }
 
-                    // LLM API detection (Python equivalent: _detect_llm_api in httpc/util.py)
+                    // LLM API detection
                     try {
                         // collector key 폭발 방지: query string 제거된 path만 _llm_httpc_url에 저장
                         var rawUrl = ctx.httpc_url || '';
@@ -621,8 +623,8 @@ HttpObserver.prototype.inject = function (mod, moduleName) {
                         // ignore LLM detection errors
                     }
 
-                    // python equivalent: if not ctx.step_id: ctx.step_id = random.getrandbits(63)
-                    // 모든 httpc 호출에 step_id 생성 (python-apm 동작과 일치).
+                    // if not ctx.step_id: ctx.step_id = random.getrandbits(63)
+                    // 모든 httpc 호출에 step_id 생성
                     if (!ctx.step_id) {
                         ctx.step_id = KeyGen.next();
                     }
@@ -631,7 +633,6 @@ HttpObserver.prototype.inject = function (mod, moduleName) {
                     if (conf.getProperty('profile_httpc_start_step_enabled', false)) {
                         ctx.active_httpc_hash = false;
                         let urls = `${ctx.httpc_host}:${ctx.httpc_port}${ctx.httpc_url}`;
-                        // python equivalent: [urls, step_id, driver]
                         let httpcDatas = [urls, ctx.step_id || 0, ctx.driver || ''];
                         ctx.elapsed = 0;
                         TraceHttpc.isSlowHttpc(ctx);
@@ -770,7 +771,6 @@ HttpObserver.prototype.inject = function (mod, moduleName) {
 
         ctx.active_httpc_hash = false;
         let urls = `${ctx.httpc_host}:${ctx.httpc_port}${ctx.httpc_url}`;
-        // python equivalent: datas = [ctx.httpc_url, ctx.step_id, ctx.driver]
         let stepIdRaw = ctx.step_id || 0;
         let stepIdStr = LlmIdUtil.stepIdStr(stepIdRaw);
         ctx._stepIdStr = stepIdStr;

package/lib/observers/ioredis-observer.js

@@ -119,7 +119,7 @@ IORedisObserver.prototype.inject = function (mod, modName) {
                     var command_start_time = Date.now();
                     ctx.footprint(`IORedis ${normalizedCommand} Start`);
 
-                    // IORedis에서는 command.args에서 쿼리 조합 (Python APM 방식 참고)
+                    // IORedis에서는 command.args에서 쿼리 조합
                     var queryParts = [normalizedCommand];
                     if (commandArgs && commandArgs.length > 0) {
                         // 각 인자를 문자열로 변환하고 20자로 제한

package/lib/observers/kafka-observer.js

@@ -151,7 +151,7 @@ KafkaObserver.prototype.inject = function (mod, moduleName) {
 
         // 기본값 설정
         ctx.remoteIp = 0;
-        ctx.userid = 0;
+        ctx.userid = "";
         ctx.userAgentString = '';
         ctx.referer = '';
         ctx.host = '';
@@ -181,7 +181,7 @@ KafkaObserver.prototype.inject = function (mod, moduleName) {
                     '0.0.0.0',                 // remoteIp
                     '',                        // userAgent
                     '',                        // referer
-                    '',                         // wclientid
+                    String(ctx.userid || ""), // wclientid
                     String(false),             // is_static
                     ''                         // extra
                 ];

package/lib/observers/openai-observer.js

@@ -18,7 +18,7 @@ OpenAIObserver.prototype.inject = function (mod, moduleName) {
     if (mod.__whatap_observe__) return;
     mod.__whatap_observe__ = true;
 
-    // NOTE: trace_llm_log_enabled 게이트는 conf가 비동기 로드되므로 inject 시점이 아닌
+    // NOTE: llm_enabled 게이트는 conf가 비동기 로드되므로 inject 시점이 아닌
     // 런타임 (wrappedCreate)에서 체크. 패칭 자체는 무조건 걸어둠.
 
     Logger.print('WHATAP-LLM-010', 'OpenAIObserver injecting', false);
@@ -59,7 +59,7 @@ function _patchChatCompletions(mod) {
     shimmer.wrap(CompletionsProto, 'create', function (original) {
         return function wrappedCreate() {
             // 런타임 게이트: conf가 늦게 로드되더라도 호출 시점에 체크
-            if (!conf.getProperty('trace_llm_log_enabled', false)) {
+            if (!conf.getProperty('llm_enabled', false)) {
                 return original.apply(this, arguments);
             }
             var args = Array.prototype.slice.call(arguments);
@@ -148,7 +148,6 @@ function _buildChatContext(body) {
                 tool_call_id: msg.tool_call_id || '',
                 content: _extractContentText(content),
             });
-            // python equivalent: sanitized = dict(msg); preserve all extra keys
             var sanitizedTool = Object.assign({}, msg);
             if (Array.isArray(content)) sanitizedTool.content = _extractContentText(content);
             promptMsgs.push(sanitizedTool);
@@ -161,7 +160,6 @@ function _buildChatContext(body) {
                     }
                 }
             }
-            // python equivalent: sanitized = dict(msg); preserve name/tool_calls/function_call 등 모든 키
             var sanitized = Object.assign({}, msg);
             if (Array.isArray(content)) sanitized.content = _extractContentText(content);
             promptMsgs.push(sanitized);
@@ -375,7 +373,7 @@ function _patchEmbeddings(mod) {
 
     shimmer.wrap(EmbeddingsProto, 'create', function (original) {
         return function wrappedCreate() {
-            if (!conf.getProperty('trace_llm_log_enabled', false)) {
+            if (!conf.getProperty('llm_enabled', false)) {
                 return original.apply(this, arguments);
             }
             var args = Array.prototype.slice.call(arguments);
@@ -451,7 +449,7 @@ function _patchLegacyCompletions(mod) {
 
     shimmer.wrap(LegacyProto, 'create', function (original) {
         return function wrappedCreate() {
-            if (!conf.getProperty('trace_llm_log_enabled', false)) {
+            if (!conf.getProperty('llm_enabled', false)) {
                 return original.apply(this, arguments);
             }
             var args = Array.prototype.slice.call(arguments);
@@ -623,7 +621,7 @@ function _patchResponses() {
         if (!proto || !proto.create) return;
         shimmer.wrap(proto, 'create', function (original) {
             return function wrappedCreate() {
-                if (!conf.getProperty('trace_llm_log_enabled', false)) {
+                if (!conf.getProperty('llm_enabled', false)) {
                     return original.apply(this, arguments);
                 }
                 var args = Array.prototype.slice.call(arguments);

package/lib/observers/redis-observer.js

@@ -117,7 +117,6 @@ RedisObserver.prototype.inject = function (mod, modName) {
                 var command_start_time = Date.now();
                 ctx.footprint(`Redis ${commandName} Start`);
 
-                // Redis에서는 args에서 쿼리 조합 (Python APM 방식 참고)
                 var queryParts = [commandName];
                 if (args && args.length > 0) {
                     // 콜백 함수 제외하고 실제 Redis 인자들만 처리

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

@@ -385,7 +385,7 @@ SocketIOObserver.prototype.__handleSocketEmitEvent = function(socket, event, arg
                 ctx.remoteIp || 0,
                 ctx.userAgentString || '',
                 ctx.referer || '',
-                '',
+                String(ctx.userid || ""),
                 String(false), // isStaticContents
                 ''
             ];
@@ -535,7 +535,8 @@ SocketIOObserver.prototype.__initCtx = function(socket, args, emitType, contextI
     if(remote_addr){
         ctx.remoteIp = IPUtil.checkIp4(remote_addr);
         if(conf.getProperty('trace_user_enabled', true)){
-            ctx.userid = ctx.remoteIp;
+            // WClientId를 빈 문자열로 보내 go-agent가 int64(RemoteIp) 분기를 타도록 함.
+            ctx.userid = "";
         }
     }
 

package/lib/observers/websocket-observer.js

@@ -233,7 +233,7 @@ WebsocketObserver.prototype.__wrapWebSocketConnection = function(connection, req
                             ctx.remoteIp || 0,
                             ctx.userAgentString || '',
                             ctx.referer || '',
-                            String(ctx.userid || 0),
+                            String(ctx.userid || ""),
                             String(false), // isStaticContents
                             emitType
                         ];
@@ -401,7 +401,8 @@ WebsocketObserver.prototype.__initCtx = function(connection, data, emitType, con
     if(remote_addr){
         ctx.remoteIp = IPUtil.checkIp4(remote_addr);
         if(conf.getProperty('trace_user_enabled', true)){
-            ctx.userid = ctx.remoteIp;
+            // WClientId를 빈 문자열로 보내 go-agent가 int64(RemoteIp) 분기를 타도록 함.
+            ctx.userid = "";
         }
     }
 

package/lib/udp/udp_session.js

@@ -1,7 +1,3 @@
-/**
- * JavaScript implementation of Python's UdpSession
- */
-
 const dgram = require('dgram');
 const os = require('os');
 const fs = require('fs');
@@ -168,11 +164,10 @@ class UdpSession {
                 self.send_packet(PacketTypeEnum.ACTIVE_STATS, null, datas);
                 // LLM meter용: LLM Go agent(--llm, LLMMode=true)의 TaskLLM이
                 // MeterLLM bucket을 소비하려면 같은 ACTIVE_STATS를 llmSocket에도 보내야 함.
-                // (python-apm의 udp_session.py:182 에서 동일 목적으로 양 소켓 복제 송신)
                 try {
                     if (self.llmSocket) {
                         self._sendActiveStatsToLlm(statsStr);
-                    } else if (conf.getProperty('llm_enabled', false) || conf.getProperty('trace_llm_log_enabled', false)) {
+                    } else if (conf.getProperty('llm_enabled', false)) {
                         // lazy init
                         self.udp_llm();
                         if (self.llmSocket) self._sendActiveStatsToLlm(statsStr);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "2.0.0-canary.0",
-  "releaseDate": "20260423",
+  "version": "2.0.0",
+  "releaseDate": "20260427",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},