@adalo/metrics 0.1.156 → 0.1.157

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.env.example CHANGED
@@ -9,6 +9,7 @@ METRICS_PUSHGATEWAY_URL=https://vm-agent.infradalogs.adalo.com
9
9
  METRICS_PUSHGATEWAY_SECRET="METRICS_PUSHGATEWAY_SECRET"
10
10
  METRICS_INTERVAL_SEC=60
11
11
  # METRICS_REMOVE_OLD_METRICS=false (set true to delete this instance's metrics from VM on exit)
12
+ # METRICS_GRACEFUL_SHUTDOWN_REDIS=false (Redis metrics: default true. When true, new instance publishes once on start and old instances exit on message. Set to false to disable. Pass redisPubSubClient for node-redis.)
12
13
 
13
14
 
14
15
 
@@ -5,6 +5,35 @@
5
5
  * @extends RedisMetricsClient
6
6
  */
7
7
  export class QueueRedisMetricsClient extends RedisMetricsClient {
8
+ /**
9
+ * @param {Object} options
10
+ * @param {any} options.redisClient - Redis client instance (required)
11
+ * @param {string} [options.appName] - Application name (from BaseMetricsClient)
12
+ * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
13
+ * @param {string} [options.processType] - Process type (from BaseMetricsClient)
14
+ * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)
15
+ * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)
16
+ * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)
17
+ * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)
18
+ * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)
19
+ * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)
20
+ * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
21
+ * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
22
+ */
23
+ constructor({ redisClient, metricsConfig }?: {
24
+ redisClient: any;
25
+ appName?: string | undefined;
26
+ dynoId?: string | undefined;
27
+ processType?: string | undefined;
28
+ enabled?: boolean | undefined;
29
+ logValues?: boolean | undefined;
30
+ pushgatewayUrl?: string | undefined;
31
+ pushgatewaySecret?: string | undefined;
32
+ intervalSec?: number | undefined;
33
+ removeOldMetrics?: boolean | undefined;
34
+ startupValidation?: Function | undefined;
35
+ disablePushgateway?: boolean | undefined;
36
+ });
8
37
  getConfiguredQueueNames: () => string[];
9
38
  startupValidation: () => boolean;
10
39
  /** Cache for queue objects to avoid multiple connections */
@@ -1 +1 @@
1
- {"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;OAKG;IACH,cAHW,MAAM,EAAE,KACN,QAAQ,GAAG,CAAC,CA6BxB;IAED,8BAGC;IAED,2DA6BC;IAED;;;;;;OAmBC;IAED;;;;;;OAwBC;IAED;;;;;;;;;;;OAWG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAyCzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}
1
+ {"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;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;QACf,iBAAiB;QAClB,kBAAkB;OA4E9C;IA1BC,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;OAKG;IACH,cAHW,MAAM,EAAE,KACN,QAAQ,GAAG,CAAC,CA6BxB;IAED,8BAGC;IAED,2DA6BC;IAED;;;;;;OAmBC;IAED;;;;;;OAwBC;IAED;;;;;;;;;;;OAWG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAyCzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAqCF"}
@@ -258,6 +258,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
258
258
 
259
259
  /**
260
260
  * Cleanup queues and exit process.
261
+ * Closes queues then runs Redis metrics cleanup (stop push, delete from VM, close Redis).
261
262
  * @returns {Promise<void>}
262
263
  */
263
264
  cleanup = async () => {
@@ -268,7 +269,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
268
269
  console.error(`[queue-metrics] Error closing queue ${queueName}:`, err);
269
270
  }
270
271
  }
271
- process.exit(0);
272
+ await super.cleanup();
272
273
  };
273
274
  }
274
275
  module.exports = {
@@ -1 +1 @@
1
- {"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","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","_send","args","Promise","reject","redisClientType","resolve","send_command","slice","err","result","sendCommand","call","_toNumber","v","n","parseInt","String","Number","isFinite","_getQueueType","queueName","forced","METRICS_QUEUE_TYPE","toLowerCase","bullPrefix","BULL_QUEUE_PREFIX","beePrefix","BEE_QUEUE_PREFIX","METRICS_BEE_QUEUE_PREFIX","bullWaitKey","beeWaitKey","bullExists","beeExists","all","_getBullHealth","prefix","base","waiting","active","succeeded","failed","delayed","_getBeeQueueHealth","collectSingleQueueMetrics","queueType","health","labels","getDefaultLabels","queue_name","set","status","warn","collectQueueMetrics","collectRedisMetrics","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","on","cleanup","queue","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient 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 BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\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 // NOTE:\n // Historically we used `bee-queue`'s `Queue#checkHealth()` here.\n // But bee-queue depends on `redis@3`, which is not compatible with Node 22\n // in some environments and can crash with errors like:\n // - \"this._ready.then is not a function\"\n // - \"TypeError: this.stream.once is not a function\"\n //\n // To avoid pulling in node-redis v3 at runtime, we read queue counters\n // directly from Redis using the *provided* redis client (ioredis or node-redis).\n //\n // Keep this map reserved for possible future caching (e.g. key schema detection),\n // but we no longer store Queue instances.\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 * Execute a Redis command in a client-type safe way.\n *\n * @param {string[]} args Command args array, e.g. ['LLEN', 'key']\n * @returns {Promise<any>}\n */\n _send = args => {\n if (!this.redisClient) {\n return Promise.reject(new Error('Redis client not provided'))\n }\n\n // node-redis v3 (callback API)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command(args[0], args.slice(1), (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 (Promise API)\n if (this.redisClientType === REDIS_V4) {\n return this.redisClient.sendCommand(args)\n }\n\n // ioredis (Promise API)\n if (this.redisClientType === IOREDIS) {\n // ioredis supports `.call(command, ...args)`\n return this.redisClient.call(args[0], ...args.slice(1))\n }\n\n return Promise.reject(new Error('Unsupported Redis client type'))\n }\n\n _toNumber = v => {\n const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)\n return Number.isFinite(n) ? n : 0\n }\n\n _getQueueType = async queueName => {\n const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()\n if (forced === 'bull' || forced === 'bee') return forced\n\n const bullPrefix =\n (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n const beePrefix =\n (\n process.env.BEE_QUEUE_PREFIX ||\n process.env.METRICS_BEE_QUEUE_PREFIX ||\n 'bq'\n ).trim() || 'bq'\n\n // Detect by checking the canonical \"waiting\" key names.\n const bullWaitKey = `${bullPrefix}:${queueName}:wait`\n const beeWaitKey = `${beePrefix}:${queueName}:waiting`\n\n try {\n const [bullExists, beeExists] = await Promise.all([\n this._send(['EXISTS', bullWaitKey]),\n this._send(['EXISTS', beeWaitKey]),\n ])\n if (this._toNumber(bullExists) > 0) return 'bull'\n if (this._toNumber(beeExists) > 0) return 'bee'\n } catch {\n // If EXISTS is blocked/unavailable, fall back to trying bull first.\n }\n\n return 'bull'\n }\n\n _getBullHealth = async queueName => {\n const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n const base = `${prefix}:${queueName}:`\n\n const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n this._send(['LLEN', `${base}wait`]),\n this._send(['LLEN', `${base}active`]),\n this._send(['ZCARD', `${base}completed`]),\n this._send(['ZCARD', `${base}failed`]),\n this._send(['ZCARD', `${base}delayed`]),\n ])\n\n return {\n waiting: this._toNumber(waiting),\n active: this._toNumber(active),\n succeeded: this._toNumber(succeeded),\n failed: this._toNumber(failed),\n delayed: this._toNumber(delayed),\n }\n }\n\n _getBeeQueueHealth = async queueName => {\n const prefix =\n (\n process.env.BEE_QUEUE_PREFIX ||\n process.env.METRICS_BEE_QUEUE_PREFIX ||\n 'bq'\n ).trim() || 'bq'\n const base = `${prefix}:${queueName}:`\n\n const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n this._send(['LLEN', `${base}waiting`]),\n this._send(['LLEN', `${base}active`]),\n this._send(['SCARD', `${base}succeeded`]),\n this._send(['SCARD', `${base}failed`]),\n this._send(['ZCARD', `${base}delayed`]),\n ])\n\n return {\n waiting: this._toNumber(waiting),\n active: this._toNumber(active),\n succeeded: this._toNumber(succeeded),\n failed: this._toNumber(failed),\n delayed: this._toNumber(delayed),\n }\n }\n\n /**\n * Collect metrics for a single queue and set gauges.\n *\n * Supports:\n * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`\n * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`\n *\n * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.\n *\n * @param {string} queueName - Name of the queue\n * @returns {Promise<void>}\n */\n collectSingleQueueMetrics = async queueName => {\n try {\n const queueType = await this._getQueueType(queueName)\n const health =\n queueType === 'bee'\n ? await this._getBeeQueueHealth(queueName)\n : await this._getBullHealth(queueName)\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 this.clearAllCounters()\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 exit process.\n * @returns {Promise<void>}\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":[]}
1
+ {"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","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","_send","args","Promise","reject","redisClientType","resolve","send_command","slice","err","result","sendCommand","call","_toNumber","v","n","parseInt","String","Number","isFinite","_getQueueType","queueName","forced","METRICS_QUEUE_TYPE","toLowerCase","bullPrefix","BULL_QUEUE_PREFIX","beePrefix","BEE_QUEUE_PREFIX","METRICS_BEE_QUEUE_PREFIX","bullWaitKey","beeWaitKey","bullExists","beeExists","all","_getBullHealth","prefix","base","waiting","active","succeeded","failed","delayed","_getBeeQueueHealth","collectSingleQueueMetrics","queueType","health","labels","getDefaultLabels","queue_name","set","status","warn","collectQueueMetrics","collectRedisMetrics","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","on","cleanup","queue","close","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient 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 BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\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 // NOTE:\n // Historically we used `bee-queue`'s `Queue#checkHealth()` here.\n // But bee-queue depends on `redis@3`, which is not compatible with Node 22\n // in some environments and can crash with errors like:\n // - \"this._ready.then is not a function\"\n // - \"TypeError: this.stream.once is not a function\"\n //\n // To avoid pulling in node-redis v3 at runtime, we read queue counters\n // directly from Redis using the *provided* redis client (ioredis or node-redis).\n //\n // Keep this map reserved for possible future caching (e.g. key schema detection),\n // but we no longer store Queue instances.\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 * Execute a Redis command in a client-type safe way.\n *\n * @param {string[]} args Command args array, e.g. ['LLEN', 'key']\n * @returns {Promise<any>}\n */\n _send = args => {\n if (!this.redisClient) {\n return Promise.reject(new Error('Redis client not provided'))\n }\n\n // node-redis v3 (callback API)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command(args[0], args.slice(1), (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 (Promise API)\n if (this.redisClientType === REDIS_V4) {\n return this.redisClient.sendCommand(args)\n }\n\n // ioredis (Promise API)\n if (this.redisClientType === IOREDIS) {\n // ioredis supports `.call(command, ...args)`\n return this.redisClient.call(args[0], ...args.slice(1))\n }\n\n return Promise.reject(new Error('Unsupported Redis client type'))\n }\n\n _toNumber = v => {\n const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)\n return Number.isFinite(n) ? n : 0\n }\n\n _getQueueType = async queueName => {\n const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()\n if (forced === 'bull' || forced === 'bee') return forced\n\n const bullPrefix =\n (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n const beePrefix =\n (\n process.env.BEE_QUEUE_PREFIX ||\n process.env.METRICS_BEE_QUEUE_PREFIX ||\n 'bq'\n ).trim() || 'bq'\n\n // Detect by checking the canonical \"waiting\" key names.\n const bullWaitKey = `${bullPrefix}:${queueName}:wait`\n const beeWaitKey = `${beePrefix}:${queueName}:waiting`\n\n try {\n const [bullExists, beeExists] = await Promise.all([\n this._send(['EXISTS', bullWaitKey]),\n this._send(['EXISTS', beeWaitKey]),\n ])\n if (this._toNumber(bullExists) > 0) return 'bull'\n if (this._toNumber(beeExists) > 0) return 'bee'\n } catch {\n // If EXISTS is blocked/unavailable, fall back to trying bull first.\n }\n\n return 'bull'\n }\n\n _getBullHealth = async queueName => {\n const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n const base = `${prefix}:${queueName}:`\n\n const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n this._send(['LLEN', `${base}wait`]),\n this._send(['LLEN', `${base}active`]),\n this._send(['ZCARD', `${base}completed`]),\n this._send(['ZCARD', `${base}failed`]),\n this._send(['ZCARD', `${base}delayed`]),\n ])\n\n return {\n waiting: this._toNumber(waiting),\n active: this._toNumber(active),\n succeeded: this._toNumber(succeeded),\n failed: this._toNumber(failed),\n delayed: this._toNumber(delayed),\n }\n }\n\n _getBeeQueueHealth = async queueName => {\n const prefix =\n (\n process.env.BEE_QUEUE_PREFIX ||\n process.env.METRICS_BEE_QUEUE_PREFIX ||\n 'bq'\n ).trim() || 'bq'\n const base = `${prefix}:${queueName}:`\n\n const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n this._send(['LLEN', `${base}waiting`]),\n this._send(['LLEN', `${base}active`]),\n this._send(['SCARD', `${base}succeeded`]),\n this._send(['SCARD', `${base}failed`]),\n this._send(['ZCARD', `${base}delayed`]),\n ])\n\n return {\n waiting: this._toNumber(waiting),\n active: this._toNumber(active),\n succeeded: this._toNumber(succeeded),\n failed: this._toNumber(failed),\n delayed: this._toNumber(delayed),\n }\n }\n\n /**\n * Collect metrics for a single queue and set gauges.\n *\n * Supports:\n * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`\n * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`\n *\n * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.\n *\n * @param {string} queueName - Name of the queue\n * @returns {Promise<void>}\n */\n collectSingleQueueMetrics = async queueName => {\n try {\n const queueType = await this._getQueueType(queueName)\n const health =\n queueType === 'bee'\n ? await this._getBeeQueueHealth(queueName)\n : await this._getBullHealth(queueName)\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 this.clearAllCounters()\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 exit process.\n * Closes queues then runs Redis metrics cleanup (stop push, delete from VM, close Redis).\n * @returns {Promise<void>}\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 await super.cleanup()\n }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
@@ -8,6 +8,8 @@ export class RedisMetricsClient extends BaseMetricsClient {
8
8
  /**
9
9
  * @param {Object} options
10
10
  * @param {any} options.redisClient - Redis client instance (required)
11
+ * @param {any} [options.redisPubSubClient] - Optional dedicated Redis connection for subscribe (required for node-redis; ioredis can use redisClient.duplicate())
12
+ * @param {boolean} [options.gracefulShutdownRedis] - If true, new instance publishes to Redis on start and old instances exit when they receive (set METRICS_GRACEFUL_SHUTDOWN_REDIS=true). Channel scoped by app + process_type so other services are not closed.
11
13
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
12
14
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
13
15
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -20,8 +22,10 @@ export class RedisMetricsClient extends BaseMetricsClient {
20
22
  * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
21
23
  * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
22
24
  */
23
- constructor({ redisClient, ...metricsConfig }?: {
25
+ constructor({ redisClient, redisPubSubClient, gracefulShutdownRedis, ...metricsConfig }?: {
24
26
  redisClient: any;
27
+ redisPubSubClient?: any;
28
+ gracefulShutdownRedis?: boolean | undefined;
25
29
  appName?: string | undefined;
26
30
  dynoId?: string | undefined;
27
31
  processType?: string | undefined;
@@ -37,6 +41,11 @@ export class RedisMetricsClient extends BaseMetricsClient {
37
41
  /** Redis client used for metrics */
38
42
  redisClient: any;
39
43
  redisClientType: string;
44
+ /** When true, new instance publishes once to Redis on start; old instances subscribed to same channel exit immediately. Channel = metrics:graceful-shutdown:{app}:{process_type}. Default true; set METRICS_GRACEFUL_SHUTDOWN_REDIS=false or gracefulShutdownRedis: false to disable. */
45
+ _gracefulShutdownRedis: boolean;
46
+ _gracefulShutdownChannel: string | null;
47
+ /** Dedicated Redis connection for subscribe (subscriber mode); closed in cleanup. */
48
+ _subClient: any;
40
49
  /** Counter for Redis client connections */
41
50
  redisConnectionsGauge: import("prom-client").Gauge<string>;
42
51
  redisConnectionsMemoryGauge: import("prom-client").Gauge<string>;
@@ -46,6 +55,16 @@ export class RedisMetricsClient extends BaseMetricsClient {
46
55
  redisStatsGauge: import("prom-client").Gauge<string>;
47
56
  _redisConnSeenKeys: Set<any>;
48
57
  _redisConnZeroedKeys: Set<any>;
58
+ /**
59
+ * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started → exit.
60
+ * Uses redisPubSubClient if provided, or redisClient.duplicate() when available (e.g. ioredis). Channel is scoped by app + process_type so only same service is affected.
61
+ * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())
62
+ */
63
+ _setupGracefulShutdownSubscribe(redisPubSubClient?: any): void;
64
+ /**
65
+ * Publish one-time "new instance started" so old instances (subscribed to the same channel) exit. Call from new instance after startPush.
66
+ */
67
+ _publishNewInstanceStarted(): void;
49
68
  getRedisConnections: () => Promise<any>;
50
69
  getRedisInfo: (section: any) => Promise<any>;
51
70
  parseRedisConnections: (clientsStr: any) => any;
@@ -1 +1 @@
1
- {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAuD9C;IAzCC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAQF,6BAAmC;IACnC,+BAAqC;IAKvC,wCAgCC;IAED,6CAuBC;IAED,gDAkBC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CA6KzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
1
+ {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;QAfwB,WAAW,EAAxB,GAAG;QACW,iBAAiB,GAA/B,GAAG;QACe,qBAAqB;QACtB,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAqE9C;IAvDC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,yRAAyR;IACzR,gCAC4F;IAC5F,wCAGU;IACV,qFAAqF;IACrF,gBAAsB;IAMtB,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAQF,6BAAmC;IACnC,+BAAqC;IAKvC;;;;OAIG;IACH,oDAFW,GAAG,QAsDb;IAED;;OAEG;IACH,mCAoBC;IAED,wCAgCC;IAED,6CAuBC;IAED,gDAkBC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CA6KzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDASC;CAmDF"}
@@ -22,6 +22,8 @@ class RedisMetricsClient extends BaseMetricsClient {
22
22
  /**
23
23
  * @param {Object} options
24
24
  * @param {any} options.redisClient - Redis client instance (required)
25
+ * @param {any} [options.redisPubSubClient] - Optional dedicated Redis connection for subscribe (required for node-redis; ioredis can use redisClient.duplicate())
26
+ * @param {boolean} [options.gracefulShutdownRedis] - If true, new instance publishes to Redis on start and old instances exit when they receive (set METRICS_GRACEFUL_SHUTDOWN_REDIS=true). Channel scoped by app + process_type so other services are not closed.
25
27
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
26
28
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
27
29
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -36,6 +38,8 @@ class RedisMetricsClient extends BaseMetricsClient {
36
38
  */
37
39
  constructor({
38
40
  redisClient,
41
+ redisPubSubClient,
42
+ gracefulShutdownRedis,
39
43
  ...metricsConfig
40
44
  } = {}) {
41
45
  const intervalSec = metricsConfig.intervalSec || parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) || 5;
@@ -49,6 +53,15 @@ class RedisMetricsClient extends BaseMetricsClient {
49
53
  this.redisClient = redisClient;
50
54
  this.redisClientType = getRedisClientType(redisClient);
51
55
 
56
+ /** When true, new instance publishes once to Redis on start; old instances subscribed to same channel exit immediately. Channel = metrics:graceful-shutdown:{app}:{process_type}. Default true; set METRICS_GRACEFUL_SHUTDOWN_REDIS=false or gracefulShutdownRedis: false to disable. */
57
+ this._gracefulShutdownRedis = gracefulShutdownRedis !== false && process.env.METRICS_GRACEFUL_SHUTDOWN_REDIS !== 'false';
58
+ this._gracefulShutdownChannel = this._gracefulShutdownRedis ? `metrics:graceful-shutdown:${this.appName}:${this.processType}` : null;
59
+ /** Dedicated Redis connection for subscribe (subscriber mode); closed in cleanup. */
60
+ this._subClient = null;
61
+ if (this._gracefulShutdownRedis && this._gracefulShutdownChannel) {
62
+ this._setupGracefulShutdownSubscribe(redisPubSubClient);
63
+ }
64
+
52
65
  /** Counter for Redis client connections */
53
66
  this.redisConnectionsGauge = this.createGauge({
54
67
  name: 'app_redis_connections_count',
@@ -85,6 +98,80 @@ class RedisMetricsClient extends BaseMetricsClient {
85
98
  this._redisConnZeroedKeys = new Set();
86
99
  this._setCleanupHandlers();
87
100
  }
101
+
102
+ /**
103
+ * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started → exit.
104
+ * Uses redisPubSubClient if provided, or redisClient.duplicate() when available (e.g. ioredis). Channel is scoped by app + process_type so only same service is affected.
105
+ * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())
106
+ */
107
+ _setupGracefulShutdownSubscribe(redisPubSubClient) {
108
+ const channel = this._gracefulShutdownChannel;
109
+ if (!channel) return;
110
+ let subClient = redisPubSubClient;
111
+ if (!subClient && this.redisClient && typeof this.redisClient.duplicate === 'function') {
112
+ subClient = this.redisClient.duplicate();
113
+ }
114
+ if (!subClient) {
115
+ console.warn('[queue-metrics] METRICS_GRACEFUL_SHUTDOWN_REDIS is true but no subscriber connection available. Pass redisPubSubClient or use ioredis (duplicate()).');
116
+ return;
117
+ }
118
+ this._subClient = subClient;
119
+ const onMessage = () => {
120
+ console.warn(`[queue-metrics] New instance started (channel ${channel}); this instance exiting.`);
121
+ this.cleanup();
122
+ };
123
+ if (this.redisClientType === REDIS_V3) {
124
+ subClient.on('subscribe', () => {
125
+ console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`);
126
+ });
127
+ subClient.on('message', (ch, _msg) => {
128
+ if (ch === channel) onMessage();
129
+ });
130
+ subClient.subscribe(channel);
131
+ } else if (this.redisClientType === REDIS_V4) {
132
+ subClient.on('subscribe', () => {
133
+ console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`);
134
+ });
135
+ subClient.on('message', (ch, _msg) => {
136
+ if (ch === channel) onMessage();
137
+ });
138
+ subClient.subscribe(channel);
139
+ } else if (this.redisClientType === IOREDIS) {
140
+ subClient.subscribe(channel, (err, count) => {
141
+ if (err) {
142
+ console.error('[queue-metrics] Graceful shutdown subscribe error:', err);
143
+ return;
144
+ }
145
+ console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`);
146
+ });
147
+ subClient.on('message', (ch, _msg) => {
148
+ if (ch === channel) onMessage();
149
+ });
150
+ }
151
+ }
152
+
153
+ /**
154
+ * Publish one-time "new instance started" so old instances (subscribed to the same channel) exit. Call from new instance after startPush.
155
+ */
156
+ _publishNewInstanceStarted() {
157
+ if (!this._gracefulShutdownChannel || !this.redisClient) return;
158
+ const channel = this._gracefulShutdownChannel;
159
+ const message = this.dynoId || '1';
160
+ const done = err => {
161
+ if (err) {
162
+ console.warn('[queue-metrics] Graceful shutdown publish failed:', err.message);
163
+ } else {
164
+ console.warn(`[queue-metrics] Published to ${channel} (new instance started).`);
165
+ }
166
+ };
167
+ if (this.redisClientType === REDIS_V3) {
168
+ this.redisClient.send_command('PUBLISH', [channel, message], done);
169
+ } else if (this.redisClientType === REDIS_V4) {
170
+ this.redisClient.sendCommand(['PUBLISH', channel, message]).then(() => done()).catch(done);
171
+ } else if (this.redisClientType === IOREDIS) {
172
+ this.redisClient.publish(channel, message).then(() => done()).catch(done);
173
+ }
174
+ }
88
175
  getRedisConnections = async () => {
89
176
  if (!this.redisClient) throw new Error('Redis client not provided');
90
177
 
@@ -331,13 +418,39 @@ class RedisMetricsClient extends BaseMetricsClient {
331
418
  console.error(`[queue-metrics] Failed to push Redis metrics:`, err);
332
419
  });
333
420
  });
421
+ if (this._gracefulShutdownRedis) {
422
+ this._publishNewInstanceStarted();
423
+ }
334
424
  };
335
425
 
336
426
  /**
337
427
  * Cleanup Redis client and exit process.
428
+ * Stops push, deletes this instance's metrics from VM (if removeOldMetrics), closes subscriber and main Redis, then exits.
338
429
  * @returns {Promise<void>}
339
430
  */
340
431
  cleanup = async () => {
432
+ this.stopPush();
433
+ if (this.enabled) {
434
+ await this.gatewayDelete();
435
+ }
436
+ if (this._subClient) {
437
+ try {
438
+ if (this.redisClientType === REDIS_V3) {
439
+ await new Promise((resolve, reject) => {
440
+ if (typeof this._subClient.quit === 'function') {
441
+ this._subClient.quit(err => err ? reject(err) : resolve());
442
+ } else resolve();
443
+ });
444
+ } else if (this.redisClientType === REDIS_V4) {
445
+ if (this._subClient.quit) await this._subClient.quit();
446
+ } else if (this.redisClientType === IOREDIS) {
447
+ if (this._subClient.disconnect) await this._subClient.disconnect();
448
+ }
449
+ } catch (err) {
450
+ console.error('[queue-metrics] Error closing subscriber client:', err);
451
+ }
452
+ this._subClient = null;
453
+ }
341
454
  try {
342
455
  if (!this.redisClient) return;
343
456
  if (this.redisClientType === REDIS_V3 || this.redisClientType === REDIS_V4) {
@@ -1 +1 @@
1
- {"version":3,"file":"metricsRedisClient.js","names":["BaseMetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_redisConnSeenKeys","Set","_redisConnZeroedKeys","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","eqIdx","indexOf","k","slice","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","JSON","stringify","missing","flags","cmd","c","grouped","conn","totMem","key","count","memory","mem","Number","isFinite","currentKeys","Object","keys","add","has","delete","reset","valueLabels","parse","set","groups","values","groupedTotal","reduce","sum","g","size","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../../src/metrics/metricsRedisClient.js"],"sourcesContent":["const { BaseMetricsClient } = require('./baseMetricsClient')\nconst {\n getRedisClientType,\n REDIS_V4,\n IOREDIS,\n REDIS_V3,\n} = require('../redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends BaseMetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass RedisMetricsClient extends BaseMetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\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 processType: metricsConfig.processType || 'queue-metrics',\n intervalSec,\n })\n\n /** Redis client used for metrics */\n this.redisClient = redisClient\n this.redisClientType = getRedisClientType(redisClient)\n\n /** Counter for Redis client connections */\n this.redisConnectionsGauge = this.createGauge({\n name: 'app_redis_connections_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n this.redisConnectionsMemoryGauge = this.createGauge({\n name: 'app_redis_connections_memory_usage_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n /** Gauge for Redis memory usage */\n this.redisMemoryGauge = this.createGauge({\n name: 'app_redis_memory_bytes',\n help: 'Redis memory usage in bytes',\n labelNames: this.withDefaultLabels(['memory_type']),\n })\n\n /** Gauge for Redis operation stats */\n this.redisStatsGauge = this.createGauge({\n name: 'app_redis_stats_total',\n help: 'Redis operation statistics',\n labelNames: this.withDefaultLabels(['operation']),\n })\n\n // Track emitted connection label combinations so we can:\n // - emit a one-shot 0 for series that disappear (overwrite last non-zero sample)\n // - then stop emitting them on subsequent scrapes\n //\n // This is mainly needed because we label connections by `cmd`,\n // and Redis `CLIENT LIST` `cmd` is volatile.\n this._redisConnSeenKeys = new Set()\n this._redisConnZeroedKeys = new Set()\n\n this._setCleanupHandlers()\n }\n\n getRedisConnections = async () => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n if (err) {\n reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n } else resolve(result)\n })\n })\n }\n\n // node-redis v4\n if (this.redisClientType === REDIS_V4) {\n try {\n return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n if (this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.client('LIST')\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n getRedisInfo = async section => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.info(section, (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 or ioredis (info returns Promise)\n if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.info(section)\n } catch (err) {\n throw new Error(`Failed to get Redis INFO: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n parseRedisConnections = clientsStr => {\n return clientsStr\n .split('\\n')\n .filter(line => line.trim() !== '')\n .map(line => {\n const parts = line.split(' ')\n const client = {}\n parts.forEach(p => {\n const eqIdx = p.indexOf('=')\n if (eqIdx === -1) return\n const k = p.slice(0, eqIdx)\n const v = p.slice(eqIdx + 1)\n if (redisConnectionFields.includes(k)) {\n client[k] = v\n }\n })\n return client\n })\n }\n\n /**\n * Collect basic Redis INFO metrics: clients, memory, stats\n * @returns {Promise<void>}\n */\n collectRedisMetrics = async () => {\n try {\n const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n await Promise.all([\n this.getRedisInfo('memory'),\n this.getRedisInfo('stats'),\n this.getRedisConnections(),\n ])\n\n const labels = this.getDefaultLabels()\n\n const connections = this.parseRedisConnections(connectionsInfoStr)\n\n if (this.logValues) {\n // \"IN\" data: raw client list from Redis\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw):\\n',\n connectionsInfoStr\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw) length:',\n connectionsInfoStr.length\n )\n\n // \"OUT\" data: parsed fields used for metrics\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) count:',\n connections.length\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed sample, first 10):',\n JSON.stringify(connections.slice(0, 10), null, 2)\n )\n\n const missing = { name: 0, flags: 0, cmd: 0, 'tot-mem': 0 }\n connections.forEach(c => {\n if (!c.name) missing.name += 1\n if (!c.flags) missing.flags += 1\n if (!c.cmd) missing.cmd += 1\n if (!c['tot-mem']) missing['tot-mem'] += 1\n })\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) missing fields:',\n missing\n )\n }\n\n const grouped = {}\n connections.forEach(conn => {\n const { name, flags, 'tot-mem': totMem, cmd } = conn\n\n // build grouping key (includes default gauge labels later)\n const key = JSON.stringify({ name, flags, cmd })\n\n if (!grouped[key]) {\n grouped[key] = {\n labels: { name, flags, cmd },\n count: 0,\n memory: 0,\n }\n }\n\n grouped[key].count += 1\n const mem = parseInt(totMem, 10)\n grouped[key].memory += Number.isFinite(mem) ? mem : 0\n })\n\n // Ensure sets exist even if older instance is hot-reloaded.\n if (!this._redisConnSeenKeys) this._redisConnSeenKeys = new Set()\n if (!this._redisConnZeroedKeys) this._redisConnZeroedKeys = new Set()\n\n const currentKeys = new Set(Object.keys(grouped))\n for (const k of currentKeys) {\n this._redisConnSeenKeys.add(k)\n if (this._redisConnZeroedKeys.has(k)) {\n this._redisConnZeroedKeys.delete(k)\n }\n }\n\n // Reset gauges each scrape so we only export:\n // - current snapshot series\n // - one-shot zeros for recently disappeared series\n this.redisConnectionsGauge.reset()\n this.redisConnectionsMemoryGauge.reset()\n\n // Emit one-shot zeros for series that disappeared since last seen.\n for (const k of this._redisConnSeenKeys) {\n if (currentKeys.has(k)) continue\n if (this._redisConnZeroedKeys.has(k)) continue\n try {\n const valueLabels = JSON.parse(k)\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, 0)\n this.redisConnectionsMemoryGauge.set({ ...labels, ...valueLabels }, 0)\n this._redisConnZeroedKeys.add(k)\n } catch {\n // ignore malformed key\n }\n }\n\n if (this.logValues) {\n const groups = Object.values(grouped)\n const groupedTotal = groups.reduce((sum, g) => sum + (g.count || 0), 0)\n console.log(\n '[queue-metrics] Redis connections grouped buckets:',\n groups.length\n )\n console.log(\n '[queue-metrics] Redis connections grouped total:',\n groupedTotal\n )\n console.log(\n '[queue-metrics] Redis connections seen keys:',\n this._redisConnSeenKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections zeroed keys:',\n this._redisConnZeroedKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections grouped sample (first 10):',\n JSON.stringify(groups.slice(0, 10), null, 2)\n )\n }\n\n Object.values(grouped).forEach(\n ({ labels: valueLabels, count, memory }) => {\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n this.redisConnectionsMemoryGauge.set(\n { ...labels, ...valueLabels },\n memory\n )\n }\n )\n\n const parseRedisInfo = infoStr =>\n Object.fromEntries(\n infoStr\n .split('\\r\\n')\n .filter(line => line && !line.startsWith('#'))\n .map(line => line.split(':', 2))\n .filter(parts => parts.length === 2 && parts[0] && parts[1])\n )\n\n const memory = parseRedisInfo(memoryInfoStr)\n const stats = parseRedisInfo(statsInfoStr)\n\n if (memory.used_memory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'used' },\n parseInt(memory.used_memory, 10) || 0\n )\n }\n if (memory.maxmemory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'max' },\n parseInt(memory.maxmemory, 10) || 0\n )\n }\n\n if (stats.instantaneous_ops_per_sec) {\n this.redisStatsGauge.set(\n { ...labels, operation: 'ops_per_sec' },\n parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n )\n }\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect Redis metrics:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all Redis and push to Prometheus Pushgateway\n * @returns {Promise<void>}\n */\n pushRedisMetrics = async () => {\n try {\n await this.collectRedisMetrics()\n await this.gatewayPush()\n this.clearAllCounters()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for Redis`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n console.error(\n `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n )\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.pushRedisMetrics().catch(err => {\n console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n })\n })\n }\n\n /**\n * Cleanup Redis client and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n try {\n if (!this.redisClient) return\n\n if (\n this.redisClientType === REDIS_V3 ||\n this.redisClientType === REDIS_V4\n ) {\n await this.redisClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n await this.redisClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing Redis client:', err)\n }\n process.exit(0)\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"metricsRedisClient.js","names":["BaseMetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","redisPubSubClient","gracefulShutdownRedis","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","processType","redisClientType","_gracefulShutdownRedis","METRICS_GRACEFUL_SHUTDOWN_REDIS","_gracefulShutdownChannel","appName","_subClient","_setupGracefulShutdownSubscribe","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_redisConnSeenKeys","Set","_redisConnZeroedKeys","_setCleanupHandlers","channel","subClient","duplicate","console","warn","onMessage","cleanup","on","ch","_msg","subscribe","err","count","error","_publishNewInstanceStarted","message","dynoId","done","send_command","sendCommand","then","catch","publish","getRedisConnections","Error","Promise","resolve","reject","result","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","eqIdx","indexOf","k","slice","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","log","length","JSON","stringify","missing","flags","cmd","c","grouped","conn","totMem","key","memory","mem","Number","isFinite","currentKeys","Object","keys","add","has","delete","reset","valueLabels","parse","set","groups","values","groupedTotal","reduce","sum","g","size","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","stopPush","enabled","gatewayDelete","quit","disconnect","exit","module","exports"],"sources":["../../src/metrics/metricsRedisClient.js"],"sourcesContent":["const { BaseMetricsClient } = require('./baseMetricsClient')\nconst {\n getRedisClientType,\n REDIS_V4,\n IOREDIS,\n REDIS_V3,\n} = require('../redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends BaseMetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass RedisMetricsClient extends BaseMetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {any} [options.redisPubSubClient] - Optional dedicated Redis connection for subscribe (required for node-redis; ioredis can use redisClient.duplicate())\n * @param {boolean} [options.gracefulShutdownRedis] - If true, new instance publishes to Redis on start and old instances exit when they receive (set METRICS_GRACEFUL_SHUTDOWN_REDIS=true). Channel scoped by app + process_type so other services are not closed.\n * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n */\n constructor({ redisClient, redisPubSubClient, gracefulShutdownRedis, ...metricsConfig } = {}) {\n const intervalSec =\n metricsConfig.intervalSec ||\n parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n 5\n\n super({\n ...metricsConfig,\n processType: metricsConfig.processType || 'queue-metrics',\n intervalSec,\n })\n\n /** Redis client used for metrics */\n this.redisClient = redisClient\n this.redisClientType = getRedisClientType(redisClient)\n\n /** When true, new instance publishes once to Redis on start; old instances subscribed to same channel exit immediately. Channel = metrics:graceful-shutdown:{app}:{process_type}. Default true; set METRICS_GRACEFUL_SHUTDOWN_REDIS=false or gracefulShutdownRedis: false to disable. */\n this._gracefulShutdownRedis =\n gracefulShutdownRedis !== false && process.env.METRICS_GRACEFUL_SHUTDOWN_REDIS !== 'false'\n this._gracefulShutdownChannel =\n this._gracefulShutdownRedis\n ? `metrics:graceful-shutdown:${this.appName}:${this.processType}`\n : null\n /** Dedicated Redis connection for subscribe (subscriber mode); closed in cleanup. */\n this._subClient = null\n\n if (this._gracefulShutdownRedis && this._gracefulShutdownChannel) {\n this._setupGracefulShutdownSubscribe(redisPubSubClient)\n }\n\n /** Counter for Redis client connections */\n this.redisConnectionsGauge = this.createGauge({\n name: 'app_redis_connections_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n this.redisConnectionsMemoryGauge = this.createGauge({\n name: 'app_redis_connections_memory_usage_count',\n help: 'Redis client connections',\n labelNames: this.withDefaultLabels(redisConnectionStableFields),\n })\n\n /** Gauge for Redis memory usage */\n this.redisMemoryGauge = this.createGauge({\n name: 'app_redis_memory_bytes',\n help: 'Redis memory usage in bytes',\n labelNames: this.withDefaultLabels(['memory_type']),\n })\n\n /** Gauge for Redis operation stats */\n this.redisStatsGauge = this.createGauge({\n name: 'app_redis_stats_total',\n help: 'Redis operation statistics',\n labelNames: this.withDefaultLabels(['operation']),\n })\n\n // Track emitted connection label combinations so we can:\n // - emit a one-shot 0 for series that disappear (overwrite last non-zero sample)\n // - then stop emitting them on subsequent scrapes\n //\n // This is mainly needed because we label connections by `cmd`,\n // and Redis `CLIENT LIST` `cmd` is volatile.\n this._redisConnSeenKeys = new Set()\n this._redisConnZeroedKeys = new Set()\n\n this._setCleanupHandlers()\n }\n\n /**\n * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started → exit.\n * Uses redisPubSubClient if provided, or redisClient.duplicate() when available (e.g. ioredis). Channel is scoped by app + process_type so only same service is affected.\n * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())\n */\n _setupGracefulShutdownSubscribe(redisPubSubClient) {\n const channel = this._gracefulShutdownChannel\n if (!channel) return\n\n let subClient = redisPubSubClient\n if (!subClient && this.redisClient && typeof this.redisClient.duplicate === 'function') {\n subClient = this.redisClient.duplicate()\n }\n if (!subClient) {\n console.warn(\n '[queue-metrics] METRICS_GRACEFUL_SHUTDOWN_REDIS is true but no subscriber connection available. Pass redisPubSubClient or use ioredis (duplicate()).'\n )\n return\n }\n\n this._subClient = subClient\n\n const onMessage = () => {\n console.warn(\n `[queue-metrics] New instance started (channel ${channel}); this instance exiting.`\n )\n this.cleanup()\n }\n\n if (this.redisClientType === REDIS_V3) {\n subClient.on('subscribe', () => {\n console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`)\n })\n subClient.on('message', (ch, _msg) => {\n if (ch === channel) onMessage()\n })\n subClient.subscribe(channel)\n } else if (this.redisClientType === REDIS_V4) {\n subClient.on('subscribe', () => {\n console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`)\n })\n subClient.on('message', (ch, _msg) => {\n if (ch === channel) onMessage()\n })\n subClient.subscribe(channel)\n } else if (this.redisClientType === IOREDIS) {\n subClient.subscribe(channel, (err, count) => {\n if (err) {\n console.error('[queue-metrics] Graceful shutdown subscribe error:', err)\n return\n }\n console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`)\n })\n subClient.on('message', (ch, _msg) => {\n if (ch === channel) onMessage()\n })\n }\n }\n\n /**\n * Publish one-time \"new instance started\" so old instances (subscribed to the same channel) exit. Call from new instance after startPush.\n */\n _publishNewInstanceStarted() {\n if (!this._gracefulShutdownChannel || !this.redisClient) return\n const channel = this._gracefulShutdownChannel\n const message = this.dynoId || '1'\n\n const done = err => {\n if (err) {\n console.warn('[queue-metrics] Graceful shutdown publish failed:', err.message)\n } else {\n console.warn(`[queue-metrics] Published to ${channel} (new instance started).`)\n }\n }\n\n if (this.redisClientType === REDIS_V3) {\n this.redisClient.send_command('PUBLISH', [channel, message], done)\n } else if (this.redisClientType === REDIS_V4) {\n this.redisClient.sendCommand(['PUBLISH', channel, message]).then(() => done()).catch(done)\n } else if (this.redisClientType === IOREDIS) {\n this.redisClient.publish(channel, message).then(() => done()).catch(done)\n }\n }\n\n getRedisConnections = async () => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n if (err) {\n reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n } else resolve(result)\n })\n })\n }\n\n // node-redis v4\n if (this.redisClientType === REDIS_V4) {\n try {\n return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n if (this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.client('LIST')\n } catch (err) {\n throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n getRedisInfo = async section => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 (uses callback)\n if (this.redisClientType === REDIS_V3) {\n return new Promise((resolve, reject) => {\n this.redisClient.info(section, (err, result) => {\n if (err) reject(err)\n else resolve(result)\n })\n })\n }\n\n // node-redis v4 or ioredis (info returns Promise)\n if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n try {\n return this.redisClient.info(section)\n } catch (err) {\n throw new Error(`Failed to get Redis INFO: ${err.message}`)\n }\n }\n\n throw new Error('Unsupported Redis client type')\n }\n\n parseRedisConnections = clientsStr => {\n return clientsStr\n .split('\\n')\n .filter(line => line.trim() !== '')\n .map(line => {\n const parts = line.split(' ')\n const client = {}\n parts.forEach(p => {\n const eqIdx = p.indexOf('=')\n if (eqIdx === -1) return\n const k = p.slice(0, eqIdx)\n const v = p.slice(eqIdx + 1)\n if (redisConnectionFields.includes(k)) {\n client[k] = v\n }\n })\n return client\n })\n }\n\n /**\n * Collect basic Redis INFO metrics: clients, memory, stats\n * @returns {Promise<void>}\n */\n collectRedisMetrics = async () => {\n try {\n const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n await Promise.all([\n this.getRedisInfo('memory'),\n this.getRedisInfo('stats'),\n this.getRedisConnections(),\n ])\n\n const labels = this.getDefaultLabels()\n\n const connections = this.parseRedisConnections(connectionsInfoStr)\n\n if (this.logValues) {\n // \"IN\" data: raw client list from Redis\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw):\\n',\n connectionsInfoStr\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (raw) length:',\n connectionsInfoStr.length\n )\n\n // \"OUT\" data: parsed fields used for metrics\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) count:',\n connections.length\n )\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed sample, first 10):',\n JSON.stringify(connections.slice(0, 10), null, 2)\n )\n\n const missing = { name: 0, flags: 0, cmd: 0, 'tot-mem': 0 }\n connections.forEach(c => {\n if (!c.name) missing.name += 1\n if (!c.flags) missing.flags += 1\n if (!c.cmd) missing.cmd += 1\n if (!c['tot-mem']) missing['tot-mem'] += 1\n })\n console.log(\n '[queue-metrics] Redis CLIENT LIST (parsed) missing fields:',\n missing\n )\n }\n\n const grouped = {}\n connections.forEach(conn => {\n const { name, flags, 'tot-mem': totMem, cmd } = conn\n\n // build grouping key (includes default gauge labels later)\n const key = JSON.stringify({ name, flags, cmd })\n\n if (!grouped[key]) {\n grouped[key] = {\n labels: { name, flags, cmd },\n count: 0,\n memory: 0,\n }\n }\n\n grouped[key].count += 1\n const mem = parseInt(totMem, 10)\n grouped[key].memory += Number.isFinite(mem) ? mem : 0\n })\n\n // Ensure sets exist even if older instance is hot-reloaded.\n if (!this._redisConnSeenKeys) this._redisConnSeenKeys = new Set()\n if (!this._redisConnZeroedKeys) this._redisConnZeroedKeys = new Set()\n\n const currentKeys = new Set(Object.keys(grouped))\n for (const k of currentKeys) {\n this._redisConnSeenKeys.add(k)\n if (this._redisConnZeroedKeys.has(k)) {\n this._redisConnZeroedKeys.delete(k)\n }\n }\n\n // Reset gauges each scrape so we only export:\n // - current snapshot series\n // - one-shot zeros for recently disappeared series\n this.redisConnectionsGauge.reset()\n this.redisConnectionsMemoryGauge.reset()\n\n // Emit one-shot zeros for series that disappeared since last seen.\n for (const k of this._redisConnSeenKeys) {\n if (currentKeys.has(k)) continue\n if (this._redisConnZeroedKeys.has(k)) continue\n try {\n const valueLabels = JSON.parse(k)\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, 0)\n this.redisConnectionsMemoryGauge.set({ ...labels, ...valueLabels }, 0)\n this._redisConnZeroedKeys.add(k)\n } catch {\n // ignore malformed key\n }\n }\n\n if (this.logValues) {\n const groups = Object.values(grouped)\n const groupedTotal = groups.reduce((sum, g) => sum + (g.count || 0), 0)\n console.log(\n '[queue-metrics] Redis connections grouped buckets:',\n groups.length\n )\n console.log(\n '[queue-metrics] Redis connections grouped total:',\n groupedTotal\n )\n console.log(\n '[queue-metrics] Redis connections seen keys:',\n this._redisConnSeenKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections zeroed keys:',\n this._redisConnZeroedKeys.size\n )\n console.log(\n '[queue-metrics] Redis connections grouped sample (first 10):',\n JSON.stringify(groups.slice(0, 10), null, 2)\n )\n }\n\n Object.values(grouped).forEach(\n ({ labels: valueLabels, count, memory }) => {\n this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n this.redisConnectionsMemoryGauge.set(\n { ...labels, ...valueLabels },\n memory\n )\n }\n )\n\n const parseRedisInfo = infoStr =>\n Object.fromEntries(\n infoStr\n .split('\\r\\n')\n .filter(line => line && !line.startsWith('#'))\n .map(line => line.split(':', 2))\n .filter(parts => parts.length === 2 && parts[0] && parts[1])\n )\n\n const memory = parseRedisInfo(memoryInfoStr)\n const stats = parseRedisInfo(statsInfoStr)\n\n if (memory.used_memory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'used' },\n parseInt(memory.used_memory, 10) || 0\n )\n }\n if (memory.maxmemory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'max' },\n parseInt(memory.maxmemory, 10) || 0\n )\n }\n\n if (stats.instantaneous_ops_per_sec) {\n this.redisStatsGauge.set(\n { ...labels, operation: 'ops_per_sec' },\n parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n )\n }\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect Redis metrics:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all Redis and push to Prometheus Pushgateway\n * @returns {Promise<void>}\n */\n pushRedisMetrics = async () => {\n try {\n await this.collectRedisMetrics()\n await this.gatewayPush()\n this.clearAllCounters()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for Redis`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n console.error(\n `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n )\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.pushRedisMetrics().catch(err => {\n console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n })\n })\n if (this._gracefulShutdownRedis) {\n this._publishNewInstanceStarted()\n }\n }\n\n /**\n * Cleanup Redis client and exit process.\n * Stops push, deletes this instance's metrics from VM (if removeOldMetrics), closes subscriber and main Redis, then exits.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n this.stopPush()\n if (this.enabled) {\n await this.gatewayDelete()\n }\n if (this._subClient) {\n try {\n if (this.redisClientType === REDIS_V3) {\n await new Promise((resolve, reject) => {\n if (typeof this._subClient.quit === 'function') {\n this._subClient.quit(err => (err ? reject(err) : resolve()))\n } else resolve()\n })\n } else if (this.redisClientType === REDIS_V4) {\n if (this._subClient.quit) await this._subClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n if (this._subClient.disconnect) await this._subClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing subscriber client:', err)\n }\n this._subClient = null\n }\n try {\n if (!this.redisClient) return\n\n if (\n this.redisClientType === REDIS_V3 ||\n this.redisClientType === REDIS_V4\n ) {\n await this.redisClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n await this.redisClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing Redis client:', err)\n }\n process.exit(0)\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adalo/metrics",
3
- "version": "0.1.156",
3
+ "version": "0.1.157",
4
4
  "description": "Reusable metrics utilities for Node.js and Laravel apps",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -335,6 +335,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
335
335
 
336
336
  /**
337
337
  * Cleanup queues and exit process.
338
+ * Closes queues then runs Redis metrics cleanup (stop push, delete from VM, close Redis).
338
339
  * @returns {Promise<void>}
339
340
  */
340
341
  cleanup = async () => {
@@ -345,7 +346,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
345
346
  console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)
346
347
  }
347
348
  }
348
- process.exit(0)
349
+ await super.cleanup()
349
350
  }
350
351
  }
351
352
 
@@ -19,6 +19,8 @@ class RedisMetricsClient extends BaseMetricsClient {
19
19
  /**
20
20
  * @param {Object} options
21
21
  * @param {any} options.redisClient - Redis client instance (required)
22
+ * @param {any} [options.redisPubSubClient] - Optional dedicated Redis connection for subscribe (required for node-redis; ioredis can use redisClient.duplicate())
23
+ * @param {boolean} [options.gracefulShutdownRedis] - If true, new instance publishes to Redis on start and old instances exit when they receive (set METRICS_GRACEFUL_SHUTDOWN_REDIS=true). Channel scoped by app + process_type so other services are not closed.
22
24
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
23
25
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
24
26
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -31,7 +33,7 @@ class RedisMetricsClient extends BaseMetricsClient {
31
33
  * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
32
34
  * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
33
35
  */
34
- constructor({ redisClient, ...metricsConfig } = {}) {
36
+ constructor({ redisClient, redisPubSubClient, gracefulShutdownRedis, ...metricsConfig } = {}) {
35
37
  const intervalSec =
36
38
  metricsConfig.intervalSec ||
37
39
  parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||
@@ -47,6 +49,20 @@ class RedisMetricsClient extends BaseMetricsClient {
47
49
  this.redisClient = redisClient
48
50
  this.redisClientType = getRedisClientType(redisClient)
49
51
 
52
+ /** When true, new instance publishes once to Redis on start; old instances subscribed to same channel exit immediately. Channel = metrics:graceful-shutdown:{app}:{process_type}. Default true; set METRICS_GRACEFUL_SHUTDOWN_REDIS=false or gracefulShutdownRedis: false to disable. */
53
+ this._gracefulShutdownRedis =
54
+ gracefulShutdownRedis !== false && process.env.METRICS_GRACEFUL_SHUTDOWN_REDIS !== 'false'
55
+ this._gracefulShutdownChannel =
56
+ this._gracefulShutdownRedis
57
+ ? `metrics:graceful-shutdown:${this.appName}:${this.processType}`
58
+ : null
59
+ /** Dedicated Redis connection for subscribe (subscriber mode); closed in cleanup. */
60
+ this._subClient = null
61
+
62
+ if (this._gracefulShutdownRedis && this._gracefulShutdownChannel) {
63
+ this._setupGracefulShutdownSubscribe(redisPubSubClient)
64
+ }
65
+
50
66
  /** Counter for Redis client connections */
51
67
  this.redisConnectionsGauge = this.createGauge({
52
68
  name: 'app_redis_connections_count',
@@ -86,6 +102,90 @@ class RedisMetricsClient extends BaseMetricsClient {
86
102
  this._setCleanupHandlers()
87
103
  }
88
104
 
105
+ /**
106
+ * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started → exit.
107
+ * Uses redisPubSubClient if provided, or redisClient.duplicate() when available (e.g. ioredis). Channel is scoped by app + process_type so only same service is affected.
108
+ * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())
109
+ */
110
+ _setupGracefulShutdownSubscribe(redisPubSubClient) {
111
+ const channel = this._gracefulShutdownChannel
112
+ if (!channel) return
113
+
114
+ let subClient = redisPubSubClient
115
+ if (!subClient && this.redisClient && typeof this.redisClient.duplicate === 'function') {
116
+ subClient = this.redisClient.duplicate()
117
+ }
118
+ if (!subClient) {
119
+ console.warn(
120
+ '[queue-metrics] METRICS_GRACEFUL_SHUTDOWN_REDIS is true but no subscriber connection available. Pass redisPubSubClient or use ioredis (duplicate()).'
121
+ )
122
+ return
123
+ }
124
+
125
+ this._subClient = subClient
126
+
127
+ const onMessage = () => {
128
+ console.warn(
129
+ `[queue-metrics] New instance started (channel ${channel}); this instance exiting.`
130
+ )
131
+ this.cleanup()
132
+ }
133
+
134
+ if (this.redisClientType === REDIS_V3) {
135
+ subClient.on('subscribe', () => {
136
+ console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`)
137
+ })
138
+ subClient.on('message', (ch, _msg) => {
139
+ if (ch === channel) onMessage()
140
+ })
141
+ subClient.subscribe(channel)
142
+ } else if (this.redisClientType === REDIS_V4) {
143
+ subClient.on('subscribe', () => {
144
+ console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`)
145
+ })
146
+ subClient.on('message', (ch, _msg) => {
147
+ if (ch === channel) onMessage()
148
+ })
149
+ subClient.subscribe(channel)
150
+ } else if (this.redisClientType === IOREDIS) {
151
+ subClient.subscribe(channel, (err, count) => {
152
+ if (err) {
153
+ console.error('[queue-metrics] Graceful shutdown subscribe error:', err)
154
+ return
155
+ }
156
+ console.warn(`[queue-metrics] Subscribed to ${channel} (graceful shutdown).`)
157
+ })
158
+ subClient.on('message', (ch, _msg) => {
159
+ if (ch === channel) onMessage()
160
+ })
161
+ }
162
+ }
163
+
164
+ /**
165
+ * Publish one-time "new instance started" so old instances (subscribed to the same channel) exit. Call from new instance after startPush.
166
+ */
167
+ _publishNewInstanceStarted() {
168
+ if (!this._gracefulShutdownChannel || !this.redisClient) return
169
+ const channel = this._gracefulShutdownChannel
170
+ const message = this.dynoId || '1'
171
+
172
+ const done = err => {
173
+ if (err) {
174
+ console.warn('[queue-metrics] Graceful shutdown publish failed:', err.message)
175
+ } else {
176
+ console.warn(`[queue-metrics] Published to ${channel} (new instance started).`)
177
+ }
178
+ }
179
+
180
+ if (this.redisClientType === REDIS_V3) {
181
+ this.redisClient.send_command('PUBLISH', [channel, message], done)
182
+ } else if (this.redisClientType === REDIS_V4) {
183
+ this.redisClient.sendCommand(['PUBLISH', channel, message]).then(() => done()).catch(done)
184
+ } else if (this.redisClientType === IOREDIS) {
185
+ this.redisClient.publish(channel, message).then(() => done()).catch(done)
186
+ }
187
+ }
188
+
89
189
  getRedisConnections = async () => {
90
190
  if (!this.redisClient) throw new Error('Redis client not provided')
91
191
 
@@ -377,13 +477,39 @@ class RedisMetricsClient extends BaseMetricsClient {
377
477
  console.error(`[queue-metrics] Failed to push Redis metrics:`, err)
378
478
  })
379
479
  })
480
+ if (this._gracefulShutdownRedis) {
481
+ this._publishNewInstanceStarted()
482
+ }
380
483
  }
381
484
 
382
485
  /**
383
486
  * Cleanup Redis client and exit process.
487
+ * Stops push, deletes this instance's metrics from VM (if removeOldMetrics), closes subscriber and main Redis, then exits.
384
488
  * @returns {Promise<void>}
385
489
  */
386
490
  cleanup = async () => {
491
+ this.stopPush()
492
+ if (this.enabled) {
493
+ await this.gatewayDelete()
494
+ }
495
+ if (this._subClient) {
496
+ try {
497
+ if (this.redisClientType === REDIS_V3) {
498
+ await new Promise((resolve, reject) => {
499
+ if (typeof this._subClient.quit === 'function') {
500
+ this._subClient.quit(err => (err ? reject(err) : resolve()))
501
+ } else resolve()
502
+ })
503
+ } else if (this.redisClientType === REDIS_V4) {
504
+ if (this._subClient.quit) await this._subClient.quit()
505
+ } else if (this.redisClientType === IOREDIS) {
506
+ if (this._subClient.disconnect) await this._subClient.disconnect()
507
+ }
508
+ } catch (err) {
509
+ console.error('[queue-metrics] Error closing subscriber client:', err)
510
+ }
511
+ this._subClient = null
512
+ }
387
513
  try {
388
514
  if (!this.redisClient) return
389
515