whatap 0.5.15 → 0.5.17

package/lib/conf/config-default.js

@@ -276,7 +276,9 @@ var ConfigDefault = {
     "prisma_read_func_name": str("prisma_read_func_name", "read"),
     "prisma_database_url_name": str("prisma_database_url_name", "DATABASE_URL"),
 
-    "metering_tagcount_enabled": bool("metering_tagcount_enabled", false)
+    "metering_tagcount_enabled": bool("metering_tagcount_enabled", false),
+    "profile_redis_param_enabled": bool("profile_redis_param_enabled", false),
+
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/observers/pgsql-observer.js

@@ -124,10 +124,12 @@ PgSqlObserver.prototype.inject = function (mod, moduleName) {
             dbc_step = null;
 
             var sql_step = new SqlStepX();
-            sql_step.start_time = Date.now();
+            sql_step.start_time = ctx.getElapsedTime();
             ctx.profile.push(sql_step);
             ctx.footprint('PgSql Query Start');
 
+            ctx.vvv++;
+
             let sql = arguments[0];
             let psql = null;
             if (typeof sql === 'string' && sql.length > 0) {
@@ -176,7 +178,7 @@ PgSqlObserver.prototype.inject = function (mod, moduleName) {
                     return result.then(res => {
                         if(res.command && res.command === 'SELECT'){
                             var result_step = new ResultSetStep();
-                            result_step.start_time = Date.now();
+                            result_step.start_time = ctx.getElapsedTime();
                             result_step.elapsed = 0;
                             result_step.fetch = res.rowCount;
                             result_step.sqlhash = psql.sql;
@@ -194,6 +196,16 @@ PgSqlObserver.prototype.inject = function (mod, moduleName) {
                         return res;
                     }).catch(err => {
                         self._handleError(ctx, sql_step, err)
+                        if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
+                            var traceDepth = conf.trace_sql_error_depth;
+
+                            var errorStack = err.stack.split("\n");
+                            if (errorStack.length > traceDepth) {
+                                errorStack = errorStack.slice(0, traceDepth + 1);
+                            }
+                            ctx.error_message = errorStack.join("\n");
+                            sql_step.error = ctx.error = StatError.addError('pgsql -' + err.code, err.message, ctx.service_hash, TextTypes.SQL, null);
+                        }
                         throw err;
                     });
                 } else {
@@ -219,7 +231,7 @@ PgSqlObserver.prototype.inject = function (mod, moduleName) {
 };
 
 PgSqlObserver.prototype._finishQuery = function (ctx, sql_step) {
-    sql_step.elapsed = Date.now() - sql_step.start_time;
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
     TraceSQL.isSlowSQL(ctx);
 
     MeterSql.add(sql_step.hash, sql_step.elapsed, false);
@@ -227,28 +239,7 @@ PgSqlObserver.prototype._finishQuery = function (ctx, sql_step) {
 };
 
 PgSqlObserver.prototype._handleError = function (ctx, sql_step, err) {
-    sql_step.elapsed = Date.now() - sql_step.start_time;
-
-    try {
-        sql_step.error = StatError.addError("pgsql-" + (err.code || "unknown"), err.message, ctx.service_hash, TextTypes.SQL, sql_step.hash);
-
-        if (ctx.error.isZero()) {
-            ctx.error = sql_step.error;
-        }
-
-        if (conf.trace_sql_error_stack && conf.trace_sql_error_depth) {
-            var traceDepth = conf.trace_sql_error_depth;
-            var errorStack = err.stack.split("\n");
-
-            if (errorStack.length > traceDepth) {
-                errorStack = errorStack.slice(0, traceDepth + 1);
-            }
-            ctx.error_message = errorStack.join("\n");
-        }
-    } catch (e) {
-        Logger.printError("WHATAP-309", "Error handling failed", e, false);
-    }
-
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
     TraceSQL.isSlowSQL(ctx);
 
     MeterSql.add(sql_step.hash, sql_step.elapsed, false);

package/lib/observers/prisma-observer.js

@@ -330,7 +330,7 @@ PrismaObserver.prototype.hookUseMiddleware = function(prismaInstance) {
 };
 
 PrismaObserver.prototype._finishQuery = function(ctx, sql_step) {
-    sql_step.elapsed = Date.now() - sql_step.start_time;
+    sql_step.elapsed = ctx.getElapsedTime() - sql_step.start_time;
     ctx.sql_time = (ctx.sql_time || 0) + sql_step.elapsed;
 
     TraceSQL.isSlowSQL(ctx);
@@ -342,7 +342,7 @@ PrismaObserver.prototype._finishQuery = function(ctx, sql_step) {
 };
 
 PrismaObserver.prototype._handleError = function(ctx, sql_step, err) {
-    sql_step.elapsed = Date.now() - sql_step.start_time;
+    sql_step.elapsed = ctx.getElapsedTime()
     ctx.sql_time = (ctx.sql_time || 0) + sql_step.elapsed;
 
     TraceSQL.isSlowSQL(ctx);

package/lib/observers/redis-observer.js

@@ -74,11 +74,9 @@ RedisObserver.prototype._injectRedis = function (mod) {
                             var sql = `${command.toUpperCase()}`;
                             var sql_step = new SqlStepX();
                             sql_step.start_time = ctx.getElapsedTime();
-                            sql_step.hash = HashUtil.hashFromString(sql);
                             sql_step.dbc = dbc_hash;
 
                             if(conf.getProperty('profile_redis_param_enabled', false)){
-                                var params;
                                 if (arguments[0] && typeof arguments[0] === 'string')
                                     sql += ' ' + arguments[0];
                                 else if (arguments[0] && Array.isArray(arguments[0]))
@@ -91,7 +89,6 @@ RedisObserver.prototype._injectRedis = function (mod) {
                                     var args = Array.isArray(arguments[1]) ? arguments[1] : [arguments[1]];
                                     sql_step.setTrue(1);
                                     var crc = {value: 0};
-                                    sql_step.p1 = toParamBytes(args.join(","), crc);
                                     const result = args.map((arg) => {
                                         if (typeof arg === 'string') {
                                             return `'${arg}'`
@@ -102,7 +99,7 @@ RedisObserver.prototype._injectRedis = function (mod) {
                                     sql_step.pcrc = crc.value;
                                 }
                             }
-
+                            sql_step.hash = HashUtil.hashFromString(sql);
                             ctx.profile.push(sql_step);
 
                             DataTextAgent.SQL.add(sql_step.hash, sql);
@@ -163,10 +160,8 @@ RedisObserver.prototype._injectIORedis = function (mod) {
 
                 try {
                     var sql_step = new SqlStepX();
-
                     var sql = command.name.toUpperCase();
                     if(conf.getProperty('profile_redis_param_enabled', false)){
-                        var params;
                         var args = command.args;
                         var key = args.shift();
                         if (key && typeof key === 'string')
@@ -175,7 +170,6 @@ RedisObserver.prototype._injectIORedis = function (mod) {
                         if(args && args.length > 0){
                             sql_step.setTrue(1);
                             var crc = {value: 0};
-                            sql_step.p1 = toParamBytes(args.join(","), crc);
                             const result = args.map((arg) => {
                                 if (typeof arg === 'string') {
                                     return `'${arg}'`

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.15",
-  "releaseDate": "20250414",
+  "version": "0.5.17",
+  "releaseDate": "20250416",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},