@adalo/metrics 0.1.56 → 0.1.57

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 export * from './metricsClient';
 export * from './metricsRedisClient';
+export * from './metricsQueueRedisClient';
 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,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,cAAc,CAAA"}

package/lib/index.js

@@ -25,6 +25,17 @@ Object.keys(_metricsRedisClient).forEach(function (key) {
     }
   });
 });
+var _metricsQueueRedisClient = require("./metricsQueueRedisClient");
+Object.keys(_metricsQueueRedisClient).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _metricsQueueRedisClient[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _metricsQueueRedisClient[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","_redisUtils"],"sources":["../src/index.ts"],"sourcesContent":["export * from './metricsClient'\nexport * from './metricsRedisClient'\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,WAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,WAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,WAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,WAAA,CAAAN,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"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":[]}

package/lib/metricsQueueRedisClient.d.ts

@@ -0,0 +1,27 @@
+/**
+ * QueueRedisMetricsClient extends MetricsClient to collect
+ * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
+ *
+ * @extends RedisMetricsClient
+ */
+export class QueueRedisMetricsClient extends RedisMetricsClient {
+    getConfiguredQueueNames: () => string[];
+    startupValidation: () => boolean;
+    /** Cache for queue objects to avoid multiple connections */
+    queueCache: Map<any, any>;
+    /** Gauge for queue jobs by status */
+    queueJobsGauge: import("prom-client").Gauge<string>;
+    /**
+     * Collect metrics for a single Bee Queue and set gauges
+     * @param {string} queueName - Name of the queue
+     * @returns {Promise<void>}
+     */
+    collectSingleQueueMetrics: (queueName: string) => Promise<void>;
+    /**
+     * Collect metrics for all queues and Redis, then push to Pushgateway
+     * @returns {Promise<void>}
+     */
+    collectQueueMetrics: () => Promise<void>;
+}
+import { RedisMetricsClient } from "./metricsRedisClient";
+//# sourceMappingURL=metricsQueueRedisClient.d.ts.map

package/lib/metricsQueueRedisClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAC5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;OAIG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAkDzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAsCzB;CAmCF"}

package/lib/metricsQueueRedisClient.js

@@ -0,0 +1,181 @@
+"use strict";
+
+const Queue = require('bee-queue');
+const {
+  RedisMetricsClient
+} = require('.');
+
+/**
+ * QueueRedisMetricsClient extends MetricsClient to collect
+ * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
+ *
+ * @extends RedisMetricsClient
+ */
+class QueueRedisMetricsClient extends RedisMetricsClient {
+  /**
+   * @param {Object} options
+   * @param {any} options.redisClient - Redis client instance (required)
+   * @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 (from MetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
+   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
+   */
+  constructor({
+    redisClient,
+    metricsConfig = {}
+  } = {}) {
+    const getConfiguredQueueNames = () => {
+      if (!process.env.METRICS_APP_REDIS_BQ) {
+        throw new Error('No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names');
+      }
+      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',').map(q => q.trim()).filter(Boolean);
+      if (allQueues.length === 0) {
+        throw new Error('METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' + 'Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"');
+      }
+      return [...new Set(allQueues)];
+    };
+    const startupValidation = () => {
+      try {
+        const queueNames = getConfiguredQueueNames();
+        console.info(`[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`);
+        return true;
+      } catch (error) {
+        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`);
+        console.error(`[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`);
+        console.error(`[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC="10"`);
+        console.error(`[queue-metrics] Skipping queue metrics collection`);
+        return false;
+      }
+    };
+    super({
+      ...metricsConfig,
+      redisClient,
+      startupValidation
+    });
+    this.getConfiguredQueueNames = getConfiguredQueueNames;
+    this.startupValidation = startupValidation;
+
+    /** Cache for queue objects to avoid multiple connections */
+    this.queueCache = new Map();
+
+    /** Gauge for queue jobs by status */
+    this.queueJobsGauge = this.createGauge({
+      name: 'app_queue_jobs_count',
+      help: 'Number of app jobs in the queue by status',
+      labelNames: this.withDefaultLabels(['queue_name', 'status'])
+    });
+    this._setCleanupHandlers();
+  }
+
+  /**
+   * Collect metrics for a single Bee Queue and set gauges
+   * @param {string} queueName - Name of the queue
+   * @returns {Promise<void>}
+   */
+  collectSingleQueueMetrics = async queueName => {
+    try {
+      if (!this.queueCache.has(queueName)) {
+        this.queueCache.set(queueName, new Queue(queueName, {
+          redis: this.redisClient,
+          isWorker: false,
+          getEvents: false,
+          sendEvents: false
+        }));
+      }
+      const queue = this.queueCache.get(queueName);
+      const health = await queue.checkHealth();
+      const labels = {
+        ...this.getDefaultLabels(),
+        queue_name: queueName
+      };
+      this.queueJobsGauge.set({
+        ...labels,
+        status: 'waiting'
+      }, health.waiting || 0);
+      this.queueJobsGauge.set({
+        ...labels,
+        status: 'active'
+      }, health.active || 0);
+      this.queueJobsGauge.set({
+        ...labels,
+        status: 'succeeded'
+      }, health.succeeded || 0);
+      this.queueJobsGauge.set({
+        ...labels,
+        status: 'failed'
+      }, health.failed || 0);
+      this.queueJobsGauge.set({
+        ...labels,
+        status: 'delayed'
+      }, health.delayed || 0);
+    } catch (error) {
+      console.warn(`[queue-metrics] Failed to collect metrics for queue ${queueName}:`, error.message);
+    }
+  };
+
+  /**
+   * Collect metrics for all queues and Redis, then push to Pushgateway
+   * @returns {Promise<void>}
+   */
+  collectQueueMetrics = async () => {
+    try {
+      const queueNames = this.getConfiguredQueueNames();
+      await this.collectRedisMetrics();
+      await Promise.allSettled(queueNames.map(queueName => this.collectSingleQueueMetrics(queueName)));
+      await this.gatewayPush();
+      if (this.metricsLogValues) {
+        const metricObjects = await this.registry.getMetricsAsJSON();
+        console.info(`[queue-metrics] Collected metrics for ${queueNames.length} queues:`, JSON.stringify(metricObjects, null, 2));
+      }
+    } catch (error) {
+      if (error.message?.includes('No queues configured') || error.message?.includes('METRICS_APP_REDIS_BQ')) {
+        console.error(`[queue-metrics] ❌ Configuration error: ${error.message}`);
+        console.error(`[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`);
+      } else {
+        console.error(`[queue-metrics] Failed to collect queue metrics: ${error.message}`);
+      }
+      throw error;
+    }
+  };
+
+  /**
+   * Start periodic collection.
+   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds
+   */
+  startPush = (intervalSec = this.intervalSec) => {
+    this._startPush(intervalSec, () => {
+      this.collectQueueMetrics().catch(err => {
+        console.error(`[queue-metrics] Failed to collect queue & Redis metrics:`, err);
+      });
+    });
+  };
+  _setCleanupHandlers = () => {
+    process.on('SIGINT', this.cleanup);
+    process.on('SIGTERM', this.cleanup);
+  };
+
+  /**
+   * Cleanup queues and Redis client
+   */
+  cleanup = async () => {
+    for (const [queueName, queue] of this.queueCache) {
+      try {
+        await queue.close();
+      } catch (err) {
+        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err);
+      }
+    }
+    process.exit(0);
+  };
+}
+module.exports = {
+  QueueRedisMetricsClient
+};
+//# sourceMappingURL=metricsQueueRedisClient.js.map

package/lib/metricsQueueRedisClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metricsQueueRedisClient.js","names":["Queue","require","RedisMetricsClient","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","collectSingleQueueMetrics","queueName","has","set","redis","isWorker","getEvents","sendEvents","queue","get","health","checkHealth","labels","getDefaultLabels","queue_name","status","waiting","active","succeeded","failed","delayed","warn","collectQueueMetrics","collectRedisMetrics","Promise","allSettled","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","err","on","cleanup","close","exit","module","exports"],"sources":["../src/metricsQueueRedisClient.js"],"sourcesContent":["const Queue = require('bee-queue')\nconst { RedisMetricsClient } = require('.')\n\n/**\n * QueueRedisMetricsClient extends MetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\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 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      redisClient,\n      startupValidation,\n    })\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\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    this._setCleanupHandlers()\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  startPush = (intervalSec = this.intervalSec) => {\n    this._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    process.exit(0)\n  }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metricsRedisClient.d.ts

@@ -1,27 +1,41 @@
 /**
  * RedisMetricsClient extends MetricsClient to collect
- * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
+ * Redis metrics periodically and push them to Prometheus Pushgateway.
  *
  * @extends MetricsClient
  */
 export class RedisMetricsClient extends MetricsClient {
     /**
-     * @param {Object} options - Metrics client options + Redis client
+     * @param {Object} options
      * @param {any} options.redisClient - Redis client instance (required)
-     * @param {Object} [options.metricsConfig] - MetricsClient configuration overrides
+     * @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 (from MetricsClient)
+     * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
+     * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
+     * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
      */
-    constructor({ redisClient, metricsConfig }?: {
+    constructor({ redisClient, ...metricsConfig }?: {
         redisClient: any;
-        metricsConfig?: Object | 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;
     });
-    getConfiguredQueueNames: () => string[];
-    startupValidation: () => boolean;
-    /** Redis client used for queue & Redis metrics */
+    /** Redis client used for metrics */
     redisClient: any;
-    /** Cache for queue objects to avoid multiple connections */
-    queueCache: Map<any, any>;
-    /** Gauge for queue jobs by status */
-    queueJobsGauge: import("prom-client").Gauge<string>;
     /** Gauge for Redis client connections */
     redisConnectionsGauge: import("prom-client").Gauge<string>;
     /** Gauge for Redis memory usage */
@@ -34,16 +48,10 @@ export class RedisMetricsClient extends MetricsClient {
      */
     collectRedisMetrics: () => Promise<void>;
     /**
-     * Collect metrics for a single Bee Queue and set gauges
-     * @param {string} queueName - Name of the queue
+     * Collect metrics for all Redis and push to Prometheus Pushgateway
      * @returns {Promise<void>}
      */
-    collectSingleQueueMetrics: (queueName: string) => Promise<void>;
-    /**
-     * Collect metrics for all queues and Redis, then push to Pushgateway
-     * @returns {Promise<void>}
-     */
-    collectQueueMetrics: () => Promise<void>;
+    pushRedisMetrics: () => Promise<void>;
     /**
      * Start periodic collection.
      * @param {number} [intervalSec=this.intervalSec] - Interval in seconds

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;IACH,sDASC;CAuBF"}
+{"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAEA;;;;;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;OAwC9C;IAzBC,oCAAoC;IACpC,iBAA8B;IAE9B,yCAAyC;IACzC,2DAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAiEzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CAkBF"}

package/lib/metricsRedisClient.js

@@ -1,73 +1,46 @@
 "use strict";
 
-const Queue = require('bee-queue');
 const {
   MetricsClient
 } = require('.');
 
 /**
  * RedisMetricsClient extends MetricsClient to collect
- * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
+ * Redis metrics periodically and push them to Prometheus Pushgateway.
  *
  * @extends MetricsClient
  */
 class RedisMetricsClient extends MetricsClient {
   /**
-   * @param {Object} options - Metrics client options + Redis client
+   * @param {Object} options
    * @param {any} options.redisClient - Redis client instance (required)
-   * @param {Object} [options.metricsConfig] - MetricsClient configuration overrides
+   * @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 (from MetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
+   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
    */
   constructor({
     redisClient,
-    metricsConfig = {}
+    ...metricsConfig
   } = {}) {
-    const METRICS_QUEUE_INTERVAL_SEC = metricsConfig.intervalSec || parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) || 5;
-    const getConfiguredQueueNames = () => {
-      if (!process.env.METRICS_APP_REDIS_BQ) {
-        throw new Error('No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names');
-      }
-      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',').map(q => q.trim()).filter(Boolean);
-      if (allQueues.length === 0) {
-        throw new Error('METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' + 'Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"');
-      }
-      return [...new Set(allQueues)];
-    };
-    const startupValidation = () => {
-      try {
-        const queueNames = getConfiguredQueueNames();
-        console.info(`[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`);
-        return true;
-      } catch (error) {
-        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`);
-        console.error(`[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`);
-        console.error(`[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC="10"`);
-        console.error(`[queue-metrics] Skipping queue metrics collection`);
-        return false;
-      }
-    };
+    const intervalSec = metricsConfig.intervalSec || parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) || 5;
     super({
       ...metricsConfig,
       scripDefaultMetrics: true,
-      processType: metricsConfig.processType || 'queue-metrics',
-      intervalSec: METRICS_QUEUE_INTERVAL_SEC,
-      startupValidation
+      processType: metricsConfig.processType || 'redis-metrics',
+      intervalSec
     });
-    this.getConfiguredQueueNames = getConfiguredQueueNames;
-    this.startupValidation = startupValidation;
 
-    /** Redis client used for queue & Redis metrics */
+    /** Redis client used for metrics */
     this.redisClient = redisClient;
 
-    /** Cache for queue objects to avoid multiple connections */
-    this.queueCache = new Map();
-
-    /** Gauge for queue jobs by status */
-    this.queueJobsGauge = this.createGauge({
-      name: 'app_queue_jobs_count',
-      help: 'Number of app jobs in the queue by status',
-      labelNames: this.withDefaultLabels(['queue_name', 'status'])
-    });
-
     /** Gauge for Redis client connections */
     this.redisConnectionsGauge = this.createGauge({
       name: 'app_redis_connections_count',
@@ -138,72 +111,19 @@ class RedisMetricsClient extends MetricsClient {
   };
 
   /**
-   * Collect metrics for a single Bee Queue and set gauges
-   * @param {string} queueName - Name of the queue
+   * Collect metrics for all Redis and push to Prometheus Pushgateway
    * @returns {Promise<void>}
    */
-  collectSingleQueueMetrics = async queueName => {
+  pushRedisMetrics = async () => {
     try {
-      if (!this.queueCache.has(queueName)) {
-        this.queueCache.set(queueName, new Queue(queueName, {
-          redis: this.redisClient,
-          isWorker: false,
-          getEvents: false,
-          sendEvents: false
-        }));
-      }
-      const queue = this.queueCache.get(queueName);
-      const health = await queue.checkHealth();
-      const labels = {
-        ...this.getDefaultLabels(),
-        queue_name: queueName
-      };
-      this.queueJobsGauge.set({
-        ...labels,
-        status: 'waiting'
-      }, health.waiting || 0);
-      this.queueJobsGauge.set({
-        ...labels,
-        status: 'active'
-      }, health.active || 0);
-      this.queueJobsGauge.set({
-        ...labels,
-        status: 'succeeded'
-      }, health.succeeded || 0);
-      this.queueJobsGauge.set({
-        ...labels,
-        status: 'failed'
-      }, health.failed || 0);
-      this.queueJobsGauge.set({
-        ...labels,
-        status: 'delayed'
-      }, health.delayed || 0);
-    } catch (error) {
-      console.warn(`[queue-metrics] Failed to collect metrics for queue ${queueName}:`, error.message);
-    }
-  };
-
-  /**
-   * Collect metrics for all queues and Redis, then push to Pushgateway
-   * @returns {Promise<void>}
-   */
-  collectQueueMetrics = async () => {
-    try {
-      const queueNames = this.getConfiguredQueueNames();
       await this.collectRedisMetrics();
-      await Promise.allSettled(queueNames.map(queueName => this.collectSingleQueueMetrics(queueName)));
       await this.gatewayPush();
       if (this.metricsLogValues) {
         const metricObjects = await this.registry.getMetricsAsJSON();
-        console.info(`[queue-metrics] Collected metrics for ${queueNames.length} queues:`, JSON.stringify(metricObjects, null, 2));
+        console.info(`[redis-metrics] Collected metrics for Redis`, JSON.stringify(metricObjects, null, 2));
       }
     } catch (error) {
-      if (error.message?.includes('No queues configured') || error.message?.includes('METRICS_APP_REDIS_BQ')) {
-        console.error(`[queue-metrics] ❌ Configuration error: ${error.message}`);
-        console.error(`[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`);
-      } else {
-        console.error(`[queue-metrics] Failed to collect queue metrics: ${error.message}`);
-      }
+      console.error(`[redis-metrics] Failed to collect Redis metrics: ${error.message}`);
       throw error;
     }
   };
@@ -214,32 +134,27 @@ class RedisMetricsClient extends MetricsClient {
    */
   startPush = (intervalSec = this.intervalSec) => {
     this._startPush(intervalSec, () => {
-      this.collectQueueMetrics().catch(err => {
-        console.error(`[queue-metrics] Failed to collect queue & Redis metrics:`, err);
+      this.pushRedisMetrics().catch(err => {
+        console.error(`[redis-metrics] Failed to push Redis metrics:`, err);
       });
     });
   };
-  _setCleanupHandlers = () => {
-    process.on('SIGINT', this.cleanup);
-    process.on('SIGTERM', this.cleanup);
-  };
 
   /**
-   * Cleanup queues and Redis client
+   * Cleanup Redis client
    */
   cleanup = async () => {
-    for (const [queueName, queue] of this.queueCache) {
-      try {
-        await queue.close();
-      } catch (err) {
-        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err);
-      }
+    try {
+      this.redisClient?.quit();
+    } catch (err) {
+      console.error('[redis-metrics] Error closing Redis client:', err);
     }
-
-    // Close Redis connection
-    this.redisClient?.quit();
     process.exit(0);
   };
+  _setCleanupHandlers = () => {
+    process.on('SIGINT', this.cleanup);
+    process.on('SIGTERM', this.cleanup);
+  };
 }
 module.exports = {
   RedisMetricsClient

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","_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  startPush = (intervalSec = this.intervalSec) => {\n    this._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":["MetricsClient","require","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","collectRedisMetrics","getRedisInfo","section","Promise","resolve","reject","info","err","result","clientsInfo","memoryInfo","statsInfo","all","labels","getDefaultLabels","parseRedisInfo","infoStr","Object","fromEntries","split","filter","line","startsWith","map","parts","length","clients","memory","stats","connected_clients","set","connection_type","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","console","warn","message","pushRedisMetrics","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","quit","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\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 || 'redis-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\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 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          `[redis-metrics] Collected metrics for Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[redis-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(`[redis-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client\n   */\n  cleanup = async () => {\n    try {\n      this.redisClient?.quit()\n    } catch (err) {\n      console.error('[redis-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.56",
+  "version": "0.1.57",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/index.ts

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

package/src/metricsQueueRedisClient.js

@@ -0,0 +1,222 @@
+const Queue = require('bee-queue')
+const { RedisMetricsClient } = require('.')
+
+/**
+ * QueueRedisMetricsClient extends MetricsClient to collect
+ * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
+ *
+ * @extends RedisMetricsClient
+ */
+class QueueRedisMetricsClient extends RedisMetricsClient {
+  /**
+   * @param {Object} options
+   * @param {any} options.redisClient - Redis client instance (required)
+   * @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 (from MetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
+   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
+   */
+  constructor({ redisClient, metricsConfig = {} } = {}) {
+    const getConfiguredQueueNames = () => {
+      if (!process.env.METRICS_APP_REDIS_BQ) {
+        throw new Error(
+          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'
+        )
+      }
+
+      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')
+        .map(q => q.trim())
+        .filter(Boolean)
+
+      if (allQueues.length === 0) {
+        throw new Error(
+          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +
+            'Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"'
+        )
+      }
+
+      return [...new Set(allQueues)]
+    }
+
+    const startupValidation = () => {
+      try {
+        const queueNames = getConfiguredQueueNames()
+        console.info(
+          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`
+        )
+        return true
+      } catch (error) {
+        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)
+        console.error(
+          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`
+        )
+        console.error(
+          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC="10"`
+        )
+        console.error(`[queue-metrics] Skipping queue metrics collection`)
+        return false
+      }
+    }
+
+    super({
+      ...metricsConfig,
+      redisClient,
+      startupValidation,
+    })
+
+    this.getConfiguredQueueNames = getConfiguredQueueNames
+    this.startupValidation = startupValidation
+
+    /** Cache for queue objects to avoid multiple connections */
+    this.queueCache = new Map()
+
+    /** Gauge for queue jobs by status */
+    this.queueJobsGauge = this.createGauge({
+      name: 'app_queue_jobs_count',
+      help: 'Number of app jobs in the queue by status',
+      labelNames: this.withDefaultLabels(['queue_name', 'status']),
+    })
+
+    this._setCleanupHandlers()
+  }
+
+  /**
+   * Collect metrics for a single Bee Queue and set gauges
+   * @param {string} queueName - Name of the queue
+   * @returns {Promise<void>}
+   */
+  collectSingleQueueMetrics = async queueName => {
+    try {
+      if (!this.queueCache.has(queueName)) {
+        this.queueCache.set(
+          queueName,
+          new Queue(queueName, {
+            redis: this.redisClient,
+            isWorker: false,
+            getEvents: false,
+            sendEvents: false,
+          })
+        )
+      }
+
+      const queue = this.queueCache.get(queueName)
+      const health = await queue.checkHealth()
+
+      const labels = {
+        ...this.getDefaultLabels(),
+        queue_name: queueName,
+      }
+
+      this.queueJobsGauge.set(
+        { ...labels, status: 'waiting' },
+        health.waiting || 0
+      )
+      this.queueJobsGauge.set(
+        { ...labels, status: 'active' },
+        health.active || 0
+      )
+      this.queueJobsGauge.set(
+        { ...labels, status: 'succeeded' },
+        health.succeeded || 0
+      )
+      this.queueJobsGauge.set(
+        { ...labels, status: 'failed' },
+        health.failed || 0
+      )
+      this.queueJobsGauge.set(
+        { ...labels, status: 'delayed' },
+        health.delayed || 0
+      )
+    } catch (error) {
+      console.warn(
+        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,
+        error.message
+      )
+    }
+  }
+
+  /**
+   * Collect metrics for all queues and Redis, then push to Pushgateway
+   * @returns {Promise<void>}
+   */
+  collectQueueMetrics = async () => {
+    try {
+      const queueNames = this.getConfiguredQueueNames()
+
+      await this.collectRedisMetrics()
+      await Promise.allSettled(
+        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))
+      )
+
+      await this.gatewayPush()
+
+      if (this.metricsLogValues) {
+        const metricObjects = await this.registry.getMetricsAsJSON()
+        console.info(
+          `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,
+          JSON.stringify(metricObjects, null, 2)
+        )
+      }
+    } catch (error) {
+      if (
+        error.message?.includes('No queues configured') ||
+        error.message?.includes('METRICS_APP_REDIS_BQ')
+      ) {
+        console.error(
+          `[queue-metrics] ❌ Configuration error: ${error.message}`
+        )
+        console.error(
+          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`
+        )
+      } else {
+        console.error(
+          `[queue-metrics] Failed to collect queue metrics: ${error.message}`
+        )
+      }
+      throw error
+    }
+  }
+
+  /**
+   * Start periodic collection.
+   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds
+   */
+  startPush = (intervalSec = this.intervalSec) => {
+    this._startPush(intervalSec, () => {
+      this.collectQueueMetrics().catch(err => {
+        console.error(
+          `[queue-metrics] Failed to collect queue & Redis metrics:`,
+          err
+        )
+      })
+    })
+  }
+
+  _setCleanupHandlers = () => {
+    process.on('SIGINT', this.cleanup)
+    process.on('SIGTERM', this.cleanup)
+  }
+
+  /**
+   * Cleanup queues and Redis client
+   */
+  cleanup = async () => {
+    for (const [queueName, queue] of this.queueCache) {
+      try {
+        await queue.close()
+      } catch (err) {
+        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)
+      }
+    }
+    process.exit(0)
+  }
+}
+
+module.exports = { QueueRedisMetricsClient }

package/src/metricsRedisClient.js

@@ -1,89 +1,43 @@
-const Queue = require('bee-queue')
 const { MetricsClient } = require('.')
 
 /**
  * RedisMetricsClient extends MetricsClient to collect
- * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.
+ * Redis metrics periodically and push them to Prometheus Pushgateway.
  *
  * @extends MetricsClient
  */
 class RedisMetricsClient extends MetricsClient {
   /**
-   * @param {Object} options - Metrics client options + Redis client
+   * @param {Object} options
    * @param {any} options.redisClient - Redis client instance (required)
-   * @param {Object} [options.metricsConfig] - MetricsClient configuration overrides
+   * @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 (from MetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
+   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
    */
-  constructor({ redisClient, metricsConfig = {} } = {}) {
-    const METRICS_QUEUE_INTERVAL_SEC =
+  constructor({ redisClient, ...metricsConfig } = {}) {
+    const intervalSec =
       metricsConfig.intervalSec ||
       parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||
       5
 
-    const getConfiguredQueueNames = () => {
-      if (!process.env.METRICS_APP_REDIS_BQ) {
-        throw new Error(
-          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'
-        )
-      }
-
-      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')
-        .map(q => q.trim())
-        .filter(Boolean)
-
-      if (allQueues.length === 0) {
-        throw new Error(
-          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +
-            'Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"'
-        )
-      }
-
-      return [...new Set(allQueues)]
-    }
-
-    const startupValidation = () => {
-      try {
-        const queueNames = getConfiguredQueueNames()
-        console.info(
-          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`
-        )
-        return true
-      } catch (error) {
-        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)
-        console.error(
-          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`
-        )
-        console.error(
-          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC="10"`
-        )
-        console.error(`[queue-metrics] Skipping queue metrics collection`)
-        return false
-      }
-    }
-
     super({
       ...metricsConfig,
       scripDefaultMetrics: true,
-      processType: metricsConfig.processType || 'queue-metrics',
-      intervalSec: METRICS_QUEUE_INTERVAL_SEC,
-      startupValidation,
+      processType: metricsConfig.processType || 'redis-metrics',
+      intervalSec,
     })
 
-    this.getConfiguredQueueNames = getConfiguredQueueNames
-    this.startupValidation = startupValidation
-
-    /** Redis client used for queue & Redis metrics */
+    /** Redis client used for metrics */
     this.redisClient = redisClient
 
-    /** Cache for queue objects to avoid multiple connections */
-    this.queueCache = new Map()
-
-    /** Gauge for queue jobs by status */
-    this.queueJobsGauge = this.createGauge({
-      name: 'app_queue_jobs_count',
-      help: 'Number of app jobs in the queue by status',
-      labelNames: this.withDefaultLabels(['queue_name', 'status']),
-    })
-
     /** Gauge for Redis client connections */
     this.redisConnectionsGauge = this.createGauge({
       name: 'app_redis_connections_count',
@@ -178,98 +132,25 @@ class RedisMetricsClient extends MetricsClient {
   }
 
   /**
-   * Collect metrics for a single Bee Queue and set gauges
-   * @param {string} queueName - Name of the queue
+   * Collect metrics for all Redis and push to Prometheus Pushgateway
    * @returns {Promise<void>}
    */
-  collectSingleQueueMetrics = async queueName => {
+  pushRedisMetrics = async () => {
     try {
-      if (!this.queueCache.has(queueName)) {
-        this.queueCache.set(
-          queueName,
-          new Queue(queueName, {
-            redis: this.redisClient,
-            isWorker: false,
-            getEvents: false,
-            sendEvents: false,
-          })
-        )
-      }
-
-      const queue = this.queueCache.get(queueName)
-      const health = await queue.checkHealth()
-
-      const labels = {
-        ...this.getDefaultLabels(),
-        queue_name: queueName,
-      }
-
-      this.queueJobsGauge.set(
-        { ...labels, status: 'waiting' },
-        health.waiting || 0
-      )
-      this.queueJobsGauge.set(
-        { ...labels, status: 'active' },
-        health.active || 0
-      )
-      this.queueJobsGauge.set(
-        { ...labels, status: 'succeeded' },
-        health.succeeded || 0
-      )
-      this.queueJobsGauge.set(
-        { ...labels, status: 'failed' },
-        health.failed || 0
-      )
-      this.queueJobsGauge.set(
-        { ...labels, status: 'delayed' },
-        health.delayed || 0
-      )
-    } catch (error) {
-      console.warn(
-        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,
-        error.message
-      )
-    }
-  }
-
-  /**
-   * Collect metrics for all queues and Redis, then push to Pushgateway
-   * @returns {Promise<void>}
-   */
-  collectQueueMetrics = async () => {
-    try {
-      const queueNames = this.getConfiguredQueueNames()
-
       await this.collectRedisMetrics()
-      await Promise.allSettled(
-        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))
-      )
-
       await this.gatewayPush()
 
       if (this.metricsLogValues) {
         const metricObjects = await this.registry.getMetricsAsJSON()
         console.info(
-          `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,
+          `[redis-metrics] Collected metrics for Redis`,
           JSON.stringify(metricObjects, null, 2)
         )
       }
     } catch (error) {
-      if (
-        error.message?.includes('No queues configured') ||
-        error.message?.includes('METRICS_APP_REDIS_BQ')
-      ) {
-        console.error(
-          `[queue-metrics] ❌ Configuration error: ${error.message}`
-        )
-        console.error(
-          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ="adalo-compile,adalo-migrations"`
-        )
-      } else {
-        console.error(
-          `[queue-metrics] Failed to collect queue metrics: ${error.message}`
-        )
-      }
+      console.error(
+        `[redis-metrics] Failed to collect Redis metrics: ${error.message}`
+      )
       throw error
     }
   }
@@ -280,36 +161,28 @@ class RedisMetricsClient extends MetricsClient {
    */
   startPush = (intervalSec = this.intervalSec) => {
     this._startPush(intervalSec, () => {
-      this.collectQueueMetrics().catch(err => {
-        console.error(
-          `[queue-metrics] Failed to collect queue & Redis metrics:`,
-          err
-        )
+      this.pushRedisMetrics().catch(err => {
+        console.error(`[redis-metrics] Failed to push Redis metrics:`, err)
       })
     })
   }
 
-  _setCleanupHandlers = () => {
-    process.on('SIGINT', this.cleanup)
-    process.on('SIGTERM', this.cleanup)
-  }
-
   /**
-   * Cleanup queues and Redis client
+   * Cleanup Redis client
    */
   cleanup = async () => {
-    for (const [queueName, queue] of this.queueCache) {
-      try {
-        await queue.close()
-      } catch (err) {
-        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)
-      }
+    try {
+      this.redisClient?.quit()
+    } catch (err) {
+      console.error('[redis-metrics] Error closing Redis client:', err)
     }
-
-    // Close Redis connection
-    this.redisClient?.quit()
     process.exit(0)
   }
+
+  _setCleanupHandlers = () => {
+    process.on('SIGINT', this.cleanup)
+    process.on('SIGTERM', this.cleanup)
+  }
 }
 
 module.exports = { RedisMetricsClient }