@adalo/metrics 0.1.94 → 0.1.96

package/lib/metricsRedisClient.d.ts

@@ -37,8 +37,6 @@ export class RedisMetricsClient extends MetricsClient {
     /** Redis client used for metrics */
     redisClient: any;
     redisClientType: string;
-    /** Gauge for Redis client connections */
-    redisConnectionsGauge: import("prom-client").Gauge<string>;
     /** Gauge for Redis memory usage */
     redisMemoryGauge: import("prom-client").Gauge<string>;
     /** Gauge for Redis operation stats */

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,wCAgCC;IAED,6CAuBC;IAED,gDAeC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CA4DzB;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;OA8C9C;IA/BC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IActD,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ,wCAgCC;IAED,6CAuBC;IAED,gDAeC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqEzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}

package/lib/metricsRedisClient.js

@@ -9,8 +9,8 @@ const {
   IOREDIS,
   REDIS_V3
 } = require('./redisUtils');
-const redisConnectionStableFields = ['id', 'name', 'flags', 'metric'];
-const redisConnectionFields = ['id', 'name', 'flags', 'tot-mem'];
+const redisConnectionStableFields = ['name', 'flags'];
+const redisConnectionFields = ['name', 'flags', 'tot-mem'];
 
 /**
  * RedisMetricsClient extends MetricsClient to collect
@@ -51,11 +51,16 @@ class RedisMetricsClient extends MetricsClient {
     this.redisClientType = getRedisClientType(redisClient);
 
     /** Gauge for Redis client connections */
-    this.redisConnectionsGauge = this.createGauge({
+    this.createCounter({
       name: 'app_redis_connections',
       help: 'Redis client connections',
       labelNames: this.withDefaultLabels(redisConnectionStableFields)
     });
+    this.createCounter({
+      name: 'app_redis_connections_memory_usage',
+      help: 'Redis client connections',
+      labelNames: this.withDefaultLabels(redisConnectionStableFields)
+    });
 
     /** Gauge for Redis memory usage */
     this.redisMemoryGauge = this.createGauge({
@@ -148,22 +153,23 @@ class RedisMetricsClient extends MetricsClient {
       const [memoryInfoStr, statsInfoStr, connectionsInfoStr] = await Promise.all([this.getRedisInfo('memory'), this.getRedisInfo('stats'), this.getRedisConnections()]);
       const labels = this.getDefaultLabels();
       const connections = this.parseRedisConnections(connectionsInfoStr);
+      if (this.logValues) {
+        console.log("Redis connections: ", connectionsInfoStr);
+        console.log("Redis connections count: ", connections.length);
+      }
       connections.forEach(connection => {
         const {
-          id,
           name,
           flags,
           'tot-mem': totMem
         } = connection;
-        const labelsForConnections = {
-          ...labels,
-          id,
+        this.countersFunctions?.app_redis_connections({
+          name,
+          flags
+        }, 1);
+        this.countersFunctions?.app_redis_connections_memory_usage({
           name,
           flags
-        };
-        this.redisConnectionsGauge.set({
-          ...labelsForConnections,
-          metric: 'tot-mem'
         }, parseInt(totMem, 10));
       });
       const parseRedisInfo = infoStr => Object.fromEntries(infoStr.split('\r\n').filter(line => line && !line.startsWith('#')).map(line => line.split(':', 2)).filter(parts => parts.length === 2 && parts[0] && parts[1]));

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","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","connection","id","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', '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\n    if (this.redisClientType === REDIS_V4) {\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    if (this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.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, flags, 'tot-mem': totMem } = connection\n        const labelsForConnections = { ...labels, id, name, flags }\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","createCounter","name","help","labelNames","withDefaultLabels","redisMemoryGauge","createGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","connection","flags","totMem","countersFunctions","app_redis_connections","app_redis_connections_memory_usage","parseRedisInfo","infoStr","Object","fromEntries","startsWith","memory","stats","used_memory","set","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","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 = ['name', 'flags']\nconst redisConnectionFields = ['name', '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.createCounter({\n      name: 'app_redis_connections',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n    this.createCounter({\n      name: 'app_redis_connections_memory_usage',\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\n    if (this.redisClientType === REDIS_V4) {\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    if (this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.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\n      if (this.logValues) {\n        console.log(\"Redis connections: \", connectionsInfoStr)\n        console.log(\"Redis connections count: \", connections.length)\n      }\n\n      connections.forEach(connection => {\n        const { name, flags, 'tot-mem': totMem } = connection\n        this.countersFunctions?.app_redis_connections(\n          { name, flags },\n          1\n        )\n        this.countersFunctions?.app_redis_connections_memory_usage(\n          { name, flags },\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.94",
+  "version": "0.1.96",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/metricsRedisClient.js

@@ -6,8 +6,8 @@ const {
   REDIS_V3,
 } = require('./redisUtils')
 
-const redisConnectionStableFields = ['id', 'name', 'flags', 'metric']
-const redisConnectionFields = ['id', 'name', 'flags', 'tot-mem']
+const redisConnectionStableFields = ['name', 'flags']
+const redisConnectionFields = ['name', 'flags', 'tot-mem']
 
 /**
  * RedisMetricsClient extends MetricsClient to collect
@@ -49,11 +49,16 @@ class RedisMetricsClient extends MetricsClient {
     this.redisClientType = getRedisClientType(redisClient)
 
     /** Gauge for Redis client connections */
-    this.redisConnectionsGauge = this.createGauge({
+    this.createCounter({
       name: 'app_redis_connections',
       help: 'Redis client connections',
       labelNames: this.withDefaultLabels(redisConnectionStableFields),
     })
+    this.createCounter({
+      name: 'app_redis_connections_memory_usage',
+      help: 'Redis client connections',
+      labelNames: this.withDefaultLabels(redisConnectionStableFields),
+    })
 
     /** Gauge for Redis memory usage */
     this.redisMemoryGauge = this.createGauge({
@@ -164,11 +169,20 @@ class RedisMetricsClient extends MetricsClient {
       const labels = this.getDefaultLabels()
 
       const connections = this.parseRedisConnections(connectionsInfoStr)
+
+      if (this.logValues) {
+        console.log("Redis connections: ", connectionsInfoStr)
+        console.log("Redis connections count: ", connections.length)
+      }
+
       connections.forEach(connection => {
-        const { id, name, flags, 'tot-mem': totMem } = connection
-        const labelsForConnections = { ...labels, id, name, flags }
-        this.redisConnectionsGauge.set(
-          { ...labelsForConnections, metric: 'tot-mem' },
+        const { name, flags, 'tot-mem': totMem } = connection
+        this.countersFunctions?.app_redis_connections(
+          { name, flags },
+          1
+        )
+        this.countersFunctions?.app_redis_connections_memory_usage(
+          { name, flags },
           parseInt(totMem, 10)
         )
       })