whatap 0.5.19 → 0.5.21

package/lib/observers/oracle-observer.js

@@ -63,9 +63,11 @@ var errorDelegate = function (ctx, step) {
         MeterSql.add(step.dbc, step.elapsed, true);
         StatSql.addSqlTime(ctx.service_hash, step.dbc, step.hash, step.elapsed, true, 0);
 
+        ctx.error_class = args[0].name || args[0].constructor?.name || 'OracleError';
+
         try {
             var errorCode = args[0].errorNum || args[0].code || 'ORA-00000';
-            var errorMsg = args[0].message || 'Oracle error';
+            var errorMsg = ctx.error_message = args[0].message || 'Oracle error';
 
             if (conf._is_trace_ignore_err_cls_contains === true && errorCode.toString().indexOf(conf.trace_ignore_err_cls_contains) < 0) {
                 step.error = StatError.addError('oracle-' + errorCode, errorMsg, ctx.service_hash, TextTypes.SQL, step.hash);
@@ -96,6 +98,7 @@ var errorDelegate = function (ctx, step) {
             }
         } catch (e) {
             Logger.printError('WHATAP-110', 'OracleObserver error delegate exception', e, false);
+            ctx.error_message = 'Oracle error processing failed';
         }
     };
 };

package/lib/observers/pgsql-observer.js

@@ -239,6 +239,8 @@ PgSqlObserver.prototype._finishQuery = function (ctx, sql_step) {
 };
 
 PgSqlObserver.prototype._handleError = function (ctx, sql_step, err) {
+    ctx.error_message = err.message;
+    ctx.error_class = err.name || err.constructor?.name || 'PgsqlError';
     sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
     TraceSQL.isSlowSQL(ctx);
 

package/lib/observers/prisma-observer.js

@@ -237,7 +237,6 @@ PrismaObserver.prototype.hookUseMiddleware = function(prismaInstance) {
                 }
             }
             try {
-
                 result = await next(params);
 
                 // Raw 쿼리 처리
@@ -353,7 +352,9 @@ PrismaObserver.prototype._handleError = function(ctx, sql_step, err) {
     StatSql.addSqlTime(ctx.service_hash, sql_step.dbc, sql_step.hash, sql_step.elapsed, true, 0);
 
     try {
-        const errorClassName = err.name || (err.constructor && err.constructor.name) || "UnknownError";
+        const errorClassName = err.name || err.constructor?.name || "UnknownError";
+        ctx.error_class = errorClassName;
+        ctx.error_message = err.message;
         sql_step.error = StatError.addError(errorClassName, err.message, ctx.service_hash, TextTypes.SQL, sql_step.hash);
 
         if (ctx.error.isZero()) {

package/lib/service/tx-record.js

@@ -43,27 +43,37 @@ function TxRecord() {
     this.mcaller_okind = 0;
     this.mcaller_oid = 0;
     this.mcaller_spec = 0;
-	this.mcaller_url = 0;
+    this.mcaller_url = 0;
     this.mthis_spec = 0;
-    
+
     this.http_method = 0;
 
     this.domain = 0;
     this.fields = [];
 
     this.login=0;
-	this.errorLevel=0;
+    this.errorLevel=0;
 
-	this.oid=0;
+    this.oid=0;
     this.okind=0;
-	this.onode=0;
-    
+    this.onode=0;
+
     this.custid=null;
     this.dbcTime=0;
     this.apdex=0;
 
     this.mcallerStepId = Long.ZERO;
-    this.originUrl = null;    
+    this.originUrl = null;
+
+    this.step_split_count = 0;
+
+    this.methodCount = 0;
+    this.methodTime = 0;
+
+    this.appctx = "";
+    this.txName = "";
+    this.error_class = "";
+    this.error_message = "";
 }
 TxRecord.prototype.getServiceType = function() {return 0;};
 
@@ -78,15 +88,15 @@ TxRecord.prototype.write = function(dout) {
     o.writeDecimal(this.error);
     o.writeDecimal(this.cpuTime);
     o.writeDecimal(this.malloc);
-    
+
     o.writeDecimal(this.sqlCount);
     o.writeDecimal(this.sqlTime);
     o.writeDecimal(this.sqlFetchCount);
     o.writeDecimal(this.sqlFetchTime);
-    
+
     o.writeDecimal(this.httpcCount);
     o.writeDecimal(this.httpcTime);
-    
+
     o.writeBoolean(this.active);
     o.writeDecimal(this.steps_data_pos);
     o.writeDecimal(this.cipher);
@@ -113,13 +123,13 @@ TxRecord.prototype.write = function(dout) {
         o.writeDecimal(this.mcaller_spec);
         o.writeDecimal(this.mcaller_url);
         o.writeDecimal(this.mthis_spec);//보통 0, 서버에서 셋팅
-     }else {
+    }else {
         o.writeByte(0);
-     }
+    }
 
     o.writeByte(this.http_method);
     o.writeDecimal(this.domain);
-    
+
     if (this.fields == null || this.fields.length==0) {
         o.writeByte(0);
     } else {
@@ -137,7 +147,7 @@ TxRecord.prototype.write = function(dout) {
     o.writeDecimal(this.oid);
     o.writeDecimal(this.okind);
     o.writeDecimal(this.onode);
-    
+
     o.writeText(this.custid);
     o.writeDecimal(this.dbcTime);
     o.writeByte(this.apdex);
@@ -145,6 +155,16 @@ TxRecord.prototype.write = function(dout) {
     o.writeDecimal(this.mcallerStepId);
     o.writeText(this.originUrl);
 
+    o.writeDecimal(this.step_split_count);
+
+    o.writeDecimal(this.methodCount);
+    o.writeDecimal(this.methodTime);
+
+    o.writeText(this.appctx);
+    o.writeText(this.txName);
+    o.writeText(this.error_class);
+    o.writeText(this.error_message);
+
     ////////////// BLOB ///////////////
     dout.writeBlob(o.toByteArray());
 };
@@ -160,18 +180,18 @@ TxRecord.prototype.read = function(din) {
     this.service =  i.readDecNumber();
     this.elapsed = i.readDecNumber();
     this.error = i.readDecimal();
-  
+
     this.cpuTime = i.readDecNumber();
     this.malloc = i.readDecNumber();
-    
+
     this.sqlCount = i.readDecNumber();
     this.sqlTime = i.readDecNumber();
     this.sqlFetchCount = i.readDecNumber();
     this.sqlFetchTime = i.readDecNumber();
-    
+
     this.httpcCount = i.readDecNumber();
     this.httpcTime = i.readDecNumber();
-    
+
     this.active = i.readBoolean();
     this.steps_data_pos = i.readDecNumber();
     this.cipher = i.readDecNumber();
@@ -187,41 +207,41 @@ TxRecord.prototype.read = function(din) {
         this.mdepth = i.readDecNumber();
         this.mcaller_txid = i.readDecLong();
     }
-   
+
     switch (i.readByte()) {
-		case 1:
-			this.mcaller_pcode = i.readDecNumber();
-			break;
-		case 3:
-			this.mcaller_pcode = i.readDecNumber();
-			this.mcaller_spec = i.readDecNumber();
-			this.mcaller_url = i.readDecNumber();
-			break;
-		case 4:
-			this.mcaller_pcode = i.readDecNumber();
-			this.mcaller_spec = i.readDecNumber();
-			this.mcaller_url = i.readDecNumber();
-			this.mthis_spec = i.readDecNumber();
-			break;
-		case 5:
-			this.mcaller_pcode = i.readDecNumber();
-			this.mcaller_oid = i.readDecNumber();
-			this.mcaller_spec = i.readDecNumber();
-			this.mcaller_url = i.readDecNumber();
-			this.mthis_spec = i.readDecNumber();
-			break;
-		case 6:
-			this.mcaller_pcode = i.readDecNumber();
-			this.mcaller_okind = i.readDecNumber();
-			this.mcaller_oid = i.readDecNumber();
-			this.mcaller_spec = i.readDecNumber();
-			this.mcaller_url = i.readDecNumber();
-			this.mthis_spec = i.readDecNumber();
-			break;
-		}
+        case 1:
+            this.mcaller_pcode = i.readDecNumber();
+            break;
+        case 3:
+            this.mcaller_pcode = i.readDecNumber();
+            this.mcaller_spec = i.readDecNumber();
+            this.mcaller_url = i.readDecNumber();
+            break;
+        case 4:
+            this.mcaller_pcode = i.readDecNumber();
+            this.mcaller_spec = i.readDecNumber();
+            this.mcaller_url = i.readDecNumber();
+            this.mthis_spec = i.readDecNumber();
+            break;
+        case 5:
+            this.mcaller_pcode = i.readDecNumber();
+            this.mcaller_oid = i.readDecNumber();
+            this.mcaller_spec = i.readDecNumber();
+            this.mcaller_url = i.readDecNumber();
+            this.mthis_spec = i.readDecNumber();
+            break;
+        case 6:
+            this.mcaller_pcode = i.readDecNumber();
+            this.mcaller_okind = i.readDecNumber();
+            this.mcaller_oid = i.readDecNumber();
+            this.mcaller_spec = i.readDecNumber();
+            this.mcaller_url = i.readDecNumber();
+            this.mthis_spec = i.readDecNumber();
+            break;
+    }
     this.http_method = i.readByte();
     this.domain = i.readDecNumber();
-    
+
     var n = i.readByte();
     if (n > 0) {
         this.fields = new Array(n);
@@ -250,7 +270,7 @@ TxRecord.prototype.read = function(din) {
         this.okind = i.readDecNumber();
         this.onode = i.readDecNumber();
     }
-    
+
     if (i.available() > 0) {
         this.custid = i.readText();
     }
@@ -260,11 +280,29 @@ TxRecord.prototype.read = function(din) {
     if (i.available() > 0) {
         this.apdex = i.readByte();
     }
-    
+
     if(i.available()>0) {
         this.mcallerStepId=i.readDecNumber();
         this.originUrl=i.readText();
-    }		
+    }
+
+    if (i.available() > 0) {
+        this.step_split_count = i.readDecimal();
+    }
+    if (i.available() > 0) {
+        this.methodCount =  i.readDecimal();
+        this.methodTime = i.readDecimal();
+    }
+    if(i.available()>0) {
+        this.appctx=i.readText();
+    }
+    if(i.available()>0) {
+        this.txName=i.readText();
+    }
+    if(i.available()>0) {
+        this.error_class = i.readText();
+        this.error_message = i.readText();
+    }
 
     return this;
 };
@@ -276,7 +314,7 @@ TxRecord.prototype.toBytes = function() {
 };
 
 TxRecord.prototype.toObject = function(b) {
-    var din = new DataInputX(b); 
+    var din = new DataInputX(b);
     this.read(din);
     return service;
 };

package/lib/trace/trace-context.js

@@ -31,6 +31,8 @@ function TraceContext(id) {
     this.service_name = '';
     this.remoteIp = 0;
     this.error = Long.ZERO;
+    this.error_class = '';
+    this.error_message = '';
 
     this.http_method = '';
     this.http_query = '';

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.19",
-  "releaseDate": "20250514",
+  "version": "0.5.21",
+  "releaseDate": "20250626",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},