whatap 1.0.13 → 1.0.14-canary.0

package/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "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)"
+    ]
+  }
+}

package/lib/core/agent.js

@@ -1307,13 +1307,20 @@ NodeAgent.prototype.init = function(cb) {
         Logger.print('WHATAP-114', 'WHATAP_HOME not set, using application root: ' + process.env.WHATAP_HOME, false);
     }
 
-    Logger.initializer.process();
-    Logger.print('WHATAP-110', 'Start initialize WhaTap Agent... Root[' + self._conf['app.root'] + ']', true);
-
+    // Fallback: app.root가 없으면 WHATAP_HOME을 사용
     if (self._conf['app.root'] == null || self._conf['app.root'].length == 0) {
-        return Logger.print("WHATAP-111", "Can not find application root directory", false);
+        if (process.env.WHATAP_HOME) {
+            self._conf['app.root'] = process.env.WHATAP_HOME;
+            Logger.print('WHATAP-115', 'app.root not found (no package.json), using WHATAP_HOME: ' + process.env.WHATAP_HOME, false);
+        } else {
+            self._conf['app.root'] = process.cwd();
+            Logger.print('WHATAP-115', 'app.root not found (no package.json), using cwd: ' + process.cwd(), false);
+        }
     }
 
+    Logger.initializer.process();
+    Logger.print('WHATAP-110', 'Start initialize WhaTap Agent... Root[' + self._conf['app.root'] + ']', true);
+
     // Initialize configuration with proper home directory
     if (!self.initConfig('WHATAP_HOME')) {
         Logger.printError("WHATAP-051", "Failed to initialize configuration", null, false);

package/lib/logger.js

@@ -163,16 +163,13 @@
          if(conf.log_file_enabled === false ) { return; }
          var log_prefix = WHATAP_CONF+"-hook-";
  
-         var root = conf['app.root'];
+         var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
          if(root==null || root ==undefined){
              console.log('[WHATAP]Logger Error - WHATAP ROOT DIR IS NULL');
              return;
          }
-         if(conf.getProperty('log_root', null)){
-             root = conf.getProperty('log_root', null);
-             if(fs.existsSync(root) == false) {
-                 fs.mkdirSync(root, {recursive: true});
-             }
+         if(fs.existsSync(root) == false) {
+             fs.mkdirSync(root, {recursive: true});
          }
          var dir = path.join(root, 'logs');
          if(fs.existsSync(dir) == false) {
@@ -198,12 +195,10 @@
              return;
          }
 
-         var root = conf['app.root'];
-         if (conf.getProperty('log_root', null)) {
-             root = conf.getProperty('log_root', null);
-             if (fs.existsSync(root) == false) {
-                 fs.mkdirSync(root, {recursive: true});
-             }
+         var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
+         if(root==null || root ==undefined){ return; }
+         if(fs.existsSync(root) == false) {
+             fs.mkdirSync(root, {recursive: true});
          }
          var nowUnit = DateUtil.getDateUnit(),
              dir = path.join(root, 'logs'),
@@ -248,13 +243,7 @@
  
  
  
-             var root = conf['app.root'];
-             if(conf.getProperty('log_root', null)){
-                 root = conf.getProperty('log_root', null);
-                 if(fs.existsSync(root) == false) {
-                     fs.mkdirSync(root, {recursive: true});
-                 }
-             }
+             var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
              if(root==null ){
                  return null;
              }
@@ -297,13 +286,7 @@
  
          var o = new MapValue();
          if(conf.log_file_enabled === false ) { return o; }
-         var root = conf['app.root'];
-         if(conf.getProperty('log_root', null)){
-             root = conf.getProperty('log_root', null);
-             if(fs.existsSync(root) == false) {
-                 fs.mkdirSync(root, {recursive: true});
-             }
-         }
+         var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
          if(root==null){
              return o;
          }

package/lib/observers/http-observer.js

@@ -130,6 +130,7 @@ HttpObserver.prototype.__createTransactionObserver = function (callback, isHttps
             ctx.service_name = req.url ? req.url : "";
             ctx.isStaticContents = isStatic(ctx.service_name);
             if(ctx.isStaticContents){
+                TraceContextManager.end(ctx.id);
                 return callback(req, res);
             }
 
@@ -179,6 +180,43 @@ HttpObserver.prototype.__createTransactionObserver = function (callback, isHttps
 
             try {
                 AsyncSender.send_packet(PacketTypeEnum.TX_START, ctx, datas)
+
+                /************************************/
+                /*   Header / param Trace           */
+                /************************************/
+                var header_enabled = false;
+                if (conf.profile_http_header_enabled === true && req.headers) {
+                    header_enabled = true;
+                    var prefix = conf.profile_header_url_prefix;
+                    if (prefix && ctx.service_name.indexOf(prefix) < 0) {
+                        header_enabled = false;
+                    }
+                }
+
+                if (header_enabled) {
+                    var header_ignore_key_set = new Set();
+                    if (profile_http_header_ignore_keys) {
+                        header_ignore_key_set = new Set(profile_http_header_ignore_keys.split(','));
+                    }
+
+                    try {
+                        var headerDesc = Object.keys(req.headers).map(function (key) {
+                            if (!header_ignore_key_set.has(key)) {
+                                return `${key}=${req.headers[key]}`;
+                            }
+                        }).filter(element => {
+                            if (element) return element
+                        }).join('\n');
+
+                        if (headerDesc) {
+                            let headerDatas = ['HTTP-HEADERS', 'HTTP-HEADERS', headerDesc];
+                            AsyncSender.send_packet(PacketTypeEnum.TX_MSG, ctx, headerDatas);
+                        }
+                    } catch (e) {
+                        Logger.printError('WHATAP-236', 'Header parsing error', e, false);
+                    }
+                }
+
                 return callback.apply(this, arguments);
             } catch (e) {
                 Logger.printError("WHATAP-235", 'Hooking request failed..', e, false);
@@ -252,43 +290,6 @@ function initCtx(req, res) {
     // Host
     ctx.host = req.headers.host;
 
-    /************************************/
-    /*   Header / param Trace           */
-    /************************************/
-    var header_enabled = false;
-    if (conf.profile_http_header_enabled === true && req.headers) {
-        header_enabled = true;
-        var prefix = conf.profile_header_url_prefix;
-        if (prefix && ctx.service_name.indexOf(prefix) < 0) {
-            header_enabled = false;
-        }
-    }
-
-    if (header_enabled) {
-        var header_ignore_key_set = new Set();
-        if (profile_http_header_ignore_keys) {
-            header_ignore_key_set = new Set(profile_http_header_ignore_keys.split(','));
-        }
-
-        try {
-            var headerDesc = Object.keys(req.headers).map(function (key) {
-                if (!header_ignore_key_set.has(key)) {
-                    return `${key}=${req.headers[key]}`;
-                }
-            }).filter(element => {
-                if (element) return element
-            }).join('\n');
-
-            if (headerDesc) {
-                let headerDatas = ['HTTP-HEADERS', 'HTTP-HEADERS', headerDesc];
-                ctx.start_time = Date.now();
-                AsyncSender.send_packet(PacketTypeEnum.TX_MSG, ctx, headerDatas);
-            }
-        } catch (e) {
-            Logger.printError('WHATAP-236', 'Header parsing error', e, false);
-        }
-    }
-
     /************************************/
     /*   Multi Server Transaction Trace */
     /************************************/

package/lib/observers/prisma-observer.js

@@ -37,19 +37,87 @@ PrismaObserver.prototype.inject = function(mod, moduleName) {
     // Prisma Client 초기화 메서드 후킹
     if (mod.PrismaClient) {
         shimmer.wrap(mod, 'PrismaClient', function(originalConstructor) {
-            return function(...args) {
-                // 원래 생성자 호출
-                const instance = originalConstructor.apply(this, args);
-
-                // 패치 적용
-                self.patchPrismaInstance(instance);
-
-                return instance;
-            };
+            class WhatapPrismaClient extends originalConstructor {
+                constructor(...args) {
+                    super(...args);
+                    if (this.__whatap_observe__) return;
+                    this.__whatap_observe__ = true;
+
+                    self.setupConnectionInfo(this);
+
+                    if (typeof this.$use === 'function') {
+                        // Prisma v4: $use 미들웨어 사용
+                        self.hookUseMiddleware(this);
+                    } else if (typeof this._request === 'function') {
+                        // Prisma v5+: _request 메서드 직접 래핑
+                        self.hookRequestMethod(this);
+                    }
+                }
+            }
+            Object.defineProperty(WhatapPrismaClient, 'name', {
+                value: originalConstructor.name,
+            });
+            return WhatapPrismaClient;
         });
     }
 };
 
+PrismaObserver.prototype.hookRequestMethod = function(prismaInstance) {
+    const self = this;
+    const originalRequest = prismaInstance._request;
+
+    prismaInstance._request = function(params) {
+        const ctx = TraceContextManager.getCurrentContext();
+        if (!ctx) {
+            return originalRequest.call(this, params);
+        }
+
+        const model = params.model;
+        const action = params.action || params.clientMethod || 'unknown';
+        // model이 있으면 "Prisma User.findMany", 없으면(raw query) "Prisma $queryRawUnsafe"
+        const queryInfo = model
+            ? `Prisma ${model}.${action}`
+            : `Prisma ${params.clientMethod || action}`;
+
+        ctx.start_time = Date.now();
+        ctx.elapsed = 0;
+        AsyncSender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, [dbc]);
+
+        var sql_start_time = Date.now();
+
+        ctx.footprint(`${queryInfo} Start`);
+        ctx.sql_count = (ctx.sql_count || 0) + 1;
+        ctx.active_sqlhash = HashUtil.hashFromString(queryInfo);
+        ctx.active_dbc = dbc_hash;
+
+        try {
+            const result = originalRequest.call(this, params);
+
+            // _request는 Promise/thenable을 반환하므로 .then()으로 후처리
+            if (result && typeof result.then === 'function') {
+                return result.then(
+                    function(res) {
+                        self._finishQuery(ctx, sql_start_time, res, queryInfo);
+                        ctx.footprint(`${queryInfo} Done`);
+                        return res;
+                    },
+                    function(err) {
+                        self._handleError(ctx, sql_start_time, err, queryInfo);
+                        ctx.footprint(`${queryInfo} Error`);
+                        throw err;
+                    }
+                );
+            }
+
+            return result;
+        } catch (err) {
+            self._handleError(ctx, sql_start_time, err, queryInfo);
+            ctx.footprint(`${queryInfo} Error`);
+            throw err;
+        }
+    };
+};
+
 PrismaObserver.prototype.patchPrismaInstance = function(prismaInstance) {
     if (prismaInstance.__whatap_observe__) {
         return;
@@ -92,7 +160,7 @@ PrismaObserver.prototype.setupConnectionInfo = function(prismaInstance) {
 
 PrismaObserver.prototype.hookUseMiddleware = function(prismaInstance) {
     const self = this;
-    
+
     if (typeof prismaInstance.$use === 'function') {
         prismaInstance.$use(async (params, next) => {
             const ctx = TraceContextManager.getCurrentContext();

package/lib/requestlog.js

@@ -172,11 +172,14 @@ var RequestLog = {
         if(conf.log_file_enabled === false ) { return; }
         var log_prefix = WHATAP_CONF+"-";
 
-        var root = conf['app.root'];
+        var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
         if(root==null || root ==undefined){
-            console.log('[WHATAP]RequestLog Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
+            console.log('[WHATAP]RequestLog Error - WHATAP ROOT DIR IS NULL');
             return;
         }
+        if(fs.existsSync(root) == false) {
+            fs.mkdirSync(root, {recursive: true});
+        }
         var dir = path.join(root, 'logs');
         if(fs.existsSync(dir) == false) {
             fs.mkdirSync(dir);
@@ -197,8 +200,9 @@ var RequestLog = {
         if(conf.reqlog_rotation_enabled === false || conf.reqlog_enabled === false) { return; }
         if(conf.reqlog_keep_days <= 0) { return; }
 
+        var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
+        if(root==null || root ==undefined){ return; }
         var nowUnit = DateUtil.getDateUnit(),
-            root = conf['app.root'],
             dir = path.join(root, 'logs'),
             log_prefix = WHATAP_CONF+"-";
 
@@ -238,7 +242,7 @@ var RequestLog = {
 			return null;
 		if (file.startsWith(WHATAP_CONF) == false) return null;
 
-        var root = conf['app.root'];
+        var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
         if(root==null ){
             return null;
         }
@@ -281,7 +285,7 @@ var RequestLog = {
 
         var o = new MapValue();
         if(conf.log_file_enabled === false ) { return o; }
-        var root = conf['app.root'];
+        var root = conf.getProperty('log_root', null) || process.env.WHATAP_HOME || conf['app.root'];
         if(root==null){
             return o;
         }

package/package.json

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