@adalo/metrics 0.1.72 → 0.1.74

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export * from './metricsClient';
 export * from './metricsRedisClient';
 export * from './metricsQueueRedisClient';
+export * from './metricsDatabaseClient';
 export * from './redisUtils';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,yBAAyB,CAAA;AACvC,cAAc,cAAc,CAAA"}

package/lib/index.js

@@ -36,6 +36,17 @@ Object.keys(_metricsQueueRedisClient).forEach(function (key) {
     }
   });
 });
+var _metricsDatabaseClient = require("./metricsDatabaseClient");
+Object.keys(_metricsDatabaseClient).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _metricsDatabaseClient[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _metricsDatabaseClient[key];
+    }
+  });
+});
 var _redisUtils = require("./redisUtils");
 Object.keys(_redisUtils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_metricsClient","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_metricsRedisClient","_metricsQueueRedisClient","_redisUtils"],"sources":["../src/index.ts"],"sourcesContent":["export * from './metricsClient'\nexport * from './metricsRedisClient'\nexport * from './metricsQueueRedisClient'\nexport * from './redisUtils'\n"],"mappings":";;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,cAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,cAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,cAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,mBAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,mBAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,mBAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,mBAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,wBAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,wBAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,wBAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,wBAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,WAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,WAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,WAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,WAAA,CAAAP,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"file":"index.js","names":["_metricsClient","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_metricsRedisClient","_metricsQueueRedisClient","_metricsDatabaseClient","_redisUtils"],"sources":["../src/index.ts"],"sourcesContent":["export * from './metricsClient'\nexport * from './metricsRedisClient'\nexport * from './metricsQueueRedisClient'\nexport * from './metricsDatabaseClient'\nexport * from './redisUtils'\n"],"mappings":";;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,cAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,cAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,cAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,mBAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,mBAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,mBAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,mBAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,wBAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,wBAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,wBAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,wBAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,sBAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,sBAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,sBAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,sBAAA,CAAAP,GAAA;IAAA;EAAA;AAAA;AACA,IAAAQ,WAAA,GAAAZ,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAU,WAAA,EAAAT,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAQ,WAAA,CAAAR,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAI,WAAA,CAAAR,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}

package/lib/metricsDatabaseClient.d.ts

@@ -0,0 +1,68 @@
+/**
+ * DatabaseMetricsClient collects Postgres connection metrics
+ * and pushes them to Prometheus Pushgateway.
+ *
+ * @extends MetricsClient
+ */
+export class DatabaseMetricsClient extends MetricsClient {
+    /**
+     * @param {Object} options
+     * @param {string} options.databaseUrl - Required main database URL
+     * @param {string[]} [options.additional_database_urls] - Optional additional DB URLs
+     * @param {string} [options.appName] - Application name (from MetricsClient)
+     * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
+     * @param {string} [options.processType] - Process type (from MetricsClient)
+     * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
+     * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
+     * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
+     * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
+     * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics
+     * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service
+     * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation
+     * @param {function} [options.startupValidation] - Function to validate startup
+     */
+    constructor({ databaseUrl, additional_database_urls, ...metricsConfig }?: {
+        databaseUrl: string;
+        additional_database_urls?: string[] | undefined;
+        appName?: string | undefined;
+        dynoId?: string | undefined;
+        processType?: string | undefined;
+        enabled?: boolean | undefined;
+        logValues?: boolean | undefined;
+        pushgatewayUrl?: string | undefined;
+        pushgatewaySecret?: string | undefined;
+        intervalSec?: number | undefined;
+        removeOldMetrics?: boolean | undefined;
+        scripDefaultMetrics?: boolean | undefined;
+        startupValidation?: Function | undefined;
+    });
+    databasePools: any[];
+    /** Gauge for Database connections */
+    databaseConnectionsGauge: import("prom-client").Gauge<string>;
+    /**
+     * @param {Pool} pool - PG connection pool
+     * @returns {Promise<{ current: number, max: number, dbName: string }>}
+     */
+    getDBConnectionsAndName: (pool: Pool) => Promise<{
+        current: number;
+        max: number;
+        dbName: string;
+    }>;
+    /**
+     * Collect database connection metrics for all configured pools
+     * @returns {Promise<void>}
+     */
+    collectDatabaseMetrics: () => Promise<void>;
+    /**
+     * Push database metrics to Prometheus Pushgateway
+     * @returns {Promise<void>}
+     */
+    pushDatabaseMetrics: () => Promise<void>;
+    /**
+     * Start periodic collection.
+     * @param {number} [intervalSec=this.intervalSec] - Interval in seconds
+     */
+    startPush: (intervalSec?: number | undefined) => void;
+}
+import { MetricsClient } from "./metricsClient";
+//# sourceMappingURL=metricsDatabaseClient.d.ts.map

package/lib/metricsDatabaseClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../src/metricsDatabaseClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;OAeG;IACH;QAd2B,WAAW,EAA3B,MAAM;QACa,wBAAwB;QAC1B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OA0E9C;IAlBC,qBAAuB;IAUvB,qCAAqC;IACrC,8DAIE;IAKJ;;;OAGG;IACH,yCAFa,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAoBrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}

package/lib/metricsDatabaseClient.js

@@ -0,0 +1,201 @@
+"use strict";
+
+const {
+  Pool
+} = require('pg');
+const {
+  MetricsClient
+} = require('.');
+
+/**
+ * DatabaseMetricsClient collects Postgres connection metrics
+ * and pushes them to Prometheus Pushgateway.
+ *
+ * @extends MetricsClient
+ */
+class DatabaseMetricsClient extends MetricsClient {
+  /**
+   * @param {Object} options
+   * @param {string} options.databaseUrl - Required main database URL
+   * @param {string[]} [options.additional_database_urls] - Optional additional DB URLs
+   * @param {string} [options.appName] - Application name (from MetricsClient)
+   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
+   * @param {string} [options.processType] - Process type (from MetricsClient)
+   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
+   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
+   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
+   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
+   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service
+   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation
+   * @param {function} [options.startupValidation] - Function to validate startup
+   */
+  constructor({
+    databaseUrl,
+    additional_database_urls = [],
+    ...metricsConfig
+  } = {}) {
+    const intervalSec = metricsConfig.intervalSec || parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) || 60;
+    const startupValidation = async () => {
+      if (!databaseUrl) {
+        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`);
+        return false;
+      }
+      try {
+        const mainPool = new Pool({
+          connectionString: databaseUrl
+        });
+        await mainPool.query('SELECT 1');
+        await mainPool.end();
+        console.info(`[database-metrics] ✓ Main database OK`);
+      } catch (err) {
+        console.error(`[database-metrics] ❌ Cannot connect to main database: ${err.message}`);
+        return false;
+      }
+      for (const url of additional_database_urls) {
+        try {
+          const p = new Pool({
+            connectionString: url
+          });
+          await p.query('SELECT 1');
+          await p.end();
+          console.info(`[database-metrics] ✓ Additional database OK: ${url}`);
+        } catch (err) {
+          console.error(`[database-metrics] ⚠ Skipping additional database: ${url}`);
+          console.error(`[database-metrics]    ${err.message}`);
+        }
+      }
+      console.info(`[database-metrics] Database metrics collection starting`);
+      return true;
+    };
+    super({
+      ...metricsConfig,
+      scripDefaultMetrics: true,
+      processType: metricsConfig.processType || 'database-metrics',
+      intervalSec,
+      startupValidation
+    });
+    this.databasePools = [];
+    if (databaseUrl) {
+      this.databasePools.push(new Pool({
+        connectionString: databaseUrl
+      }));
+    }
+    for (const url of additional_database_urls) {
+      this.databasePools.push(new Pool({
+        connectionString: url
+      }));
+    }
+
+    /** Gauge for Database connections */
+    this.databaseConnectionsGauge = this.createGauge({
+      name: 'app_database_connections',
+      help: 'Postgres database connections',
+      labelNames: this.withDefaultLabels(['max_connections', 'database_name'])
+    });
+    this._setCleanupHandlers();
+  }
+
+  /**
+   * @param {Pool} pool - PG connection pool
+   * @returns {Promise<{ current: number, max: number, dbName: string }>}
+   */
+  getDBConnectionsAndName = async pool => {
+    try {
+      const currentRes = await pool.query('SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()');
+      const current = parseInt(currentRes.rows[0]?.current || 0, 10);
+      const maxRes = await pool.query("SELECT current_setting('max_connections') AS max");
+      const max = parseInt(maxRes.rows[0]?.max || 0, 10);
+      const dbName = pool.options?.database || pool.options?.connectionString;
+      return {
+        current,
+        max,
+        dbName
+      };
+    } catch (err) {
+      return {
+        current: 0,
+        max: 0,
+        dbName: pool.options?.database || ''
+      };
+    }
+  };
+
+  /**
+   * Collect database connection metrics for all configured pools
+   * @returns {Promise<void>}
+   */
+  collectDatabaseMetrics = async () => {
+    for (const pool of this.databasePools) {
+      try {
+        const {
+          current,
+          max,
+          dbName
+        } = await this.getDBConnectionsAndName(pool);
+        this.databaseConnectionsGauge.set({
+          ...this.getDefaultLabels(),
+          database_name: dbName,
+          max_connections: String(max)
+        }, current);
+      } catch (err) {
+        console.warn(`[database-metrics] Failed to collect: ${err.message}`);
+      }
+    }
+  };
+
+  /**
+   * Push database metrics to Prometheus Pushgateway
+   * @returns {Promise<void>}
+   */
+  pushDatabaseMetrics = async () => {
+    try {
+      await this.collectDatabaseMetrics();
+      await this.gatewayPush();
+      if (this.metricsLogValues) {
+        const metricObjects = await this.registry.getMetricsAsJSON();
+        console.info(`[database-metrics] Collected DB metrics`, JSON.stringify(metricObjects, null, 2));
+      }
+    } catch (error) {
+      console.error(`[database-metrics] Failed to collect DB metrics: ${error.message}`);
+      throw error;
+    }
+  };
+
+  /**
+   * Start periodic collection.
+   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds
+   */
+  startPush = (intervalSec = this.intervalSec) => {
+    this._startPush(intervalSec, () => {
+      this.pushDatabaseMetrics().catch(err => {
+        console.error(`[database-metrics] Failed to push DB metrics:`, err);
+      });
+    });
+  };
+
+  /**
+   * Cleanup database pools and exit process
+   * @returns {Promise<void>}
+   */
+  cleanup = async () => {
+    try {
+      if (this.databasePools) {
+        for (const pool of this.databasePools) {
+          await pool.end();
+        }
+      }
+    } catch (err) {
+      console.error('[database-metrics] Error during cleanup:', err);
+    }
+    process.exit(0);
+  };
+  _setCleanupHandlers = () => {
+    process.on('SIGINT', this.cleanup);
+    process.on('SIGTERM', this.cleanup);
+  };
+}
+module.exports = {
+  DatabaseMetricsClient
+};
+//# sourceMappingURL=metricsDatabaseClient.js.map

package/lib/metricsDatabaseClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","MetricsClient","DatabaseMetricsClient","constructor","databaseUrl","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","url","p","scripDefaultMetrics","processType","databasePools","push","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","getDBConnectionsAndName","pool","currentRes","current","rows","maxRes","max","dbName","options","database","collectDatabaseMetrics","set","getDefaultLabels","database_name","max_connections","String","warn","pushDatabaseMetrics","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../src/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { MetricsClient } = require('.')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass DatabaseMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string[]} [options.additional_database_urls] - Optional additional DB URLs\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation\n   * @param {function} [options.startupValidation] - Function to validate startup\n   */\n  constructor({\n    databaseUrl,\n    additional_database_urls = [],\n    ...metricsConfig\n  } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const url of additional_database_urls) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${url}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${url}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this.databasePools.push(new Pool({ connectionString: databaseUrl }))\n    }\n\n    for (const url of additional_database_urls) {\n      this.databasePools.push(new Pool({ connectionString: url }))\n    }\n\n    /** Gauge for Database connections */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabels(['max_connections', 'database_name']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      const dbName = pool.options?.database || pool.options?.connectionString\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.getDefaultLabels(),\n            database_name: dbName,\n            max_connections: String(max),\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB metrics: ${error.message}`\n      )\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\n\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metricsRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAyC9C;IA1BC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,yCAAyC;IACzC,2DAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ,wCAwBC;IAED,6CAuBC;IAED,gDAeC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAoEzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
+{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAyC9C;IA1BC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,yCAAyC;IACzC,2DAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ,wCAwBC;IAED,6CAuBC;IAED,gDAeC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAgEzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}

package/lib/metricsRedisClient.js

@@ -10,7 +10,7 @@ const {
   REDIS_V3
 } = require('./redisUtils');
 const redisConnectionStableFields = ['id', 'name', 'flags', 'metric'];
-const redisConnectionFields = ['id', 'name', 'age', 'idle', 'flags', 'tot-mem'];
+const redisConnectionFields = ['id', 'name', 'age', 'flags', 'tot-mem'];
 
 /**
  * RedisMetricsClient extends MetricsClient to collect
@@ -75,7 +75,7 @@ class RedisMetricsClient extends MetricsClient {
   getRedisConnections = async () => {
     if (!this.redisClient) throw new Error('Redis client not provided');
 
-    // node-redis v3 – MUST use callback to get the actual result
+    // node-redis v3 (uses callback)
     if (this.redisClientType === REDIS_V3) {
       return new Promise((resolve, reject) => {
         this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {
@@ -146,26 +146,21 @@ class RedisMetricsClient extends MetricsClient {
           id,
           name,
           age,
-          idle,
           flags,
           'tot-mem': totMem
         } = connection;
         const labelsForConnections = {
-          labels,
+          ...labels,
           id,
           name,
           flags
         };
         this.redisConnectionsGauge.set({
-          labelsForConnections,
+          ...labelsForConnections,
           metric: 'age'
         }, parseInt(age, 10));
         this.redisConnectionsGauge.set({
-          labelsForConnections,
-          metric: 'idle'
-        }, parseInt(idle, 10));
-        this.redisConnectionsGauge.set({
-          labelsForConnections,
+          ...labelsForConnections,
           metric: 'tot-mem'
         }, parseInt(totMem, 10));
       });

package/lib/metricsRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","client","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","connection","id","age","idle","flags","totMem","labelsForConnections","set","metric","parseRedisInfo","infoStr","Object","fromEntries","startsWith","length","memory","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","console","warn","pushRedisMetrics","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('./redisUtils')\n\nconst redisConnectionStableFields = ['id', 'name', 'flags', 'metric']\nconst redisConnectionFields = ['id', 'name', 'age', 'idle', 'flags', 'tot-mem']\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\n    this.redisClientType = getRedisClientType(redisClient)\n\n    /** Gauge for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    /** Gauge for Redis memory usage */\n    this.redisMemoryGauge = this.createGauge({\n      name: 'app_redis_memory_bytes',\n      help: 'Redis memory usage in bytes',\n      labelNames: this.withDefaultLabels(['memory_type']),\n    })\n\n    /** Gauge for Redis operation stats */\n    this.redisStatsGauge = this.createGauge({\n      name: 'app_redis_stats_total',\n      help: 'Redis operation statistics',\n      labelNames: this.withDefaultLabels(['operation']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  getRedisConnections = async () => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 – MUST use callback to get the actual result\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n          if (err) {\n            reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n          } else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis – Promise API\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  getRedisInfo = async section => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.info(section, (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis (info returns Promise)\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.info(section)\n      } catch (err) {\n        throw new Error(`Failed to get Redis INFO: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  parseRedisConnections = clientsStr => {\n    return clientsStr\n      .split('\\n')\n      .filter(line => line.trim() !== '')\n      .map(line => {\n        const parts = line.split(' ')\n        const client = {}\n        parts.forEach(p => {\n          const [k, v] = p.split('=')\n          if (redisConnectionFields.includes(k)) {\n            client[k] = v\n          }\n        })\n        return client\n      })\n  }\n\n  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n        await Promise.all([\n          this.getRedisInfo('memory'),\n          this.getRedisInfo('stats'),\n          this.getRedisConnections(),\n        ])\n\n      const labels = this.getDefaultLabels()\n\n      const connections = this.parseRedisConnections(connectionsInfoStr)\n      connections.forEach(connection => {\n        const { id, name, age, idle, flags, 'tot-mem': totMem } = connection\n        const labelsForConnections = { labels, id, name, flags }\n        this.redisConnectionsGauge.set(\n          { labelsForConnections, metric: 'age' },\n          parseInt(age, 10)\n        )\n        this.redisConnectionsGauge.set(\n          { labelsForConnections, metric: 'idle' },\n          parseInt(idle, 10)\n        )\n        this.redisConnectionsGauge.set(\n          { labelsForConnections, metric: 'tot-mem' },\n          parseInt(totMem, 10)\n        )\n      })\n\n      const parseRedisInfo = infoStr =>\n        Object.fromEntries(\n          infoStr\n            .split('\\r\\n')\n            .filter(line => line && !line.startsWith('#'))\n            .map(line => line.split(':', 2))\n            .filter(parts => parts.length === 2 && parts[0] && parts[1])\n        )\n\n      const memory = parseRedisInfo(memoryInfoStr)\n      const stats = parseRedisInfo(statsInfoStr)\n\n      if (memory.used_memory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'used' },\n          parseInt(memory.used_memory, 10) || 0\n        )\n      }\n      if (memory.maxmemory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'max' },\n          parseInt(memory.maxmemory, 10) || 0\n        )\n      }\n\n      if (stats.instantaneous_ops_per_sec) {\n        this.redisStatsGauge.set(\n          { ...labels, operation: 'ops_per_sec' },\n          parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n        )\n      }\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all Redis and push to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushRedisMetrics = async () => {\n    try {\n      await this.collectRedisMetrics()\n      await this.gatewayPush()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n      )\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.pushRedisMetrics().catch(err => {\n        console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (!this.redisClient) return\n\n      if (\n        this.redisClientType === REDIS_V3 ||\n        this.redisClientType === REDIS_V4\n      ) {\n        await this.redisClient.quit()\n      } else if (this.redisClientType === IOREDIS) {\n        await this.redisClient.disconnect()\n      }\n    } catch (err) {\n      console.error('[queue-metrics] Error closing Redis client:', err)\n    }\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","client","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","connection","id","age","flags","totMem","labelsForConnections","set","metric","parseRedisInfo","infoStr","Object","fromEntries","startsWith","length","memory","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","console","warn","pushRedisMetrics","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('./redisUtils')\n\nconst redisConnectionStableFields = ['id', 'name', 'flags', 'metric']\nconst redisConnectionFields = ['id', 'name', 'age', 'flags', 'tot-mem']\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\n    this.redisClientType = getRedisClientType(redisClient)\n\n    /** Gauge for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    /** Gauge for Redis memory usage */\n    this.redisMemoryGauge = this.createGauge({\n      name: 'app_redis_memory_bytes',\n      help: 'Redis memory usage in bytes',\n      labelNames: this.withDefaultLabels(['memory_type']),\n    })\n\n    /** Gauge for Redis operation stats */\n    this.redisStatsGauge = this.createGauge({\n      name: 'app_redis_stats_total',\n      help: 'Redis operation statistics',\n      labelNames: this.withDefaultLabels(['operation']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  getRedisConnections = async () => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n          if (err) {\n            reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n          } else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis – Promise API\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  getRedisInfo = async section => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.info(section, (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis (info returns Promise)\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.info(section)\n      } catch (err) {\n        throw new Error(`Failed to get Redis INFO: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  parseRedisConnections = clientsStr => {\n    return clientsStr\n      .split('\\n')\n      .filter(line => line.trim() !== '')\n      .map(line => {\n        const parts = line.split(' ')\n        const client = {}\n        parts.forEach(p => {\n          const [k, v] = p.split('=')\n          if (redisConnectionFields.includes(k)) {\n            client[k] = v\n          }\n        })\n        return client\n      })\n  }\n\n  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n        await Promise.all([\n          this.getRedisInfo('memory'),\n          this.getRedisInfo('stats'),\n          this.getRedisConnections(),\n        ])\n\n      const labels = this.getDefaultLabels()\n\n      const connections = this.parseRedisConnections(connectionsInfoStr)\n      connections.forEach(connection => {\n        const { id, name, age, flags, 'tot-mem': totMem } = connection\n        const labelsForConnections = { ...labels, id, name, flags }\n        this.redisConnectionsGauge.set(\n          { ...labelsForConnections, metric: 'age' },\n          parseInt(age, 10)\n        )\n        this.redisConnectionsGauge.set(\n          { ...labelsForConnections, metric: 'tot-mem' },\n          parseInt(totMem, 10)\n        )\n      })\n\n      const parseRedisInfo = infoStr =>\n        Object.fromEntries(\n          infoStr\n            .split('\\r\\n')\n            .filter(line => line && !line.startsWith('#'))\n            .map(line => line.split(':', 2))\n            .filter(parts => parts.length === 2 && parts[0] && parts[1])\n        )\n\n      const memory = parseRedisInfo(memoryInfoStr)\n      const stats = parseRedisInfo(statsInfoStr)\n\n      if (memory.used_memory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'used' },\n          parseInt(memory.used_memory, 10) || 0\n        )\n      }\n      if (memory.maxmemory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'max' },\n          parseInt(memory.maxmemory, 10) || 0\n        )\n      }\n\n      if (stats.instantaneous_ops_per_sec) {\n        this.redisStatsGauge.set(\n          { ...labels, operation: 'ops_per_sec' },\n          parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n        )\n      }\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all Redis and push to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushRedisMetrics = async () => {\n    try {\n      await this.collectRedisMetrics()\n      await this.gatewayPush()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n      )\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.pushRedisMetrics().catch(err => {\n        console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (!this.redisClient) return\n\n      if (\n        this.redisClientType === REDIS_V3 ||\n        this.redisClientType === REDIS_V4\n      ) {\n        await this.redisClient.quit()\n      } else if (this.redisClientType === IOREDIS) {\n        await this.redisClient.disconnect()\n      }\n    } catch (err) {\n      console.error('[queue-metrics] Error closing Redis client:', err)\n    }\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adalo/metrics",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,6 +25,7 @@
   "dependencies": {
     "bee-queue": "^1.2.2",
     "dotenv": "^8.2.0",
+    "pg": "^8.16.3",
     "prom-client": "^15.1.3"
   },
   "devDependencies": {

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './metricsClient'
 export * from './metricsRedisClient'
 export * from './metricsQueueRedisClient'
+export * from './metricsDatabaseClient'
 export * from './redisUtils'

package/src/metricsDatabaseClient.js

@@ -0,0 +1,210 @@
+const { Pool } = require('pg')
+const { MetricsClient } = require('.')
+
+/**
+ * DatabaseMetricsClient collects Postgres connection metrics
+ * and pushes them to Prometheus Pushgateway.
+ *
+ * @extends MetricsClient
+ */
+class DatabaseMetricsClient extends MetricsClient {
+  /**
+   * @param {Object} options
+   * @param {string} options.databaseUrl - Required main database URL
+   * @param {string[]} [options.additional_database_urls] - Optional additional DB URLs
+   * @param {string} [options.appName] - Application name (from MetricsClient)
+   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
+   * @param {string} [options.processType] - Process type (from MetricsClient)
+   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
+   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
+   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
+   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
+   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service
+   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation
+   * @param {function} [options.startupValidation] - Function to validate startup
+   */
+  constructor({
+    databaseUrl,
+    additional_database_urls = [],
+    ...metricsConfig
+  } = {}) {
+    const intervalSec =
+      metricsConfig.intervalSec ||
+      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||
+      60
+
+    const startupValidation = async () => {
+      if (!databaseUrl) {
+        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)
+        return false
+      }
+
+      try {
+        const mainPool = new Pool({ connectionString: databaseUrl })
+        await mainPool.query('SELECT 1')
+        await mainPool.end()
+        console.info(`[database-metrics] ✓ Main database OK`)
+      } catch (err) {
+        console.error(
+          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`
+        )
+        return false
+      }
+
+      for (const url of additional_database_urls) {
+        try {
+          const p = new Pool({ connectionString: url })
+          await p.query('SELECT 1')
+          await p.end()
+          console.info(`[database-metrics] ✓ Additional database OK: ${url}`)
+        } catch (err) {
+          console.error(
+            `[database-metrics] ⚠ Skipping additional database: ${url}`
+          )
+          console.error(`[database-metrics]    ${err.message}`)
+        }
+      }
+
+      console.info(`[database-metrics] Database metrics collection starting`)
+      return true
+    }
+
+    super({
+      ...metricsConfig,
+      scripDefaultMetrics: true,
+      processType: metricsConfig.processType || 'database-metrics',
+      intervalSec,
+      startupValidation,
+    })
+
+    this.databasePools = []
+
+    if (databaseUrl) {
+      this.databasePools.push(new Pool({ connectionString: databaseUrl }))
+    }
+
+    for (const url of additional_database_urls) {
+      this.databasePools.push(new Pool({ connectionString: url }))
+    }
+
+    /** Gauge for Database connections */
+    this.databaseConnectionsGauge = this.createGauge({
+      name: 'app_database_connections',
+      help: 'Postgres database connections',
+      labelNames: this.withDefaultLabels(['max_connections', 'database_name']),
+    })
+
+    this._setCleanupHandlers()
+  }
+
+  /**
+   * @param {Pool} pool - PG connection pool
+   * @returns {Promise<{ current: number, max: number, dbName: string }>}
+   */
+  getDBConnectionsAndName = async pool => {
+    try {
+      const currentRes = await pool.query(
+        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'
+      )
+      const current = parseInt(currentRes.rows[0]?.current || 0, 10)
+
+      const maxRes = await pool.query(
+        "SELECT current_setting('max_connections') AS max"
+      )
+      const max = parseInt(maxRes.rows[0]?.max || 0, 10)
+
+      const dbName = pool.options?.database || pool.options?.connectionString
+
+      return { current, max, dbName }
+    } catch (err) {
+      return { current: 0, max: 0, dbName: pool.options?.database || '' }
+    }
+  }
+
+  /**
+   * Collect database connection metrics for all configured pools
+   * @returns {Promise<void>}
+   */
+  collectDatabaseMetrics = async () => {
+    for (const pool of this.databasePools) {
+      try {
+        const { current, max, dbName } = await this.getDBConnectionsAndName(
+          pool
+        )
+
+        this.databaseConnectionsGauge.set(
+          {
+            ...this.getDefaultLabels(),
+            database_name: dbName,
+            max_connections: String(max),
+          },
+          current
+        )
+      } catch (err) {
+        console.warn(`[database-metrics] Failed to collect: ${err.message}`)
+      }
+    }
+  }
+
+  /**
+   * Push database metrics to Prometheus Pushgateway
+   * @returns {Promise<void>}
+   */
+  pushDatabaseMetrics = async () => {
+    try {
+      await this.collectDatabaseMetrics()
+      await this.gatewayPush()
+
+      if (this.metricsLogValues) {
+        const metricObjects = await this.registry.getMetricsAsJSON()
+        console.info(
+          `[database-metrics] Collected DB metrics`,
+          JSON.stringify(metricObjects, null, 2)
+        )
+      }
+    } catch (error) {
+      console.error(
+        `[database-metrics] Failed to collect DB metrics: ${error.message}`
+      )
+      throw error
+    }
+  }
+
+  /**
+   * Start periodic collection.
+   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds
+   */
+  startPush = (intervalSec = this.intervalSec) => {
+    this._startPush(intervalSec, () => {
+      this.pushDatabaseMetrics().catch(err => {
+        console.error(`[database-metrics] Failed to push DB metrics:`, err)
+      })
+    })
+  }
+
+  /**
+   * Cleanup database pools and exit process
+   * @returns {Promise<void>}
+   */
+  cleanup = async () => {
+    try {
+      if (this.databasePools) {
+        for (const pool of this.databasePools) {
+          await pool.end()
+        }
+      }
+    } catch (err) {
+      console.error('[database-metrics] Error during cleanup:', err)
+    }
+
+    process.exit(0)
+  }
+
+  _setCleanupHandlers = () => {
+    process.on('SIGINT', this.cleanup)
+    process.on('SIGTERM', this.cleanup)
+  }
+}
+
+module.exports = { DatabaseMetricsClient }

package/src/metricsRedisClient.js

@@ -7,7 +7,7 @@ const {
 } = require('./redisUtils')
 
 const redisConnectionStableFields = ['id', 'name', 'flags', 'metric']
-const redisConnectionFields = ['id', 'name', 'age', 'idle', 'flags', 'tot-mem']
+const redisConnectionFields = ['id', 'name', 'age', 'flags', 'tot-mem']
 
 /**
  * RedisMetricsClient extends MetricsClient to collect
@@ -75,7 +75,7 @@ class RedisMetricsClient extends MetricsClient {
   getRedisConnections = async () => {
     if (!this.redisClient) throw new Error('Redis client not provided')
 
-    // node-redis v3 – MUST use callback to get the actual result
+    // node-redis v3 (uses callback)
     if (this.redisClientType === REDIS_V3) {
       return new Promise((resolve, reject) => {
         this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {
@@ -157,18 +157,14 @@ class RedisMetricsClient extends MetricsClient {
 
       const connections = this.parseRedisConnections(connectionsInfoStr)
       connections.forEach(connection => {
-        const { id, name, age, idle, flags, 'tot-mem': totMem } = connection
-        const labelsForConnections = { labels, id, name, flags }
+        const { id, name, age, flags, 'tot-mem': totMem } = connection
+        const labelsForConnections = { ...labels, id, name, flags }
         this.redisConnectionsGauge.set(
-          { labelsForConnections, metric: 'age' },
+          { ...labelsForConnections, metric: 'age' },
           parseInt(age, 10)
         )
         this.redisConnectionsGauge.set(
-          { labelsForConnections, metric: 'idle' },
-          parseInt(idle, 10)
-        )
-        this.redisConnectionsGauge.set(
-          { labelsForConnections, metric: 'tot-mem' },
+          { ...labelsForConnections, metric: 'tot-mem' },
           parseInt(totMem, 10)
         )
       })