@adalo/metrics 0.1.47 → 0.1.48

package/lib/metricsRedisClient.d.ts

@@ -14,6 +14,7 @@ export class RedisMetricsClient extends MetricsClient {
         redisClient: any;
         metricsConfig?: Object | undefined;
     });
+    _parentStartPush: (interval?: number | undefined, customPushMetics?: (() => void | Promise<void>) | undefined) => void;
     getConfiguredQueueNames: () => string[];
     startupValidation: () => boolean;
     /** Redis client used for queue & Redis metrics */

package/lib/metricsRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;OAIG;IACH;QAHwB,WAAW,EAAxB,GAAG;QACc,aAAa;OA+FxC;IAtCC,wCAAsD;IACtD,iCAA0C;IAE1C,kDAAkD;IAClD,iBAA8B;IAE9B,4DAA4D;IAC5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAEF,yCAAyC;IACzC,2DAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAiEzB;IAED;;;;OAIG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAkDzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAsCzB;IAED;;;OAGG;IAEH,sDASC;CAuBF"}
+{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;OAIG;IACH;QAHwB,WAAW,EAAxB,GAAG;QACc,aAAa;OAgGxC;IAxCC,uHAAmD;IAEnD,wCAAsD;IACtD,iCAA0C;IAE1C,kDAAkD;IAClD,iBAA8B;IAE9B,4DAA4D;IAC5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAEF,yCAAyC;IACzC,2DAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAiEzB;IAED;;;;OAIG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAkDzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAsCzB;IAED;;;OAGG;IAEH,sDASC;CAuBF"}

package/lib/metricsRedisClient.js

@@ -52,6 +52,7 @@ class RedisMetricsClient extends MetricsClient {
       intervalSec: METRICS_QUEUE_INTERVAL_SEC,
       startupValidation
     });
+    this._parentStartPush = super.startPush?.bind(this);
     this.getConfiguredQueueNames = getConfiguredQueueNames;
     this.startupValidation = startupValidation;
 
@@ -214,7 +215,7 @@ class RedisMetricsClient extends MetricsClient {
    */
 
   startPush = (intervalSec = this.intervalSec) => {
-    super.startPush(intervalSec, () => {
+    this._parentStartPush(intervalSec, () => {
       this.collectQueueMetrics().catch(err => {
         console.error(`[queue-metrics] Failed to collect queue & Redis metrics:`, err);
       });

package/lib/metricsRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.js","names":["Queue","require","MetricsClient","RedisMetricsClient","constructor","redisClient","metricsConfig","METRICS_QUEUE_INTERVAL_SEC","intervalSec","parseInt","process","env","getConfiguredQueueNames","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","scripDefaultMetrics","processType","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsGauge","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","collectRedisMetrics","getRedisInfo","section","Promise","resolve","reject","err","result","clientsInfo","memoryInfo","statsInfo","all","labels","getDefaultLabels","parseRedisInfo","infoStr","Object","fromEntries","line","startsWith","parts","clients","memory","stats","connected_clients","set","connection_type","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","warn","collectSingleQueueMetrics","queueName","has","redis","isWorker","getEvents","sendEvents","queue","get","health","checkHealth","queue_name","status","waiting","active","succeeded","failed","delayed","collectQueueMetrics","allSettled","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","catch","on","cleanup","close","quit","exit","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { MetricsClient } = require('.')\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options - Metrics client options + Redis client\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {Object} [options.metricsConfig] - MetricsClient configuration overrides\n   */\n  constructor({ redisClient, metricsConfig = {} } = {}) {\n    const METRICS_QUEUE_INTERVAL_SEC =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    const getConfiguredQueueNames = () => {\n      if (!process.env.METRICS_APP_REDIS_BQ) {\n        throw new Error(\n          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n        )\n      }\n\n      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n        .map(q => q.trim())\n        .filter(Boolean)\n\n      if (allQueues.length === 0) {\n        throw new Error(\n          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n            'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n        )\n      }\n\n      return [...new Set(allQueues)]\n    }\n\n    const startupValidation = () => {\n      try {\n        const queueNames = getConfiguredQueueNames()\n        console.info(\n          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n        )\n        return true\n      } catch (error) {\n        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n        console.error(\n          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n        console.error(\n          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n        )\n        console.error(`[queue-metrics] Skipping queue metrics collection`)\n        return false\n      }\n    }\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec: METRICS_QUEUE_INTERVAL_SEC,\n      startupValidation,\n    })\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\n\n    /** Redis client used for queue & Redis metrics */\n    this.redisClient = redisClient\n\n    /** Cache for queue objects to avoid multiple connections */\n    this.queueCache = new Map()\n\n    /** Gauge for queue jobs by status */\n    this.queueJobsGauge = this.createGauge({\n      name: 'app_queue_jobs_count',\n      help: 'Number of app jobs in the queue by status',\n      labelNames: this.withDefaultLabels(['queue_name', 'status']),\n    })\n\n    /** Gauge for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections_count',\n      help: 'Number of Redis client connections',\n      labelNames: this.withDefaultLabels(['connection_type']),\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  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const getRedisInfo = section =>\n        new Promise((resolve, reject) => {\n          this.redisClient.info(section, (err, result) => {\n            if (err) reject(err)\n            else resolve(result)\n          })\n        })\n\n      const [clientsInfo, memoryInfo, statsInfo] = await Promise.all([\n        getRedisInfo('clients'),\n        getRedisInfo('memory'),\n        getRedisInfo('stats'),\n      ])\n\n      const labels = this.getDefaultLabels()\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 clients = parseRedisInfo(clientsInfo)\n      const memory = parseRedisInfo(memoryInfo)\n      const stats = parseRedisInfo(statsInfo)\n\n      if (clients.connected_clients) {\n        this.redisConnectionsGauge.set(\n          { ...labels, connection_type: 'connected' },\n          parseInt(clients.connected_clients, 10) || 0\n        )\n      }\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        `[redis-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for a single Bee Queue and set gauges\n   * @param {string} queueName - Name of the queue\n   * @returns {Promise<void>}\n   */\n  collectSingleQueueMetrics = async queueName => {\n    try {\n      if (!this.queueCache.has(queueName)) {\n        this.queueCache.set(\n          queueName,\n          new Queue(queueName, {\n            redis: this.redisClient,\n            isWorker: false,\n            getEvents: false,\n            sendEvents: false,\n          })\n        )\n      }\n\n      const queue = this.queueCache.get(queueName)\n      const health = await queue.checkHealth()\n\n      const labels = {\n        ...this.getDefaultLabels(),\n        queue_name: queueName,\n      }\n\n      this.queueJobsGauge.set(\n        { ...labels, status: 'waiting' },\n        health.waiting || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'active' },\n        health.active || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'succeeded' },\n        health.succeeded || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'failed' },\n        health.failed || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'delayed' },\n        health.delayed || 0\n      )\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all queues and Redis, then push to Pushgateway\n   * @returns {Promise<void>}\n   */\n  collectQueueMetrics = async () => {\n    try {\n      const queueNames = this.getConfiguredQueueNames()\n\n      await this.collectRedisMetrics()\n      await Promise.allSettled(\n        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n      )\n\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 ${queueNames.length} queues:`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      if (\n        error.message?.includes('No queues configured') ||\n        error.message?.includes('METRICS_APP_REDIS_BQ')\n      ) {\n        console.error(\n          `[queue-metrics] ❌ Configuration error: ${error.message}`\n        )\n        console.error(\n          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n      } else {\n        console.error(\n          `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n        )\n      }\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n\n  startPush = (intervalSec = this.intervalSec) => {\n    super.startPush(intervalSec, () => {\n      this.collectQueueMetrics().catch(err => {\n        console.error(\n          `[queue-metrics] Failed to collect queue & Redis metrics:`,\n          err\n        )\n      })\n    })\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  /**\n   * Cleanup queues and Redis client\n   */\n  cleanup = async () => {\n    for (const [queueName, queue] of this.queueCache) {\n      try {\n        await queue.close()\n      } catch (err) {\n        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n      }\n    }\n\n    // Close Redis connection\n    this.redisClient?.quit()\n    process.exit(0)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsRedisClient.js","names":["Queue","require","MetricsClient","RedisMetricsClient","constructor","redisClient","metricsConfig","METRICS_QUEUE_INTERVAL_SEC","intervalSec","parseInt","process","env","getConfiguredQueueNames","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","scripDefaultMetrics","processType","_parentStartPush","startPush","bind","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsGauge","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","collectRedisMetrics","getRedisInfo","section","Promise","resolve","reject","err","result","clientsInfo","memoryInfo","statsInfo","all","labels","getDefaultLabels","parseRedisInfo","infoStr","Object","fromEntries","line","startsWith","parts","clients","memory","stats","connected_clients","set","connection_type","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","warn","collectSingleQueueMetrics","queueName","has","redis","isWorker","getEvents","sendEvents","queue","get","health","checkHealth","queue_name","status","waiting","active","succeeded","failed","delayed","collectQueueMetrics","allSettled","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","catch","on","cleanup","close","quit","exit","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { MetricsClient } = require('.')\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options - Metrics client options + Redis client\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {Object} [options.metricsConfig] - MetricsClient configuration overrides\n   */\n  constructor({ redisClient, metricsConfig = {} } = {}) {\n    const METRICS_QUEUE_INTERVAL_SEC =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    const getConfiguredQueueNames = () => {\n      if (!process.env.METRICS_APP_REDIS_BQ) {\n        throw new Error(\n          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n        )\n      }\n\n      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n        .map(q => q.trim())\n        .filter(Boolean)\n\n      if (allQueues.length === 0) {\n        throw new Error(\n          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n            'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n        )\n      }\n\n      return [...new Set(allQueues)]\n    }\n\n    const startupValidation = () => {\n      try {\n        const queueNames = getConfiguredQueueNames()\n        console.info(\n          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n        )\n        return true\n      } catch (error) {\n        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n        console.error(\n          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n        console.error(\n          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n        )\n        console.error(`[queue-metrics] Skipping queue metrics collection`)\n        return false\n      }\n    }\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec: METRICS_QUEUE_INTERVAL_SEC,\n      startupValidation,\n    })\n    this._parentStartPush = super.startPush?.bind(this)\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\n\n    /** Redis client used for queue & Redis metrics */\n    this.redisClient = redisClient\n\n    /** Cache for queue objects to avoid multiple connections */\n    this.queueCache = new Map()\n\n    /** Gauge for queue jobs by status */\n    this.queueJobsGauge = this.createGauge({\n      name: 'app_queue_jobs_count',\n      help: 'Number of app jobs in the queue by status',\n      labelNames: this.withDefaultLabels(['queue_name', 'status']),\n    })\n\n    /** Gauge for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections_count',\n      help: 'Number of Redis client connections',\n      labelNames: this.withDefaultLabels(['connection_type']),\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  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const getRedisInfo = section =>\n        new Promise((resolve, reject) => {\n          this.redisClient.info(section, (err, result) => {\n            if (err) reject(err)\n            else resolve(result)\n          })\n        })\n\n      const [clientsInfo, memoryInfo, statsInfo] = await Promise.all([\n        getRedisInfo('clients'),\n        getRedisInfo('memory'),\n        getRedisInfo('stats'),\n      ])\n\n      const labels = this.getDefaultLabels()\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 clients = parseRedisInfo(clientsInfo)\n      const memory = parseRedisInfo(memoryInfo)\n      const stats = parseRedisInfo(statsInfo)\n\n      if (clients.connected_clients) {\n        this.redisConnectionsGauge.set(\n          { ...labels, connection_type: 'connected' },\n          parseInt(clients.connected_clients, 10) || 0\n        )\n      }\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        `[redis-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for a single Bee Queue and set gauges\n   * @param {string} queueName - Name of the queue\n   * @returns {Promise<void>}\n   */\n  collectSingleQueueMetrics = async queueName => {\n    try {\n      if (!this.queueCache.has(queueName)) {\n        this.queueCache.set(\n          queueName,\n          new Queue(queueName, {\n            redis: this.redisClient,\n            isWorker: false,\n            getEvents: false,\n            sendEvents: false,\n          })\n        )\n      }\n\n      const queue = this.queueCache.get(queueName)\n      const health = await queue.checkHealth()\n\n      const labels = {\n        ...this.getDefaultLabels(),\n        queue_name: queueName,\n      }\n\n      this.queueJobsGauge.set(\n        { ...labels, status: 'waiting' },\n        health.waiting || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'active' },\n        health.active || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'succeeded' },\n        health.succeeded || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'failed' },\n        health.failed || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'delayed' },\n        health.delayed || 0\n      )\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all queues and Redis, then push to Pushgateway\n   * @returns {Promise<void>}\n   */\n  collectQueueMetrics = async () => {\n    try {\n      const queueNames = this.getConfiguredQueueNames()\n\n      await this.collectRedisMetrics()\n      await Promise.allSettled(\n        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n      )\n\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 ${queueNames.length} queues:`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      if (\n        error.message?.includes('No queues configured') ||\n        error.message?.includes('METRICS_APP_REDIS_BQ')\n      ) {\n        console.error(\n          `[queue-metrics] ❌ Configuration error: ${error.message}`\n        )\n        console.error(\n          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n      } else {\n        console.error(\n          `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n        )\n      }\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n\n  startPush = (intervalSec = this.intervalSec) => {\n    this._parentStartPush(intervalSec, () => {\n      this.collectQueueMetrics().catch(err => {\n        console.error(\n          `[queue-metrics] Failed to collect queue & Redis metrics:`,\n          err\n        )\n      })\n    })\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  /**\n   * Cleanup queues and Redis client\n   */\n  cleanup = async () => {\n    for (const [queueName, queue] of this.queueCache) {\n      try {\n        await queue.close()\n      } catch (err) {\n        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n      }\n    }\n\n    // Close Redis connection\n    this.redisClient?.quit()\n    process.exit(0)\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.47",
+  "version": "0.1.48",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/metricsRedisClient.js

@@ -67,6 +67,7 @@ class RedisMetricsClient extends MetricsClient {
       intervalSec: METRICS_QUEUE_INTERVAL_SEC,
       startupValidation,
     })
+    this._parentStartPush = super.startPush?.bind(this)
 
     this.getConfiguredQueueNames = getConfiguredQueueNames
     this.startupValidation = startupValidation
@@ -280,7 +281,7 @@ class RedisMetricsClient extends MetricsClient {
    */
 
   startPush = (intervalSec = this.intervalSec) => {
-    super.startPush(intervalSec, () => {
+    this._parentStartPush(intervalSec, () => {
       this.collectQueueMetrics().catch(err => {
         console.error(
           `[queue-metrics] Failed to collect queue & Redis metrics:`,