whatap 0.5.11 → 0.5.13

package/lib/conf/config-default.js

@@ -275,6 +275,8 @@ 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)
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/core/agent.js

@@ -32,7 +32,9 @@ var Interceptor      = require('./interceptor').Interceptor,
     ScheduleObserver = require('../observers/schedule-observer').ScheduleObserver,
     // GRpcObserver     = require('../observers/grpc-observer').GRpcObserver,
     ApolloObserver   = require('../observers/apollo-server-observer').ApolloServerObserver,
-    PrismaObserver  = require('../observers/prisma-observer').PrismaObserver;
+    PrismaObserver  = require('../observers/prisma-observer').PrismaObserver,
+    OracleObserver  = require('../observers/oracle-observer').OracleObserver;
+
 
 
 var Configuration    = require('./../conf/configure'),
@@ -279,6 +281,7 @@ NodeAgent.prototype.loadObserves = function() {
     // observes.push(GRpcObserver);
     observes.push(ApolloObserver);
     observes.push(PrismaObserver);
+    observes.push(OracleObserver);
 
     var packageToObserve = {};
     observes.forEach(function(observeObj) {

package/lib/counter/counter-manager.js

@@ -17,6 +17,7 @@ var CounterPack = require('../pack/counter-pack'),
     GCStat = require('./task/gcstat'),
     Sql = require('./task/sql'),
     HttpC = require('./task/httpc'),
+    // MeteringInfo = require('./task/metering-info'),
     StatError = require('../stat/stat-error'),
     TagCounterPack = require('../pack/tagcount-pack'),
     TraceContextManager = require('../trace/trace-context-manager'),
@@ -52,6 +53,9 @@ CounterManager.prototype.run = function () {
         tasks.push(new GCStat());
         tasks.push(new Sql());
         tasks.push(new HttpC());
+
+        // metering
+        // tasks.push(new MeteringInfo());
         self.intervalIndex = setInterval(function(){
             self.process(tasks);    
         },5000);

package/lib/counter/task/metering-info.js

@@ -0,0 +1,118 @@
+/**
+ * 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'),
+    fs = require('fs'),
+    TagCountPack = require('../../pack/tagcount-pack'),
+    OType = require('../../pack/otype'),
+    APEnum = require('../../pack/apenum')
+
+function MeteringInfo() {
+    CounterTask.call(this);
+    this.first_connected = true;
+    this.lastTime = DateUtil.getFiveMinUnit(DateUtil.currentTime());
+    this.hostUUID = null;
+    this.csp = null;
+    this.hostUUIDFileName = '/sys/class/dmi/id/product_uuid';
+}
+
+MeteringInfo.prototype = new CounterTask();
+MeteringInfo.prototype.constructor = MeteringInfo;
+
+MeteringInfo.prototype.process = function (p) {
+    if (!conf.getProperty('metering_tagcount_enabled', false)) {
+        return;
+    }
+
+    if (this.first_connected) {
+        this.first_connected = false;
+        this.doProcess(p);
+        return;
+    }
+
+    const now = DateUtil.getFiveMinUnit(DateUtil.currentTime());
+    if (this.lastTime >= now) {
+        return;
+    }
+
+    this.lastTime = now;
+    this.doProcess(p);
+};
+
+MeteringInfo.prototype.doProcess = function (p) {
+    const pk = new TagCountPack();
+    pk.category = 'metering';
+    pk.time = DateUtil.currentTime() / 300000 * 300000;
+
+    pk.putTagInt('otype', OType.AP);
+    pk.putTagInt('subtype', APEnum.AP_NODE);
+    pk.putTagInt('ip', p.host_ip);
+
+    const host_uuid = this.getHostUUID(this.hostUUIDFileName);
+    if (host_uuid) {
+        pk.putTagString('host_uuid', host_uuid);
+    }
+
+    const csp = this.getCsp();
+    if (csp) {
+        pk.putTagString('csp', csp)
+    }
+
+    pk.putTagFloat(p.metering)
+
+    DataPackSender.sendTagCounterPack(pk);
+};
+
+MeteringInfo.prototype.hasHostUUID = function (fileName) {
+    try{
+        return fs.existsSync(fileName);
+    }catch (e) {
+        Logger.printError("WHATAP-081", "hasHostUUID error", e, false);
+        return false;
+    }
+};
+
+MeteringInfo.prototype.getHostUUID = function (fileName) {
+    const hostUUID = this.getHostUUIDValue();
+    if (hostUUID) {
+        return hostUUID;
+    }
+
+    const hasHostUUIDFile = this.hasHostUUID(fileName);
+    if (hasHostUUIDFile) {
+        try {
+            const data = fs.readFileSync(fileName);
+
+            if (data && data.length > 0) {
+                this.hostUUID = data.toString().trim();
+                return this.hostUUID;
+            } else {
+                Logger.print('WHATAP-082', 'cannot read /sys/class/dmi/id/product_uuid', false);
+            }
+        } catch (error) {
+            Logger.printError('WHATAP-083', 'error reading /sys/class/dmi/id/product_uuid ', error, false);
+        }
+    } else {
+        Logger.print('WHATAP-084', 'cannot find /sys/class/dmi/id/product_uuid', false);
+    }
+
+    return null;
+};
+
+MeteringInfo.prototype.getHostUUIDValue = function () {
+    return this.hostUUID;
+};
+
+MeteringInfo.prototype.getCsp = function () {
+
+    return null;
+};
+
+module.exports = MeteringInfo;

package/lib/observers/http-observer.js

@@ -513,6 +513,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         if(wtx.malloc < 0) { wtx.malloc = 0; }
         wtx.originUrl = ctx.originUrl;
 
+        wtx.cipher = HashUtil.hash(ParamSecurity.key);
         wtx.seq = ctx.txid;
         wtx.sqlCount = ctx.sql_count;
         wtx.sqlTime = ctx.sql_time;