whatap 0.5.26 → 0.5.27

package/.claude/settings.local.json

@@ -0,0 +1,77 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(grep -n \"ECONNREFUSED\" /Users/seunghunlee/agent_workspace/nodejs_agent/lib/observers/*.js /Users/seunghunlee/agent_workspace/nodejs_agent/lib/core/agent.js 2>/dev/null)",
+      "WebSearch",
+      "Bash(go env *)",
+      "Bash(ls -l \"$\\(go env GOPATH\\)/bin/govulncheck\")",
+      "Bash(brew list *)",
+      "Bash(brew search *)",
+      "Bash(brew info *)",
+      "Bash(echo \"--- exit $? ---\")",
+      "Bash(go version *)",
+      "WebFetch(domain:github.com)",
+      "Read(//Users/seunghunlee/workspace/**)",
+      "Read(//Users/seunghunlee/workspace/nodejs_docker_sample/**)",
+      "Bash(npm i *)",
+      "Bash(chmod +x /Users/seunghunlee/workspace/nodejs_docker_sample/repro.sh)",
+      "Bash(docker exec 273976be9e71 *)",
+      "Bash(docker rm *)",
+      "Bash(docker build *)",
+      "Bash(docker run *)",
+      "Bash(docker exec zombie-test *)",
+      "Bash(curl -s http://localhost:3000/)",
+      "Bash(curl -s http://localhost:3000/health)",
+      "Bash(curl -s http://localhost:3000/slow)",
+      "Bash(curl -s -o /dev/null -w \"status: %{http_code}\\\\n\" http://localhost:3000/error)",
+      "Bash(curl -s -o /dev/null -w \"%{http_code} \" http://localhost:3000/)",
+      "Bash(/usr/local/bin/docker exec *)",
+      "Bash(/usr/local/bin/docker build *)",
+      "Bash(/usr/local/bin/docker rm *)",
+      "Bash(/usr/local/bin/docker run *)",
+      "Bash(/bin/sleep 30)",
+      "Bash(echo \"[$\\(date +%T\\)] zombies=$\\(/usr/local/bin/docker exec zombie-test sh -c \"ps -eo stat | awk '\\\\$1 ~ /^Z/' | wc -l\"\\)\")",
+      "Bash(/bin/sleep 5)",
+      "Bash(/usr/local/bin/docker ps *)",
+      "Bash(/bin/sleep 6)",
+      "Bash(/usr/local/bin/docker logs *)",
+      "Bash(/usr/bin/curl -s http://localhost:3000/)",
+      "Bash(/usr/bin/curl -s http://localhost:3000/health)",
+      "Bash(/bin/sleep 7)",
+      "Bash(cat agent/index.js)",
+      "Bash(cat agent/writer.js)",
+      "Bash(node -e \"const d=require\\('./config/defaults.js'\\); console.log\\('flushInterval=', d.flushInterval\\)\")",
+      "Bash(cd *)",
+      "Bash(ls /Users/seunghunlee/workspace/nodejs_docker_sample/node_modules/whatap/lib)",
+      "Bash(ls /Users/seunghunlee/workspace/nodejs_docker_sample/node_modules/whatap/index.js)",
+      "Bash(node -e ' *)",
+      "Bash(export WHATAP_HOME=/tmp)",
+      "Bash(node --expose-gc -e ' *)",
+      "Bash(node -p \"process.platform+'/'+process.arch+' node '+process.version\")",
+      "Read(//Users/seunghunlee/agent_workspace/apm-go-agent/**)",
+      "Bash(node -e \"require\\('./lib/counter/task/metering-info'\\); console.log\\('module load OK'\\);\")",
+      "Bash(node --check lib/counter/task/metering-info.js)",
+      "Bash(node --check lib/util/cgroup-cpu.js)",
+      "Bash(node -e \"var m=require\\('./index.js'\\); console.log\\('exports keys:', Object.keys\\(m\\)\\);\")",
+      "Bash(docker version *)",
+      "Bash(rm -rf whatap-local)",
+      "Bash(rsync -a --exclude=.git --exclude=node_modules --exclude=logs --exclude=*.log /Users/seunghunlee/agent_workspace/nodejs_agent/ ./whatap-local/)",
+      "Bash(node *)",
+      "Bash(npm view *)",
+      "Bash(rsync -a --delete --exclude=.git --exclude=node_modules --exclude=logs --exclude=*.log /Users/seunghunlee/agent_workspace/nodejs_agent/ ./whatap-local/)",
+      "Bash(docker exec *)",
+      "Bash(curl -s --max-time 5 http://localhost:3001/health)",
+      "Bash(curl -s --max-time 5 http://localhost:3002/health)",
+      "Bash(sed -n '66,71p' lib/counter/counter-manager.js)",
+      "Bash(sed -n '166,168p' lib/conf/configure.js)",
+      "Bash(sed -n '40,70p' lib/kube/kube-client.js)",
+      "Bash(docker info *)",
+      "Bash(« stray *)",
+      "Bash(awk '{print $1}')",
+      "Bash(xargs -r docker rm -f)",
+      "Read(//Users/seunghunlee/agent_workspace/**)",
+      "Bash(net_udp_packet_queue_size=500 node -e ' *)",
+      "Bash(max_send_queue_size=500 node -e ' *)"
+    ]
+  }
+}

package/lib/conf/config-default.js

@@ -284,7 +284,7 @@ var ConfigDefault = {
     "txtext_txname_enabled": bool("txtext_txname_enabled", true),
     "ignore_env_variable_set": str("ignore_env_variable_set", ""),
     "profile_httpc_start_step_enabled": bool("profile_httpc_start_step_enabled", false),
-    "perfx_nodejs_gc_enabled": bool("perfx_nodejs_gc_enabled", true)
+    "perfx_nodejs_gc_enabled": bool("perfx_nodejs_gc_enabled", false)
 
 };
 

package/lib/counter/task/gc-action.js

@@ -54,31 +54,41 @@ GCAction.prototype.nodejs_memory_gc = function (p) {
 
     try {
         // PerformanceObserver를 사용해서 현재까지의 GC 데이터 수집
+        // 콜백은 비동기로 실행되어 바깥 try/catch가 못 잡으므로, 예외가 고객 앱의
+        // uncaughtException으로 전파되지 않도록 콜백 전체를 보호한다.
         const observer = new PerformanceObserver((list) => {
-            list.getEntries().forEach((entry) => {
-                if (entry.entryType === 'gc') {
-                    const gcName = self.getGCTypeName(entry.kind);
-
-                    if (!gcStats.has(gcName)) {
-                        gcStats.set(gcName, {
-                            name: gcName,
-                            collectionCount: 0,
-                            collectionTime: 0
-                        });
+            try {
+                list.getEntries().forEach((entry) => {
+                    if (entry.entryType === 'gc') {
+                        const gcName = self.getGCTypeName(entry.kind);
+
+                        if (!gcStats.has(gcName)) {
+                            gcStats.set(gcName, {
+                                name: gcName,
+                                collectionCount: 0,
+                                collectionTime: 0
+                            });
+                        }
+
+                        const stats = gcStats.get(gcName);
+                        stats.collectionCount++;
+                        stats.collectionTime += entry.duration;
                     }
+                });
 
-                    const stats = gcStats.get(gcName);
-                    stats.collectionCount++;
-                    stats.collectionTime += entry.duration;
-                }
-            });
-
-            // 데이터 수집 완료 후 즉시 처리
-            observer.disconnect();
+                // 데이터 수집 완료 후 즉시 처리
+                observer.disconnect();
 
-            // 수집된 데이터가 있으면 전송
-            if (gcStats.size > 0) {
-                self.sendGCData(p, gcStats);
+                // 수집된 데이터가 있으면 전송
+                if (gcStats.size > 0) {
+                    self.sendGCData(p, gcStats);
+                }
+            } catch (e) {
+                try {
+                    observer.disconnect();
+                } catch (e2) {
+                }
+                Logger.printError("WHATAP-GC-005", "GC observer callback error", e, false);
             }
         });
 

package/lib/counter/task/metering-info.js

@@ -13,6 +13,8 @@ var CounterTask     = require('./counter-task'),
     TagCountPack = require('../../pack/tagcount-pack'),
     OType = require('../../pack/otype'),
     APEnum = require('../../pack/apenum'),
+    SecurityMaster = require('../../net/security-master'),
+    CgroupCpu = require('../../util/cgroup-cpu'),
     Util = require('../../util/index');
 
 function MeteringInfo() {
@@ -28,7 +30,7 @@ MeteringInfo.prototype = new CounterTask();
 MeteringInfo.prototype.constructor = MeteringInfo;
 
 MeteringInfo.prototype.process = function (p) {
-    if (!conf.getProperty('metering_tagcount_enabled', false)) {
+    if (!this.isMeteringEnabled()) {
         return;
     }
 
@@ -47,8 +49,40 @@ MeteringInfo.prototype.process = function (p) {
     this.doProcess(p);
 };
 
+// metering_container_enabled=true이면 (host product_uuid 없이도) 메터링을 전송한다.
+MeteringInfo.prototype.isMeteringEnabled = function () {
+    return conf.getProperty('metering_tagcount_enabled', false) === true
+        || this.isContainerMeteringEnabled();
+};
+
+MeteringInfo.prototype.isContainerMeteringEnabled = function () {
+    return CgroupCpu.isContainerMeteringEnabled();
+};
+
+// metering_container_enabled=true이면 root 권한이 필요한 host product_uuid 대신
+// OID hex를 컨테이너별 고유 식별자로 사용한다.
+// (Go 에이전트 SecurityMaster: fmt.Sprintf("%08x", uint32(OID)) 와 동일)
+MeteringInfo.prototype.resolveHostUUID = function () {
+    if (this.isContainerMeteringEnabled()) {
+        return this.getContainerUUID();
+    }
+    return this.getHostUUID(this.hostUUIDFileName);
+};
+
+MeteringInfo.prototype.getContainerUUID = function () {
+    const oid = SecurityMaster.OID;
+    if (!oid) {
+        return null;
+    }
+    var hex = (oid >>> 0).toString(16);
+    while (hex.length < 8) {
+        hex = '0' + hex;
+    }
+    return hex;
+};
+
 MeteringInfo.prototype.doProcess = function (p) {
-    const host_uuid = this.getHostUUID(this.hostUUIDFileName);
+    const host_uuid = this.resolveHostUUID();
     if(!host_uuid)
         return;
 
@@ -67,7 +101,8 @@ MeteringInfo.prototype.doProcess = function (p) {
         pk.putTagString('csp', csp)
     }
 
-    pk.putTagFloat('mcore', p.metering)
+    // Go TagTaskMetering.go: p.Put("mcore", sys.GetCPUNum())
+    pk.putTagFloat('mcore', CgroupCpu.getCpuNum())
 
     DataPackSender.sendTagCounterPack(pk);
 };

package/lib/counter/task/systemperf.js

@@ -7,6 +7,7 @@
 var CounterTask     = require('./counter-task'),
     ResourceProfile = require('./../../util/resourceprofile'),
     KubeUtil            = require('./../../util/kube-util'),
+    CgroupCpu           = require('./../../util/cgroup-cpu'),
     SecurityMaster  = require('../../net/security-master');
 
 function SystemPerf(){
@@ -30,7 +31,9 @@ SystemPerf.prototype.process = function(p) {
     if(p.version <= 1) p.mem = ResourceProfile.getMemory().usage;
     else p.mem = ResourceProfile.getMemoryV2().usage;
 
-    p.cpu_cores = cpu.core;
+    // Go TaskSystemPerf.go: p.CpuCores = sys.GetCPUNum()
+    // (getCpuNum 내부에서 metering_container_enabled 판정: true+cgroup한도 → ceil, 그 외 → 호스트 CPU 개수)
+    p.cpu_cores = CgroupCpu.getCpuNum();
     p.host_ip = SecurityMaster.IP;
     p.pid=process.pid;
     

package/lib/observers/http-observer.js

@@ -182,6 +182,19 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
                 return callback(req, res);
             }
 
+            if(ctx.isStaticContents !== true && conf._trace_ignore_url_set[ctx.service_hash]){
+                ctx.isStaticContents = true;
+            }
+
+            if(ctx.isStaticContents !== true && conf._is_trace_ignore_url_prefix === true && ctx.service_name.startsWith(conf.trace_ignore_url_prefix) === true){
+                ctx.isStaticContents = true;
+            }
+
+            if(ctx.isStaticContents){
+                TraceContextManager.end(ctx._id);
+                return callback(req, res);
+            }
+
             PluginLoaderManager.do('httpservicestart', ctx, req, res);
             if(trace_origin_url === true){
                 var originUrlHash = HashUtil.hashFromString('Origin url');
@@ -604,14 +617,6 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
     // if(ctx == null || TraceContextManager.isExist(ctx._id) === false) { return; }
 
-    if(ctx.isStaticContents !== true && conf._trace_ignore_url_set[ctx.service_hash]){
-        ctx.isStaticContents = true;
-    }
-
-    if(conf._is_trace_ignore_url_prefix === true && ctx.service_name.startsWith(conf.trace_ignore_url_prefix) === true){
-        ctx.isStaticContents = true;
-    }
-
     if(ctx.isStaticContents){
         TraceContextManager.end(ctx._id);
         ctx = null;

package/lib/observers/process-observer.js

@@ -27,7 +27,7 @@ ProcessObserver.prototype.inject = function (mod, moduleName) {
     this._hookNextTick(mod);
     this._hookStdOutWrite();
     this._hookStdErrWrite();
-    this._hookProcessExit(mod);
+    // this._hookProcessExit(mod);
 };
 
 ProcessObserver.prototype._hookNextTick = function (mod) {

package/lib/pack/hitmap-pack1.js

@@ -64,7 +64,8 @@ function writeArr( dout,  arr) {
             len = len + 1;
             dout.writeByte(len);
             for (var i = 0; i < len; i++) {
-                dout.writeUInt16BE(arr[i]);
+                var value = arr[i] > 65535 ? 65535 : arr[i];
+                dout.writeUInt16BE(value);
             }
         }
     }catch (e) {

package/lib/util/cgroup-cpu.js

@@ -0,0 +1,78 @@
+/**
+ * Copyright 2025 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+/**
+ * 컨테이너(cgroup) CPU limit 조회.
+ * Go 에이전트 util/sys/CpuUtil.go 의 getCgroupCpuLimitFloat() / GetCPUNum() 와 동일한 로직.
+ */
+var fs = require('fs'),
+    os = require('os');
+
+// cgroup CPU limit 을 코어수(float)로 반환한다. 한도 미설정/감지 실패 시 0.
+//   cgroup v2: /sys/fs/cgroup/cpu.max            -> "$MAX $PERIOD" (예: "200000 100000" = 2 cores), "max 100000" = 무제한
+//   cgroup v1: cpu.cfs_quota_us / cpu.cfs_period_us  (quota -1 = 무제한)
+function getCgroupCpuLimitFloat() {
+    if (process.platform !== 'linux') {
+        return 0;
+    }
+
+    // cgroup v2
+    try {
+        var data = fs.readFileSync('/sys/fs/cgroup/cpu.max', 'utf8').trim();
+        var fields = data.split(/\s+/);
+        if (fields.length === 2 && fields[0] !== 'max') {
+            var quotaV2 = parseFloat(fields[0]);
+            var periodV2 = parseFloat(fields[1]);
+            if (!isNaN(quotaV2) && !isNaN(periodV2) && periodV2 > 0) {
+                return quotaV2 / periodV2;
+            }
+        }
+        // v2 파일은 읽혔으나 한도 미설정("max")이거나 형식 불일치 -> 한도 없음
+        return 0;
+    } catch (e) {
+        // v2 파일이 없으면 v1 으로 폴백
+    }
+
+    // cgroup v1
+    try {
+        var quotaData = fs.readFileSync('/sys/fs/cgroup/cpu/cpu.cfs_quota_us', 'utf8').trim();
+        var periodData = fs.readFileSync('/sys/fs/cgroup/cpu/cpu.cfs_period_us', 'utf8').trim();
+        var quota = parseFloat(quotaData);
+        var period = parseFloat(periodData);
+        if (isNaN(quota) || isNaN(period) || period <= 0 || quota <= 0) {
+            return 0;
+        }
+        return quota / period;
+    } catch (e) {
+        return 0;
+    }
+}
+
+// metering_container_enabled 옵션 여부 (config 또는 env). 컨테이너 메터링 공통 판정.
+function isContainerMeteringEnabled() {
+    var conf = require('../conf/configure');
+    return conf.getProperty('metering_container_enabled', false) === true
+        || process.env.WHATAP_METERING_CONTAINER_ENABLED === 'true';
+}
+
+// 미터링/CPU 코어수. Go sys.GetCPUNum() 와 1:1 동일:
+//   metering_container_enabled=true 이고 cgroup 한도가 있으면 ceil 한 정수,
+//   그 외(플래그 off 또는 한도 없음)는 호스트 CPU 개수(= runtime.NumCPU()).
+function getCpuNum() {
+    if (isContainerMeteringEnabled()) {
+        var cgroupCores = getCgroupCpuLimitFloat();
+        if (cgroupCores > 0) {
+            return Math.ceil(cgroupCores);
+        }
+    }
+    return os.cpus().length;
+}
+
+module.exports = {
+    getCgroupCpuLimitFloat: getCgroupCpuLimitFloat,
+    getCpuNum: getCpuNum,
+    isContainerMeteringEnabled: isContainerMeteringEnabled
+};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.26",
-  "releaseDate": "20250825",
+  "version": "0.5.27",
+  "releaseDate": "20260611",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},