whatap 0.5.24 → 0.5.26

package/lib/conf/config-default.js

@@ -283,7 +283,8 @@ var ConfigDefault = {
     "trace_mtrace_traceparent_key": str("trace_mtrace_traceparent_key", "traceparent"),
     "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)
+    "profile_httpc_start_step_enabled": bool("profile_httpc_start_step_enabled", false),
+    "perfx_nodejs_gc_enabled": bool("perfx_nodejs_gc_enabled", true)
 
 };
 

package/lib/counter/counter-manager.js

@@ -18,6 +18,7 @@ var CounterPack = require('../pack/counter-pack'),
     Sql = require('./task/sql'),
     HttpC = require('./task/httpc'),
     MeteringInfo = require('./task/metering-info'),
+    GCAction = require('./task/gc-action'),
     StatError = require('../stat/stat-error'),
     TagCounterPack = require('../pack/tagcount-pack'),
     TraceContextManager = require('../trace/trace-context-manager'),
@@ -32,7 +33,7 @@ var CounterPack = require('../pack/counter-pack'),
 function CounterManager(agent) {
     this.agent = agent;
     this.time = Date.now();
-    
+
     this.intervalIndex = undefined;
 };
 CounterManager.plugin={}
@@ -53,11 +54,12 @@ CounterManager.prototype.run = function () {
         tasks.push(new GCStat());
         tasks.push(new Sql());
         tasks.push(new HttpC());
+        tasks.push(new GCAction());
 
         // metering
         tasks.push(new MeteringInfo());
         self.intervalIndex = setInterval(function(){
-            self.process(tasks);    
+            self.process(tasks);
         },5000);
         self.process(tasks);
     });

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

@@ -0,0 +1,153 @@
+/**
+ * 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.
+ */
+
+var CounterTask     = require('./counter-task'),
+    DataPackSender  = require('../../data/datapack-sender'),
+    conf = require('../../conf/configure'),
+    DateUtil = require('../../util/dateutil'),
+    Logger = require('../../logger'),
+    TagCountPack = require('../../pack/tagcount-pack'),
+    HashUtil = require('../../util/hashutil'),
+    SecurityMaster = require('../../../lib/net/security-master'),
+    NodeUtil = require('../../util/nodeutil'),
+    IPUtil = require('../../util/iputil');
+
+const { PerformanceObserver } = require('perf_hooks');
+
+function GCAction() {
+    CounterTask.call(this);
+    this.isObserverSupported = false;
+    this.checkGCObserverSupport();
+}
+
+GCAction.prototype = new CounterTask();
+GCAction.prototype.constructor = GCAction;
+
+GCAction.prototype.checkGCObserverSupport = function () {
+    if (NodeUtil.hasStableGCObserver()) {
+        this.isObserverSupported = true;
+        Logger.print("WHATAP-GC-001", `GC Observer supported (Node.js ${NodeUtil.getNodeVersion()})`, false);
+    } else {
+        this.isObserverSupported = false;
+        Logger.print("WHATAP-GC-002", `GC Observer not supported (Node.js ${NodeUtil.getNodeVersion()}, requires 16.7+ or 18+)`, false);
+    }
+};
+
+GCAction.prototype.process = function (p) {
+    try {
+        if (!conf.getProperty('perfx_nodejs_gc_enabled', false) || !this.isObserverSupported) {
+            return;
+        }
+
+        this.nodejs_memory_gc(p);
+    } catch (e) {
+        Logger.printError("WHATAP-GC-003", "NodeJS GC process error", e, false);
+    }
+};
+
+GCAction.prototype.nodejs_memory_gc = function (p) {
+    const gcStats = new Map();
+    const self = this;
+
+    try {
+        // PerformanceObserver를 사용해서 현재까지의 GC 데이터 수집
+        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
+                        });
+                    }
+
+                    const stats = gcStats.get(gcName);
+                    stats.collectionCount++;
+                    stats.collectionTime += entry.duration;
+                }
+            });
+
+            // 데이터 수집 완료 후 즉시 처리
+            observer.disconnect();
+
+            // 수집된 데이터가 있으면 전송
+            if (gcStats.size > 0) {
+                self.sendGCData(p, gcStats);
+            }
+        });
+
+        observer.observe({ type: 'gc' });
+    } catch (e) {
+        Logger.printError("WHATAP-GC-004", "Failed to collect GC data", e, false);
+    }
+};
+
+GCAction.prototype.sendGCData = function (p, gc_stats) {
+    const pk = new TagCountPack();
+    pk.time = Math.floor(Date.now() / 1000) * 1000;
+    pk.category = "nodejsx_memory_gc";
+
+    pk.putTagString("oname", SecurityMaster.ONAME);
+    pk.putTagString("host_ip", IPUtil.getIp());
+    pk.putTagInt("pid", process.pid);
+    pk.putTagInt("!rectype", 2);
+
+    const idLv = pk.fields.internList("@id");
+    const nameLv = pk.fields.internList("name");
+    const countLv = pk.fields.internList("CollectionCount");
+    const timeLv = pk.fields.internList("CollectionTime");
+
+    // GC 통계 데이터 추가
+    for (const [gc_name, stats] of gc_stats) {
+        idLv.addLong(HashUtil.hashFromString(gc_name));
+        nameLv.addString(gc_name);
+        countLv.addLong(stats.collectionCount);
+        timeLv.addLong(Math.round(stats.collectionTime));
+    }
+
+    DataPackSender.sendTagCounterPack(pk);
+};
+
+GCAction.prototype.getGCTypeName = function (kind) {
+    const major = NodeUtil.getNodeMajorVersion();
+
+    if (major >= 22) {
+        switch (kind) {
+            case 1: return 'V8 Scavenger';
+            case 2: return 'V8 Minor Mark Sweep';
+            case 4: return 'V8 Mark Sweep Compact';
+            case 8: return 'V8 Incremental Marking';
+            case 16: return 'V8 Process Weak Callbacks';
+            case 31: return 'V8 All';
+            default: return `V8 GC Type ${kind}`;
+        }
+    } else if (major >= 18) {
+        switch (kind) {
+            case 1: return 'V8 Scavenger';
+            case 2: return 'V8 Minor Mark Compact';
+            case 4: return 'V8 Mark Sweep Compact';
+            case 8: return 'V8 Incremental Marking';
+            case 16: return 'V8 Process Weak Callbacks';
+            case 31: return 'V8 All';
+            default: return `V8 GC Type ${kind}`;
+        }
+    } else {
+        switch (kind) {
+            case 1: return 'V8 Scavenger';
+            case 2: return 'V8 Mark Sweep Compact';
+            case 4: return 'V8 Incremental Marking';
+            case 8: return 'V8 Process Weak Callbacks';
+            case 15: return 'V8 All';
+            default: return `V8 GC Type ${kind}`;
+        }
+    }
+};
+
+
+module.exports = GCAction;

package/lib/observers/process-observer.js

@@ -7,11 +7,12 @@
 const TraceContextManager = require('../trace/trace-context-manager');
 const conf = require('../conf/configure');
 const LogTracer = require('../logsink/log-tracer');
+const Logger = require('../logger');
 
 let logsink_enabled = conf.getProperty('logsink_enabled', false);
 let logTracer = logsink_enabled ? new LogTracer() : null;
 
-conf.on('logsink_enabled', function(newProperty) {
+conf.on('logsink_enabled', function (newProperty) {
     logsink_enabled = newProperty;
     logTracer = logsink_enabled ? new LogTracer() : null;
 });
@@ -19,12 +20,14 @@ conf.on('logsink_enabled', function(newProperty) {
 const ProcessObserver = function (agent) {
     this.agent = agent;
     this.packages = ['process'];
+    this.exitHandlersRegistered = false;
 };
 
 ProcessObserver.prototype.inject = function (mod, moduleName) {
     this._hookNextTick(mod);
     this._hookStdOutWrite();
     this._hookStdErrWrite();
+    this._hookProcessExit(mod);
 };
 
 ProcessObserver.prototype._hookNextTick = function (mod) {
@@ -70,4 +73,72 @@ ProcessObserver.prototype._hookStdErrWrite = function () {
     });
 };
 
+ProcessObserver.prototype._hookProcessExit = function (mod) {
+    if (this.exitHandlersRegistered) {
+        Logger.print("WHATAP-901", "[ProcessObserver] Exit handlers already registered, skipping...", false)
+        return;
+    }
+    const self = this;
+
+    // SIGTERM (graceful shutdown)
+    process.on('SIGTERM', function () {
+        const message = 'Process termination requested by system or process manager (SIGTERM) - Usually from service stop or container shutdown';
+        Logger.print('WHATAP-902', message, false);
+        setTimeout(() => process.exit(0), 100);
+    });
+
+    // SIGINT (Ctrl+C)
+    process.on('SIGINT', function () {
+        const message = 'Process interrupted by user (SIGINT) - Typically Ctrl+C or kill command';
+        Logger.print('WHATAP-903', message, false);
+        setTimeout(() => process.exit(0), 100);
+    });
+
+    // SIGHUP (hang up)
+    process.on('SIGHUP', function () {
+        const message = 'Process hangup signal received (SIGHUP) - Terminal disconnection or parent process terminated';
+        Logger.print('WHATAP-904', message, false);
+        setTimeout(() => process.exit(0), 100);
+    });
+
+    // SIGUSR1 (user-defined signal 1)
+    process.on('SIGUSR1', function () {
+        const message = 'User-defined signal 1 received (SIGUSR1) - Custom application signal';
+        Logger.print('WHATAP-905', message, false);
+        setTimeout(() => process.exit(0), 100);
+    });
+
+    // SIGUSR2 (user-defined signal 2)
+    process.on('SIGUSR2', function () {
+        const message = 'User-defined signal 2 received (SIGUSR2) - Custom application signal';
+        Logger.print('WHATAP-906', message, false);
+        setTimeout(() => process.exit(0), 100);
+    });
+
+    // 처리되지 않은 예외
+    // process.on('uncaughtException', function (err) {
+    //     const message = `Unhandled exception caused process crash - Error: ${err.message}, File: ${err.stack ? err.stack.split('\n')[1] || 'unknown' : 'unknown'}`;
+    //     Logger.print('WHATAP-907', message, err, false);
+    //
+    //     // 로그 남긴 후 프로세스 종료
+    //     setTimeout(() => {
+    //         process.exit(1);
+    //     }, 100);
+    // });
+    //
+    // // 처리되지 않은 Promise rejection
+    // process.on('unhandledRejection', function (reason, promise) {
+    //     const message = `Unhandled Promise rejection may cause process termination - Reason: ${reason instanceof Error ? reason.message : String(reason)}`;
+    //     const err = reason instanceof Error ? reason : new Error(String(reason));
+    //     Logger.print('WHATAP-908', message, err, false);
+    //
+    //     // 로그 남긴 후 프로세스 종료
+    //     setTimeout(() => {
+    //         process.exit(1);
+    //     }, 100);
+    // });
+
+    this.exitHandlersRegistered = true;
+};
+
 module.exports.ProcessObserver = ProcessObserver;

package/lib/pack/tagcount-pack.js

@@ -18,7 +18,7 @@ function TagCountPack() {
     Pack.call(this);
     this.category = ''
     this.tagHash = 0
-    this.originOid = 0
+    this.originOid = null;
     this.tags = new MapValue()
     this.fields = new MapValue()
     this.read_size

package/lib/util/nodeutil.js

@@ -25,6 +25,7 @@ function getPackageJson() {
     }
     NodeUtil.packageJson = {};
 }
+
 function recursiveCall(fullPath, file, cb){
     if(fullPath === undefined) return;
 
@@ -66,7 +67,51 @@ var NodeUtil = {
     },
     recursiveCall: recursiveCall,
     getPackageJson : getPackageJson,
-    packageJson : {}
+    packageJson : {},
+
+    // Node.js 버전 정보 함수들 추가
+    getNodeVersion: function() {
+        return process.version;
+    },
+
+    getNodeMajorVersion: function() {
+        return parseInt(process.version.split('.')[0].substring(1));
+    },
+
+    getNodeMinorVersion: function() {
+        return parseInt(process.version.split('.')[1]);
+    },
+
+    getNodePatchVersion: function() {
+        return parseInt(process.version.split('.')[2]);
+    },
+
+    // GC Observer 지원 여부 체크
+    hasStableGCObserver: function() {
+        const major = this.getNodeMajorVersion();
+        const minor = this.getNodeMinorVersion();
+
+        // Node.js 18+ 또는 16.7+에서 안정적
+        return major >= 18 || (major === 16 && minor >= 7);
+    },
+
+    // 버전 비교 함수
+    compareNodeVersion: function(targetMajor, targetMinor, targetPatch) {
+        const major = this.getNodeMajorVersion();
+        const minor = this.getNodeMinorVersion();
+        const patch = this.getNodePatchVersion();
+
+        if (major > targetMajor) return 1;
+        if (major < targetMajor) return -1;
+
+        if (minor > targetMinor) return 1;
+        if (minor < targetMinor) return -1;
+
+        if (patch > targetPatch) return 1;
+        if (patch < targetPatch) return -1;
+
+        return 0; // 동일
+    }
 };
 
-module.exports = NodeUtil;
+module.exports = NodeUtil;

package/lib/value/map-value.js

@@ -132,7 +132,7 @@ MapValue.prototype.getValueType = function() {
 };
 MapValue.prototype.write = function(dout) {
     dout.writeDecimal(this.table.size());
-    var en = this.table.keys();  
+    var en = this.table.keys();
     while(en.hasMoreElements()) {
         var key = en.nextElement();
         dout.writeText(key);
@@ -160,7 +160,7 @@ MapValue.prototype.toObject = function() {
     return this.table;
 };
 MapValue.prototype.putAllMap = function(m) {
-    var en = m.keys();  
+    var en = m.keys();
     while(en.hasMoreElements()) {
         var key = en.nextElement();
         var value =m.get(key);
@@ -173,4 +173,13 @@ MapValue.prototype.putAllMapValue = function(m) {
     this.putAllMap(m);
 };
 
+MapValue.prototype.internList = function (key) {
+    let lv = this.table.get(key);
+    if(!lv){
+        lv = new ListValue()
+        this.table.put(key, lv);
+    }
+    return lv;
+}
+
 module.exports = MapValue;

package/package.json

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