whatap 1.0.1 → 1.0.2

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);
@@ -172,6 +172,7 @@ MapValue.prototype.putAllMap = function(m) {
 MapValue.prototype.putAllMapValue = function(m) {
     this.putAllMap(m);
 };
+
 MapValue.prototype.internList = function (key) {
     let lv = this.table.get(key);
     if(!lv){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "releaseDate": "20250924",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
@@ -11,13 +11,18 @@
   },
   "license": "UNLICENSED",
   "engines": {
-    "node": ">=17"
+    "node": ">=v16.4.0"
   },
   "dependencies": {
+    "crypto": "^1.0.1",
+    "df": "^1.1.1",
     "long": "^3.2.0",
-    "proper-lockfile": "^4.1.2"
+    "pidusage": "^1.1.0"
   },
   "devDependencies": {
-    "long": "^3.2.0"
+    "crypto": "^1.0.1",
+    "df": "^1.1.1",
+    "long": "^3.2.0",
+    "pidusage": "^1.1.0"
   }
 }

package/whatap.conf

@@ -1,5 +1,2 @@
 license=XXXXXXXXXXXXXX-XXXXXXXXXXXXXX-XXXXXXXXXXXXXX
-whatap.server.host=XXX.XXX.XXX.XXX
-
-app_name=XXX
-app_process_name=node
+whatap.server.host=XXX.XXX.XXX.XXX

package/build.txt

@@ -1,4 +0,0 @@
-app = 'NodeJS'
-name = 'whatap_nodejs'
-version = 'dev1.0.5'
-build_date = '20250923'

package/lib/observers/ioredis-observer.js

@@ -1,294 +0,0 @@
-var TraceContextManager = require('../trace/trace-context-manager'),
-    HashUtil = require('../util/hashutil'),
-    Logger = require('../logger'),
-    conf = require('../conf/configure'),
-    AsyncSender = require('../udp/async_sender'),
-    PacketTypeEnum = require('../udp/packet_type_enum');
-
-const { AsyncResource } = require('async_hooks');
-
-var IORedisObserver = function (agent) {
-    this.agent = agent;
-    this.aop = agent.aop;
-    this.packages = ['ioredis'];
-};
-
-IORedisObserver.prototype.inject = function (mod, modName) {
-    if (mod.__whatap_observe__) {
-        return;
-    }
-    mod.__whatap_observe__ = true;
-    Logger.initPrint("IORedisObserver");
-
-    if (conf.sql_enabled === false) {
-        return;
-    }
-
-    var self = this;
-    var dbc_hash = 0;
-    var dbc = 'redis://';
-
-    // Redis 명령어 매핑 (Redis observer와 동일)
-    var REDIS_COMMANDS = {
-        // 기본 명령어들
-        'ping': 'PING', 'get': 'GET', 'set': 'SET', 'del': 'DEL', 'exists': 'EXISTS', 'keys': 'KEYS',
-        'setex': 'SETEX', 'setEx': 'SETEX', 'expire': 'EXPIRE', 'expireAt': 'EXPIREAT', 'expireat': 'EXPIREAT',
-        'ttl': 'TTL', 'incr': 'INCR', 'decr': 'DECR', 'incrBy': 'INCRBY', 'incrby': 'INCRBY',
-        'decrBy': 'DECRBY', 'decrby': 'DECRBY', 'mGet': 'MGET', 'mget': 'MGET', 'mSet': 'MSET', 'mset': 'MSET',
-
-        // Hash 명령어들
-        'hSet': 'HSET', 'hset': 'HSET', 'hGet': 'HGET', 'hget': 'HGET', 'hGetAll': 'HGETALL', 'hgetall': 'HGETALL',
-        'hMGet': 'HMGET', 'hmget': 'HMGET', 'hMSet': 'HMSET', 'hmset': 'HMSET', 'hDel': 'HDEL', 'hdel': 'HDEL',
-
-        // List 명령어들
-        'lPush': 'LPUSH', 'lpush': 'LPUSH', 'rPush': 'RPUSH', 'rpush': 'RPUSH', 'lPop': 'LPOP', 'lpop': 'LPOP',
-        'rPop': 'RPOP', 'rpop': 'RPOP', 'lRange': 'LRANGE', 'lrange': 'LRANGE', 'lLen': 'LLEN', 'llen': 'LLEN',
-        'lSet': 'LSET', 'lset': 'LSET', 'lRem': 'LREM', 'lrem': 'LREM',
-
-        // Set 명령어들
-        'sAdd': 'SADD', 'sadd': 'SADD', 'sMembers': 'SMEMBERS', 'smembers': 'SMEMBERS', 'sRem': 'SREM', 'srem': 'SREM',
-        'sCard': 'SCARD', 'scard': 'SCARD',
-
-        // Sorted Set 명령어들
-        'zAdd': 'ZADD', 'zadd': 'ZADD', 'zRange': 'ZRANGE', 'zrange': 'ZRANGE', 'zRem': 'ZREM', 'zrem': 'ZREM'
-    };
-
-    // DBC 정보 설정
-    function setupDbcInfo(connectionOptions) {
-        if (dbc_hash === 0 && connectionOptions) {
-            dbc = 'redis://';
-            dbc += connectionOptions.host || 'localhost';
-            dbc += ':';
-            dbc += connectionOptions.port || 6379;
-            dbc += '/';
-            dbc += connectionOptions.db || 0;
-            dbc_hash = HashUtil.hashFromString(dbc);
-        }
-    }
-
-    function handleRedisError(ctx, err) {
-        if (!err) return;
-
-        try {
-            var errorClass = err.code || err.name || 'IORedisError';
-            var errorMessage = err.message || 'ioredis error';
-
-            if (!ctx.error) ctx.error = 1;
-            ctx.status = 500;
-            var errors = [errorClass, errorMessage];
-
-            AsyncSender.send_packet(PacketTypeEnum.TX_ERROR, ctx, errors);
-        } catch (e) {
-            Logger.printError('WHATAP-234', 'Error handling IORedis error', e, false);
-        }
-    }
-
-    // IORedis 클래스의 prototype.sendCommand 메서드를 직접 후킹하는 방식
-    if (mod && mod.prototype && !mod.__whatap_wrapped__) {
-        // IORedis의 핵심 메서드인 sendCommand를 후킹
-        if (mod.prototype.sendCommand && !mod.prototype.sendCommand.__whatap_wrapped__) {
-            var originalSendCommand = mod.prototype.sendCommand;
-
-            mod.prototype.sendCommand = function(command, stream) {
-                var ctx = TraceContextManager.getCurrentContext();
-                if (!ctx || !command || !command.name) {
-                    return originalSendCommand.apply(this, arguments);
-                }
-
-                var commandName = command.name.toLowerCase();
-                var normalizedCommand = REDIS_COMMANDS[commandName] || command.name.toUpperCase();
-
-                // 연결 정보 설정 (한 번만)
-                if (dbc_hash === 0 && this.options) {
-                    setupDbcInfo(this.options);
-                }
-
-                var self = this;
-                var commandArgs = command.args || [];
-
-                const asyncResource = new AsyncResource('ioredis-command');
-
-                return asyncResource.runInAsyncScope(() => {
-                    // DB 연결 패킷 전송
-                    ctx.start_time = Date.now();
-                    ctx.elapsed = 0;
-                    ctx.active_sqlhash = true;
-                    AsyncSender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, [dbc]);
-
-                    // IORedis 명령 시작
-                    var command_start_time = Date.now();
-                    ctx.footprint(`IORedis ${normalizedCommand} Start`);
-
-                    // IORedis에서는 command.args에서 쿼리 조합 (Python APM 방식 참고)
-                    var queryParts = [normalizedCommand];
-                    if (commandArgs && commandArgs.length > 0) {
-                        // 각 인자를 문자열로 변환하고 20자로 제한
-                        var argStrings = commandArgs.map(function(arg) {
-                            var argStr = String(arg);
-                            return argStr.length > 20 ? argStr.substring(0, 20) + '...' : argStr;
-                        });
-                        queryParts = queryParts.concat(argStrings);
-                    }
-                    var commandText = `Redis ` + queryParts.join(' ');
-
-                    try {
-                        var result = originalSendCommand.apply(self, arguments);
-
-                        // IORedis는 항상 Promise를 반환
-                        if (result && typeof result.then === 'function') {
-                            return result.then(
-                                function(res) {
-                                    var command_elapsed = Date.now() - command_start_time;
-                                    var resultCount = 0;
-
-                                    if (res !== undefined && res !== null) {
-                                        if (Array.isArray(res)) {
-                                            resultCount = res.length;
-                                        } else if (typeof res === 'string' || typeof res === 'number') {
-                                            resultCount = 1;
-                                        }
-                                    }
-
-                                    ctx.elapsed = command_elapsed;
-                                    ctx.active_sqlhash = false;
-                                    AsyncSender.send_packet(PacketTypeEnum.TX_SQL, ctx, [dbc, commandText, String(resultCount)]);
-                                    ctx.footprint(`IORedis ${normalizedCommand} Done`);
-                                    return res;
-                                },
-                                function(err) {
-                                    handleRedisError(ctx, err);
-                                    var command_elapsed = Date.now() - command_start_time;
-                                    ctx.elapsed = command_elapsed;
-                                    ctx.active_sqlhash = false;
-                                    AsyncSender.send_packet(PacketTypeEnum.TX_SQL, ctx, [dbc, commandText, '0']);
-                                    ctx.footprint(`IORedis ${normalizedCommand} Done`);
-                                    throw err;
-                                }
-                            );
-                        } else {
-                            // 예외적으로 Promise가 아닌 경우 처리
-                            var command_elapsed = Date.now() - command_start_time;
-                            var resultCount = 0;
-
-                            if (result !== undefined && result !== null) {
-                                if (Array.isArray(result)) {
-                                    resultCount = result.length;
-                                } else if (typeof result === 'string' || typeof result === 'number') {
-                                    resultCount = 1;
-                                }
-                            }
-
-                            ctx.elapsed = command_elapsed;
-                            ctx.active_sqlhash = false;
-                            AsyncSender.send_packet(PacketTypeEnum.TX_SQL, ctx, [dbc, commandText, String(resultCount)]);
-                            ctx.footprint(`IORedis ${normalizedCommand} Done`);
-                            return result;
-                        }
-                    } catch (commandError) {
-                        handleRedisError(ctx, commandError);
-                        var command_elapsed = Date.now() - command_start_time;
-                        ctx.elapsed = command_elapsed;
-                        ctx.active_sqlhash = false;
-                        AsyncSender.send_packet(PacketTypeEnum.TX_SQL, ctx, [dbc, commandText, '0']);
-                        ctx.footprint(`IORedis ${normalizedCommand} Done`);
-                        throw commandError;
-                    }
-                });
-            };
-
-            mod.prototype.sendCommand.__whatap_wrapped__ = true;
-        }
-
-        // IORedis 생성자도 후킹하여 연결 정보 수집
-        var originalConstructor = mod;
-        function WrappedIORedis() {
-            var args = Array.prototype.slice.call(arguments);
-            var ctx = TraceContextManager.getCurrentContext();
-
-            if (ctx) {
-                ctx.start_time = Date.now();
-                ctx.footprint('IORedis Client Creating');
-                ctx.db_opening = true;
-            }
-
-            // 원본 생성자 호출
-            var client = Object.create(originalConstructor.prototype);
-            originalConstructor.apply(client, args);
-
-            // 연결 옵션 파싱 및 DBC 정보 설정
-            var options = {};
-            if (args.length > 0) {
-                if (typeof args[0] === 'string') {
-                    try {
-                        var url = new URL(args[0]);
-                        options = {
-                            host: url.hostname,
-                            port: parseInt(url.port) || 6379,
-                            db: parseInt(url.pathname.slice(1)) || 0
-                        };
-                    } catch (e) {
-                        options = { host: 'localhost', port: 6379, db: 0 };
-                    }
-                } else if (typeof args[0] === 'number') {
-                    options = {
-                        host: args[1] || 'localhost',
-                        port: args[0],
-                        db: 0
-                    };
-                } else if (typeof args[0] === 'object') {
-                    options = args[0] || {};
-                    if (!options.host) options.host = 'localhost';
-                    if (!options.port) options.port = 6379;
-                    if (options.db === undefined) options.db = 0;
-                }
-            } else {
-                options = { host: 'localhost', port: 6379, db: 0 };
-            }
-
-            setupDbcInfo(options);
-
-            if (ctx) {
-                ctx.elapsed = Date.now() - (ctx.start_time || Date.now());
-                ctx.footprint('IORedis Client Created');
-                if (ctx.db_opening !== undefined) {
-                    ctx.db_opening = false;
-                }
-            }
-
-            return client;
-        }
-
-        // 프로토타입과 정적 속성 복사
-        WrappedIORedis.prototype = originalConstructor.prototype;
-        Object.setPrototypeOf(WrappedIORedis, originalConstructor);
-
-        Object.getOwnPropertyNames(originalConstructor).forEach(function(prop) {
-            if (prop !== 'prototype' && prop !== 'name' && prop !== 'length') {
-                try {
-                    var descriptor = Object.getOwnPropertyDescriptor(originalConstructor, prop);
-                    if (descriptor && descriptor.configurable !== false) {
-                        Object.defineProperty(WrappedIORedis, prop, descriptor);
-                    }
-                } catch (e) {
-                    // 복사할 수 없는 속성은 건너뛰기
-                }
-            }
-        });
-
-        // 모듈 교체
-        Object.getOwnPropertyNames(WrappedIORedis).forEach(function(prop) {
-            if (prop !== 'prototype') {
-                try {
-                    mod[prop] = WrappedIORedis[prop];
-                } catch (e) {
-                    // 설정할 수 없는 속성은 건너뛰기
-                }
-            }
-        });
-
-        mod.__whatap_wrapped__ = true;
-        Logger.initPrint("IORedis sendCommand method successfully wrapped");
-    }
-};
-
-exports.IORedisObserver = IORedisObserver;

package/lib/udp/async_sender.js

@@ -1,119 +0,0 @@
-const udpSession = require('./udp_session');
-const PacketTypeEnum = require('./packet_type_enum');
-const PacketQueue = require('./packet_queue');
-
-const SendType = {
-    DATAS: 1,
-    RELAY: 2
-};
-
-const packetQueue = PacketQueue.getInstance();
-let initialized = false;
-let sendThread = null;
-
-/**
- * Send a packet asynchronously
- * @param {number} packet_type - Type of packet from PacketTypeEnum
- * @param {object} ctx - Trace context
- * @param {array} datas - Array of data strings to send
- */
-function send_packet(packet_type, ctx, datas = []) {
-    _initThread();
-
-    // Deep copy the context to prevent modification
-    let copiedCtx = structuredClone(ctx);
-    if (packetQueue.full()) {
-        return;
-    }
-
-    packetQueue.put([SendType.DATAS, [packet_type, copiedCtx, datas]]);
-}
-
-/**
- * Send relay pack data asynchronously
- * @param {Buffer} packbytes - Bytes to send
- */
-function send_relaypack(packbytes) {
-    _initThread();
-
-    if (packetQueue.full()) {
-        return;
-    }
-
-    packetQueue.put([SendType.RELAY, packbytes]);
-}
-
-/**
- * Start the async processing thread
- */
-function startWhatapThread() {
-    // If thread is already running, don't start another
-    if (sendThread) {
-        return;
-    }
-
-    // Start processing loop
-    const processQueue = () => {
-        const packet = packetQueue.get();
-
-        if (!packet) {
-            // No packet, wait and try again
-            setTimeout(processQueue, 100);
-            return;
-        }
-
-        try {
-            const [sendType, params] = packet;
-            if (sendType === SendType.DATAS) {
-                const [packet_type, ctx, datas] = params;
-                udpSession.send_packet(packet_type, ctx, datas);
-            } else if (sendType === SendType.RELAY) {
-                const packbytes = params;
-                udpSession.send_relaypack(packbytes);
-            }
-        } catch (e) {
-            console.error("Error processing queue item:", e);
-        }
-
-        // Continue processing
-        setTimeout(processQueue, 0);
-    };
-
-    // Start the processing loop
-    sendThread = setTimeout(processQueue, 0);
-    console.log("WhaTap async sender thread started");
-}
-
-/**
- * Initialize the thread if not already initialized
- */
-function _initThread() {
-    if (initialized) {
-        return;
-    }
-
-    // Lock used to avoid multiple initializations
-    const initLock = function() {
-        if (initialized) {
-            return;
-        }
-
-        try {
-            initialized = true;
-            startWhatapThread();
-        } catch (e) {
-            console.error("Error initializing thread:", e);
-            initialized = false;
-        }
-    };
-
-    initLock();
-}
-
-// Export functions
-module.exports = {
-    send_packet,
-    send_relaypack,
-    startWhatapThread,
-    _initThread
-};

package/lib/udp/index.js

@@ -1,17 +0,0 @@
-/**
- * Main entry point for UDP module
- */
-
-const PacketEnum = require('./packet_enum');
-const PacketTypeEnum = require('./packet_type_enum');
-const ParamDef = require('./param_def');
-const UdpSession = require('./udp_session');
-const AsyncSender = require('./async_sender');
-
-module.exports = {
-    PacketEnum,
-    PacketTypeEnum,
-    ParamDef,
-    UdpSession,
-    AsyncSender
-};

package/lib/udp/packet_enum.js

@@ -1,52 +0,0 @@
-class PacketEnum {
-    static get PACKET_BUFFER_SIZE() { return 48 * 1024; }
-    static get PACKET_SEND_BUFFER_SIZE() { return 64 * 1024; }
-    static get DATA_SIZE_LIMIT() { return 30 * 1024 + 1; }
-
-    static get SERVER() { return "127.0.0.1"; }
-    static get PORT() { return 6600; }
-    static get PACKET_VERSION() { return 60101; }
-
-    // PACKET_HEADER
-    static get PACKET_HEADER_TYPE_POS() { return 0; }
-    static get PACKET_HEADER_TYPE_SIZE() { return 1; }
-
-    static get PACKET_HEADER_VERSION_POS() { return 1; }
-    static get PACKET_HEADER_VERSION_SIZE() { return 4; }
-
-    static get PACKET_HEADER_LEN_POS() { return 5; }
-    static get PACKET_HEADER_LEN_SIZE() { return 4; }
-
-    // PACKET_BODY
-    static get PACKET_BODY_ID_POS() { return 9; }
-    static get PACKET_BODY_ID_SIZE() { return 8; }
-
-    static get PACKET_BODY_START_TIME_POS() { return 17; }
-    static get PACKET_BODY_START_TIME_SIZE() { return 8; }
-
-    static get PACKET_BODY_ELAPSED_POS() { return 25; }
-    static get PACKET_BODY_ELAPSED_SIZE() { return 4; }
-
-    static get PACKET_BODY_CPU_POS() { return 29; }
-    static get PACKET_BODY_CPU_SIZE() { return 8; }
-
-    static get PACKET_BODY_MEMORY_POS() { return 37; }
-    static get PACKET_BODY_MEMORY_SIZE() { return 8; }
-
-    static get PACKET_BODY_THREAD_ID_POS() { return 45; }
-    static get PACKET_BODY_THREAD_ID_SIZE() { return 8; }
-
-    static get PACKET_BODY_TRACE_DATA_POS() { return 53; }
-
-    // PACKET_SIZE
-    static get PACKET_HEADER_SIZE() {
-        return this.PACKET_HEADER_TYPE_SIZE + this.PACKET_HEADER_VERSION_SIZE + this.PACKET_HEADER_LEN_SIZE;
-    }
-
-    static get PACKET_BODY_REQUIRED_SIZE() {
-        return this.PACKET_BODY_ID_SIZE + this.PACKET_BODY_START_TIME_SIZE + this.PACKET_BODY_ELAPSED_SIZE +
-            this.PACKET_BODY_CPU_SIZE + this.PACKET_BODY_MEMORY_SIZE;
-    }
-}
-
-module.exports = PacketEnum;

package/lib/udp/packet_queue.js

@@ -1,69 +0,0 @@
-/**
- * PacketQueue - Queue implementation for async sending packets
- * Implemented as a singleton to ensure only one queue exists.
- */
-
-class PacketQueue {
-    constructor(maxSize = 1000) {
-        // Singleton pattern: If instance exists, return it
-        if (PacketQueue.instance) {
-            return PacketQueue.instance;
-        }
-
-        // Initialize queue
-        this.queue = [];
-        this.maxSize = maxSize;
-
-        // Store the instance
-        PacketQueue.instance = this;
-    }
-
-    put(item) {
-        if (this.queue.length < this.maxSize) {
-            this.queue.push(item);
-            return true;
-        }
-        return false;
-    }
-
-    get() {
-        if (this.queue.length > 0) {
-            return this.queue.shift();
-        }
-        return null;
-    }
-
-    full() {
-        return this.queue.length >= this.maxSize;
-    }
-
-    empty() {
-        return this.queue.length === 0;
-    }
-
-    size() {
-        return this.queue.length;
-    }
-
-    clear() {
-        this.queue = [];
-    }
-
-    /**
-     * Get the singleton instance
-     * @param {number} maxSize - Maximum size of the queue (only used if instance doesn't exist)
-     * @returns {PacketQueue} - The singleton instance
-     */
-    static getInstance(maxSize = 1000) {
-        if (!PacketQueue.instance) {
-            PacketQueue.instance = new PacketQueue(maxSize);
-        }
-        return PacketQueue.instance;
-    }
-}
-
-// Initialize the static instance property
-PacketQueue.instance = null;
-
-// Export the class
-module.exports = PacketQueue;

package/lib/udp/packet_type_enum.js

@@ -1,33 +0,0 @@
-class PacketTypeEnum {
-    static get TX_BLANK() { return 0; }
-    static get TX_START() { return 1; }
-    static get TX_DB_CONN() { return 2; }
-    static get TX_DB_FETCH() { return 3; }
-    static get TX_SQL() { return 4; }
-    static get TX_SQL_START() { return 5; }
-    static get TX_SQL_END() { return 6; }
-
-    static get TX_HTTPC() { return 7; }
-    static get TX_HTTPC_START() { return 8; }
-    static get TX_HTTPC_END() { return 9; }
-
-    static get TX_ERROR() { return 10; }
-    static get TX_MSG() { return 11; }
-    static get TX_METHOD() { return 12; }
-
-    static get TX_SECURE_MSG() { return 13; }
-    static get TX_WEB_SOCKET() { return 16; }
-
-    static get TX_END() { return 255; }
-
-    static get TX_PARAM() { return 30; }
-    static get ACTIVE_STACK() { return 40; }
-    static get ACTIVE_STATS() { return 41; }
-    static get DBCONN_POOL() { return 42; }
-
-    static get EVENT() { return 50; }
-
-    static get RELAY_PACK() { return 244; }
-}
-
-module.exports = PacketTypeEnum;