@adalo/metrics 0.1.159 → 0.1.161

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.
@@ -5,35 +5,6 @@
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
- });
37
8
  getConfiguredQueueNames: () => string[];
38
9
  startupValidation: () => boolean;
39
10
  /** 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;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"}
1
+ {"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAiEI,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"}
@@ -19,6 +19,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
19
19
  /**
20
20
  * @param {Object} options
21
21
  * @param {any} options.redisClient - Redis client instance (required)
22
+ * @param {boolean} [options.gracefulShutdownRedis] - Passed to RedisMetricsClient
22
23
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
23
24
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
24
25
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -33,7 +34,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
33
34
  */
34
35
  constructor({
35
36
  redisClient,
36
- metricsConfig = {}
37
+ ...metricsConfig
37
38
  } = {}) {
38
39
  const getConfiguredQueueNames = () => {
39
40
  if (!process.env.METRICS_APP_REDIS_BQ) {
@@ -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","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":[]}
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 {boolean} [options.gracefulShutdownRedis] - Passed to RedisMetricsClient\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":[]}
@@ -7,9 +7,8 @@
7
7
  export class RedisMetricsClient extends BaseMetricsClient {
8
8
  /**
9
9
  * @param {Object} options
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.
10
+ * @param {any} options.redisClient - Redis client instance (required). Used for metrics and publish. Subscriber is created internally (duplicate() or REDIS_URL).
11
+ * @param {boolean} [options.gracefulShutdownRedis] - Default true. When true, new instance publishes on start and old instances exit on message. Set false or METRICS_GRACEFUL_SHUTDOWN_REDIS=false to disable.
13
12
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
14
13
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
15
14
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -22,9 +21,8 @@ export class RedisMetricsClient extends BaseMetricsClient {
22
21
  * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
23
22
  * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
24
23
  */
25
- constructor({ redisClient, redisPubSubClient, gracefulShutdownRedis, ...metricsConfig }?: {
24
+ constructor({ redisClient, gracefulShutdownRedis, ...metricsConfig }?: {
26
25
  redisClient: any;
27
- redisPubSubClient?: any;
28
26
  gracefulShutdownRedis?: boolean | undefined;
29
27
  appName?: string | undefined;
30
28
  dynoId?: string | undefined;
@@ -57,11 +55,9 @@ export class RedisMetricsClient extends BaseMetricsClient {
57
55
  _redisConnSeenKeys: Set<any>;
58
56
  _redisConnZeroedKeys: Set<any>;
59
57
  /**
60
- * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started exit.
61
- * 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.
62
- * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())
58
+ * Set up Redis subscribe for graceful shutdown. Uses one connection: either redisClient.duplicate() (ioredis) or a client created from REDIS_URL (node-redis). Caller passes only redisClient.
63
59
  */
64
- _setupGracefulShutdownSubscribe(redisPubSubClient?: any): void;
60
+ _setupGracefulShutdownSubscribe(): void;
65
61
  /**
66
62
  * Publish one-time "new instance started" so old instances (subscribed to the same channel) exit. Call from new instance after startPush.
67
63
  */
@@ -1 +1 @@
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;OA8E9C;IA/DC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAKtD,gCAAgE;IAChE,wCAGU;IACV,qFAAqF;IACrF,gBAAsB;IAEtB,gGAAgG;IAChG,mCAAgH;IAUhH,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAQF,6BAAmC;IACnC,+BAAqC;IAKvC;;;;OAIG;IACH,oDAFW,GAAG,QAoEb;IAED;;OAEG;IACH,mCA6BC;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"}
1
+ {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsRedisClient.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;OAeG;IACH;QAdwB,WAAW,EAAxB,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;OA8E9C;IA/DC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAKtD,gCAAgE;IAChE,wCAGU;IACV,qFAAqF;IACrF,gBAAsB;IAEtB,gGAAgG;IAChG,mCAAgH;IAUhH,2CAA2C;IAC3C,2DAIE;IAEF,iEAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAQF,6BAAmC;IACnC,+BAAqC;IAKvC;;OAEG;IACH,wCAuFC;IAED;;OAEG;IACH,mCA6BC;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"}
@@ -21,9 +21,8 @@ const redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd'];
21
21
  class RedisMetricsClient extends BaseMetricsClient {
22
22
  /**
23
23
  * @param {Object} options
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.
24
+ * @param {any} options.redisClient - Redis client instance (required). Used for metrics and publish. Subscriber is created internally (duplicate() or REDIS_URL).
25
+ * @param {boolean} [options.gracefulShutdownRedis] - Default true. When true, new instance publishes on start and old instances exit on message. Set false or METRICS_GRACEFUL_SHUTDOWN_REDIS=false to disable.
27
26
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
28
27
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
29
28
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -38,7 +37,6 @@ class RedisMetricsClient extends BaseMetricsClient {
38
37
  */
39
38
  constructor({
40
39
  redisClient,
41
- redisPubSubClient,
42
40
  gracefulShutdownRedis,
43
41
  ...metricsConfig
44
42
  } = {}) {
@@ -64,9 +62,9 @@ class RedisMetricsClient extends BaseMetricsClient {
64
62
 
65
63
  /** Log prefix for graceful-shutdown messages (always logged, not behind METRICS_LOG_VALUES). */
66
64
  this._gracefulShutdownLogPrefix = `[graceful-shutdown] [${this.processType}] [${this.appName}] [${this.dynoId}]`;
67
- console.info(`${this._gracefulShutdownLogPrefix} startup: graceful_shutdown_redis=${this._gracefulShutdownRedis} channel=${this._gracefulShutdownChannel || 'none'} redisPubSubClient=${redisPubSubClient ? 'yes' : 'no'} redisClient.duplicate=${typeof this.redisClient?.duplicate === 'function' ? 'yes' : 'no'}`);
65
+ console.info(`${this._gracefulShutdownLogPrefix} startup: graceful_shutdown_redis=${this._gracefulShutdownRedis} channel=${this._gracefulShutdownChannel || 'none'}`);
68
66
  if (this._gracefulShutdownRedis && this._gracefulShutdownChannel) {
69
- this._setupGracefulShutdownSubscribe(redisPubSubClient);
67
+ this._setupGracefulShutdownSubscribe();
70
68
  }
71
69
 
72
70
  /** Counter for Redis client connections */
@@ -107,22 +105,36 @@ class RedisMetricsClient extends BaseMetricsClient {
107
105
  }
108
106
 
109
107
  /**
110
- * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started exit.
111
- * 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.
112
- * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())
108
+ * Set up Redis subscribe for graceful shutdown. Uses one connection: either redisClient.duplicate() (ioredis) or a client created from REDIS_URL (node-redis). Caller passes only redisClient.
113
109
  */
114
- _setupGracefulShutdownSubscribe(redisPubSubClient) {
110
+ _setupGracefulShutdownSubscribe() {
115
111
  const channel = this._gracefulShutdownChannel;
116
112
  if (!channel) return;
117
- let subClient = redisPubSubClient;
118
- if (!subClient && this.redisClient && typeof this.redisClient.duplicate === 'function') {
113
+ let subClient = null;
114
+ if (this.redisClient && typeof this.redisClient.duplicate === 'function') {
119
115
  subClient = this.redisClient.duplicate();
116
+ console.info(`${this._gracefulShutdownLogPrefix} setup_subscribe: using redisClient.duplicate() for channel=${channel}`);
117
+ } else if (process.env.REDIS_URL) {
118
+ try {
119
+ const redis = require('redis');
120
+ subClient = redis.createClient({
121
+ url: process.env.REDIS_URL
122
+ });
123
+ if (subClient && typeof subClient.on === 'function') {
124
+ subClient.on('error', err => {
125
+ console.error(`${this._gracefulShutdownLogPrefix} subscriber client error:`, err.message);
126
+ });
127
+ }
128
+ console.info(`${this._gracefulShutdownLogPrefix} setup_subscribe: created subscriber from REDIS_URL for channel=${channel}`);
129
+ } catch (e) {
130
+ console.info(`${this._gracefulShutdownLogPrefix} setup_subscribe: could not create subscriber from REDIS_URL:`, e.message);
131
+ }
120
132
  }
121
- console.info(`${this._gracefulShutdownLogPrefix} setup_subscribe: channel=${channel} hasSubClient=${!!subClient}`);
122
133
  if (!subClient) {
123
- console.info(`${this._gracefulShutdownLogPrefix} No subscriber connection (pass redisPubSubClient or use ioredis). Graceful shutdown via Redis disabled.`);
134
+ console.info(`${this._gracefulShutdownLogPrefix} No subscriber (need ioredis or REDIS_URL). Graceful shutdown via Redis disabled.`);
124
135
  return;
125
136
  }
137
+ console.info(`${this._gracefulShutdownLogPrefix} setup_subscribe: channel=${channel} hasSubClient=true`);
126
138
  this._subClient = subClient;
127
139
  const onMessage = () => {
128
140
  console.info(`${this._gracefulShutdownLogPrefix} OLD: received new-instance message on channel ${channel}; exiting.`);
@@ -1 +1 @@
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","skipFirstPush","redisClientType","disabledByParam","disabledByEnv","METRICS_GRACEFUL_SHUTDOWN_REDIS","_gracefulShutdownRedis","_gracefulShutdownChannel","appName","_subClient","_gracefulShutdownLogPrefix","dynoId","console","info","duplicate","_setupGracefulShutdownSubscribe","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_redisConnSeenKeys","Set","_redisConnZeroedKeys","_setCleanupHandlers","channel","subClient","onMessage","cleanup","on","ch","_msg","subscribe","err","count","error","_publishNewInstanceStarted","message","done","send_command","sendCommand","then","catch","publish","getRedisConnections","Error","Promise","resolve","reject","result","client","getRedisInfo","section","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 skipFirstPush: metricsConfig.skipFirstPush !== false,\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 const disabledByParam = gracefulShutdownRedis === false\n const disabledByEnv = process.env.METRICS_GRACEFUL_SHUTDOWN_REDIS === 'false'\n this._gracefulShutdownRedis = !disabledByParam && !disabledByEnv\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 /** Log prefix for graceful-shutdown messages (always logged, not behind METRICS_LOG_VALUES). */\n this._gracefulShutdownLogPrefix = `[graceful-shutdown] [${this.processType}] [${this.appName}] [${this.dynoId}]`\n\n console.info(\n `${this._gracefulShutdownLogPrefix} startup: graceful_shutdown_redis=${this._gracefulShutdownRedis} channel=${this._gracefulShutdownChannel || 'none'} redisPubSubClient=${redisPubSubClient ? 'yes' : 'no'} redisClient.duplicate=${typeof this.redisClient?.duplicate === 'function' ? 'yes' : 'no'}`\n )\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\n console.info(\n `${this._gracefulShutdownLogPrefix} setup_subscribe: channel=${channel} hasSubClient=${!!subClient}`\n )\n\n if (!subClient) {\n console.info(\n `${this._gracefulShutdownLogPrefix} No subscriber connection (pass redisPubSubClient or use ioredis). Graceful shutdown via Redis disabled.`\n )\n return\n }\n\n this._subClient = subClient\n\n const onMessage = () => {\n console.info(\n `${this._gracefulShutdownLogPrefix} OLD: received new-instance message on channel ${channel}; exiting.`\n )\n this.cleanup()\n }\n\n if (this.redisClientType === REDIS_V3) {\n subClient.on('subscribe', () => {\n console.info(\n `${this._gracefulShutdownLogPrefix} Subscribed to channel=${channel} (waiting for new-instance message).`\n )\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.info(\n `${this._gracefulShutdownLogPrefix} Subscribed to channel=${channel} (waiting for new-instance message).`\n )\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(\n `${this._gracefulShutdownLogPrefix} Subscribe error:`,\n err\n )\n return\n }\n console.info(\n `${this._gracefulShutdownLogPrefix} Subscribed to channel=${channel} (waiting for new-instance message).`\n )\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.info(\n `${this._gracefulShutdownLogPrefix} NEW: publish failed:`,\n err.message\n )\n } else {\n console.info(\n `${this._gracefulShutdownLogPrefix} NEW: published to channel=${channel} (new instance started; old instances will exit).`\n )\n }\n }\n\n console.info(\n `${this._gracefulShutdownLogPrefix} NEW: publishing to channel=${channel} dynoId=${this.dynoId || '1'}`\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.info(\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":[]}
1
+ {"version":3,"file":"metricsRedisClient.js","names":["BaseMetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","gracefulShutdownRedis","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","processType","skipFirstPush","redisClientType","disabledByParam","disabledByEnv","METRICS_GRACEFUL_SHUTDOWN_REDIS","_gracefulShutdownRedis","_gracefulShutdownChannel","appName","_subClient","_gracefulShutdownLogPrefix","dynoId","console","info","_setupGracefulShutdownSubscribe","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_redisConnSeenKeys","Set","_redisConnZeroedKeys","_setCleanupHandlers","channel","subClient","duplicate","REDIS_URL","redis","createClient","url","on","err","error","message","e","onMessage","cleanup","ch","_msg","subscribe","count","_publishNewInstanceStarted","done","send_command","sendCommand","then","catch","publish","getRedisConnections","Error","Promise","resolve","reject","result","client","getRedisInfo","section","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). Used for metrics and publish. Subscriber is created internally (duplicate() or REDIS_URL).\n * @param {boolean} [options.gracefulShutdownRedis] - Default true. When true, new instance publishes on start and old instances exit on message. Set false or METRICS_GRACEFUL_SHUTDOWN_REDIS=false to disable.\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, 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 skipFirstPush: metricsConfig.skipFirstPush !== false,\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 const disabledByParam = gracefulShutdownRedis === false\n const disabledByEnv = process.env.METRICS_GRACEFUL_SHUTDOWN_REDIS === 'false'\n this._gracefulShutdownRedis = !disabledByParam && !disabledByEnv\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 /** Log prefix for graceful-shutdown messages (always logged, not behind METRICS_LOG_VALUES). */\n this._gracefulShutdownLogPrefix = `[graceful-shutdown] [${this.processType}] [${this.appName}] [${this.dynoId}]`\n\n console.info(\n `${this._gracefulShutdownLogPrefix} startup: graceful_shutdown_redis=${this._gracefulShutdownRedis} channel=${this._gracefulShutdownChannel || 'none'}`\n )\n\n if (this._gracefulShutdownRedis && this._gracefulShutdownChannel) {\n this._setupGracefulShutdownSubscribe()\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. Uses one connection: either redisClient.duplicate() (ioredis) or a client created from REDIS_URL (node-redis). Caller passes only redisClient.\n */\n _setupGracefulShutdownSubscribe() {\n const channel = this._gracefulShutdownChannel\n if (!channel) return\n\n let subClient = null\n if (this.redisClient && typeof this.redisClient.duplicate === 'function') {\n subClient = this.redisClient.duplicate()\n console.info(\n `${this._gracefulShutdownLogPrefix} setup_subscribe: using redisClient.duplicate() for channel=${channel}`\n )\n } else if (process.env.REDIS_URL) {\n try {\n const redis = require('redis')\n subClient = redis.createClient({ url: process.env.REDIS_URL })\n if (subClient && typeof subClient.on === 'function') {\n subClient.on('error', err => {\n console.error(`${this._gracefulShutdownLogPrefix} subscriber client error:`, err.message)\n })\n }\n console.info(\n `${this._gracefulShutdownLogPrefix} setup_subscribe: created subscriber from REDIS_URL for channel=${channel}`\n )\n } catch (e) {\n console.info(\n `${this._gracefulShutdownLogPrefix} setup_subscribe: could not create subscriber from REDIS_URL:`,\n e.message\n )\n }\n }\n\n if (!subClient) {\n console.info(\n `${this._gracefulShutdownLogPrefix} No subscriber (need ioredis or REDIS_URL). Graceful shutdown via Redis disabled.`\n )\n return\n }\n\n console.info(\n `${this._gracefulShutdownLogPrefix} setup_subscribe: channel=${channel} hasSubClient=true`\n )\n\n this._subClient = subClient\n\n const onMessage = () => {\n console.info(\n `${this._gracefulShutdownLogPrefix} OLD: received new-instance message on channel ${channel}; exiting.`\n )\n this.cleanup()\n }\n\n if (this.redisClientType === REDIS_V3) {\n subClient.on('subscribe', () => {\n console.info(\n `${this._gracefulShutdownLogPrefix} Subscribed to channel=${channel} (waiting for new-instance message).`\n )\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.info(\n `${this._gracefulShutdownLogPrefix} Subscribed to channel=${channel} (waiting for new-instance message).`\n )\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(\n `${this._gracefulShutdownLogPrefix} Subscribe error:`,\n err\n )\n return\n }\n console.info(\n `${this._gracefulShutdownLogPrefix} Subscribed to channel=${channel} (waiting for new-instance message).`\n )\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.info(\n `${this._gracefulShutdownLogPrefix} NEW: publish failed:`,\n err.message\n )\n } else {\n console.info(\n `${this._gracefulShutdownLogPrefix} NEW: published to channel=${channel} (new instance started; old instances will exit).`\n )\n }\n }\n\n console.info(\n `${this._gracefulShutdownLogPrefix} NEW: publishing to channel=${channel} dynoId=${this.dynoId || '1'}`\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.info(\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.159",
3
+ "version": "0.1.161",
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",
@@ -11,6 +11,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
11
11
  /**
12
12
  * @param {Object} options
13
13
  * @param {any} options.redisClient - Redis client instance (required)
14
+ * @param {boolean} [options.gracefulShutdownRedis] - Passed to RedisMetricsClient
14
15
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
15
16
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
16
17
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -23,7 +24,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
23
24
  * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
24
25
  * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
25
26
  */
26
- constructor({ redisClient, metricsConfig = {} } = {}) {
27
+ constructor({ redisClient, ...metricsConfig } = {}) {
27
28
  const getConfiguredQueueNames = () => {
28
29
  if (!process.env.METRICS_APP_REDIS_BQ) {
29
30
  throw new Error(
@@ -18,9 +18,8 @@ const redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']
18
18
  class RedisMetricsClient extends BaseMetricsClient {
19
19
  /**
20
20
  * @param {Object} options
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.
21
+ * @param {any} options.redisClient - Redis client instance (required). Used for metrics and publish. Subscriber is created internally (duplicate() or REDIS_URL).
22
+ * @param {boolean} [options.gracefulShutdownRedis] - Default true. When true, new instance publishes on start and old instances exit on message. Set false or METRICS_GRACEFUL_SHUTDOWN_REDIS=false to disable.
24
23
  * @param {string} [options.appName] - Application name (from BaseMetricsClient)
25
24
  * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
26
25
  * @param {string} [options.processType] - Process type (from BaseMetricsClient)
@@ -33,7 +32,7 @@ class RedisMetricsClient extends BaseMetricsClient {
33
32
  * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
34
33
  * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)
35
34
  */
36
- constructor({ redisClient, redisPubSubClient, gracefulShutdownRedis, ...metricsConfig } = {}) {
35
+ constructor({ redisClient, gracefulShutdownRedis, ...metricsConfig } = {}) {
37
36
  const intervalSec =
38
37
  metricsConfig.intervalSec ||
39
38
  parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||
@@ -65,11 +64,11 @@ class RedisMetricsClient extends BaseMetricsClient {
65
64
  this._gracefulShutdownLogPrefix = `[graceful-shutdown] [${this.processType}] [${this.appName}] [${this.dynoId}]`
66
65
 
67
66
  console.info(
68
- `${this._gracefulShutdownLogPrefix} startup: graceful_shutdown_redis=${this._gracefulShutdownRedis} channel=${this._gracefulShutdownChannel || 'none'} redisPubSubClient=${redisPubSubClient ? 'yes' : 'no'} redisClient.duplicate=${typeof this.redisClient?.duplicate === 'function' ? 'yes' : 'no'}`
67
+ `${this._gracefulShutdownLogPrefix} startup: graceful_shutdown_redis=${this._gracefulShutdownRedis} channel=${this._gracefulShutdownChannel || 'none'}`
69
68
  )
70
69
 
71
70
  if (this._gracefulShutdownRedis && this._gracefulShutdownChannel) {
72
- this._setupGracefulShutdownSubscribe(redisPubSubClient)
71
+ this._setupGracefulShutdownSubscribe()
73
72
  }
74
73
 
75
74
  /** Counter for Redis client connections */
@@ -112,30 +111,49 @@ class RedisMetricsClient extends BaseMetricsClient {
112
111
  }
113
112
 
114
113
  /**
115
- * Set up Redis subscribe for graceful shutdown: when we receive a message on the channel, another instance started exit.
116
- * 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.
117
- * @param {any} [redisPubSubClient] - Dedicated connection for subscribe (required for node-redis; ioredis can use duplicate())
114
+ * Set up Redis subscribe for graceful shutdown. Uses one connection: either redisClient.duplicate() (ioredis) or a client created from REDIS_URL (node-redis). Caller passes only redisClient.
118
115
  */
119
- _setupGracefulShutdownSubscribe(redisPubSubClient) {
116
+ _setupGracefulShutdownSubscribe() {
120
117
  const channel = this._gracefulShutdownChannel
121
118
  if (!channel) return
122
119
 
123
- let subClient = redisPubSubClient
124
- if (!subClient && this.redisClient && typeof this.redisClient.duplicate === 'function') {
120
+ let subClient = null
121
+ if (this.redisClient && typeof this.redisClient.duplicate === 'function') {
125
122
  subClient = this.redisClient.duplicate()
123
+ console.info(
124
+ `${this._gracefulShutdownLogPrefix} setup_subscribe: using redisClient.duplicate() for channel=${channel}`
125
+ )
126
+ } else if (process.env.REDIS_URL) {
127
+ try {
128
+ const redis = require('redis')
129
+ subClient = redis.createClient({ url: process.env.REDIS_URL })
130
+ if (subClient && typeof subClient.on === 'function') {
131
+ subClient.on('error', err => {
132
+ console.error(`${this._gracefulShutdownLogPrefix} subscriber client error:`, err.message)
133
+ })
134
+ }
135
+ console.info(
136
+ `${this._gracefulShutdownLogPrefix} setup_subscribe: created subscriber from REDIS_URL for channel=${channel}`
137
+ )
138
+ } catch (e) {
139
+ console.info(
140
+ `${this._gracefulShutdownLogPrefix} setup_subscribe: could not create subscriber from REDIS_URL:`,
141
+ e.message
142
+ )
143
+ }
126
144
  }
127
145
 
128
- console.info(
129
- `${this._gracefulShutdownLogPrefix} setup_subscribe: channel=${channel} hasSubClient=${!!subClient}`
130
- )
131
-
132
146
  if (!subClient) {
133
147
  console.info(
134
- `${this._gracefulShutdownLogPrefix} No subscriber connection (pass redisPubSubClient or use ioredis). Graceful shutdown via Redis disabled.`
148
+ `${this._gracefulShutdownLogPrefix} No subscriber (need ioredis or REDIS_URL). Graceful shutdown via Redis disabled.`
135
149
  )
136
150
  return
137
151
  }
138
152
 
153
+ console.info(
154
+ `${this._gracefulShutdownLogPrefix} setup_subscribe: channel=${channel} hasSubClient=true`
155
+ )
156
+
139
157
  this._subClient = subClient
140
158
 
141
159
  const onMessage = () => {