@adalo/metrics 0.1.70 → 0.1.71

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.
Files changed (6) hide show
  1. package/lib/metricsRedisClient.d.ts +2 -2
  2. package/lib/metricsRedisClient.d.ts.map +1 -1
  3. package/lib/metricsRedisClient.js +30 -6
  4. package/lib/metricsRedisClient.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/metricsRedisClient.js +35 -13
package/lib/metricsRedisClient.d.ts CHANGED
@@ -37,8 +37,8 @@ export class RedisMetricsClient extends MetricsClient {
37
37
  /** Redis client used for metrics */
38
38
  redisClient: any;
39
39
  redisClientType: string;
40
- /** Gauge for Redis client connections */
41
- redisConnectionsGauge: import("prom-client").Gauge<string>;
40
+ /** Gauge for Redis client connections count */
41
+ redisConnectionsCountGauge: import("prom-client").Gauge<string>;
42
42
  /** Gauge for Redis memory usage */
43
43
  redisMemoryGauge: import("prom-client").Gauge<string>;
44
44
  /** Gauge for Redis operation stats */
package/lib/metricsRedisClient.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAyC9C;IA1BC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,yCAAyC;IACzC,2DAIE;IAEF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAMJ,wCAYC;IAED,6CAuBC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CA4DzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
1
+ {"version":3,"file":"metricsRedisClient.d.ts","sourceRoot":"","sources":["../src/metricsRedisClient.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAbwB,WAAW,EAAxB,GAAG;QACc,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAgD9C;IAjCC,oCAAoC;IACpC,iBAA8B;IAC9B,wBAAsD;IAEtD,+CAA+C;IAC/C,gEAIE;IASF,mCAAmC;IACnC,sDAIE;IAEF,sCAAsC;IACtC,qDAIE;IAKJ,wCAwBC;IAED,6CAuBC;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAgEzB;IAED;;;OAGG;IACH,wBAFa,QAAQ,IAAI,CAAC,CAoBzB;IAED;;;OAGG;IACH,sDAMC;CA4BF"}
package/lib/metricsRedisClient.js CHANGED
@@ -48,13 +48,20 @@ class RedisMetricsClient extends MetricsClient {
48
48
  this.redisClient = redisClient;
49
49
  this.redisClientType = getRedisClientType(redisClient);
50
50
 
51
- /** Gauge for Redis client connections */
52
- this.redisConnectionsGauge = this.createGauge({
51
+ /** Gauge for Redis client connections count */
52
+ this.redisConnectionsCountGauge = this.createGauge({
53
53
  name: 'app_redis_connections_count',
54
54
  help: 'Number of Redis client connections',
55
55
  labelNames: this.withDefaultLabels(['connection_type'])
56
56
  });
57
57
 
58
+ // /** Gauge for Redis client connections */
59
+ // this.redisConnectionsGauge = this.createGauge({
60
+ // name: 'app_redis_connections',
61
+ // help: 'Redis client connections',
62
+ // labelNames: this.withDefaultLabels(['connection_type']),
63
+ // })
64
+
58
65
  /** Gauge for Redis memory usage */
59
66
  this.redisMemoryGauge = this.createGauge({
60
67
  name: 'app_redis_memory_bytes',
@@ -72,11 +79,25 @@ class RedisMetricsClient extends MetricsClient {
72
79
  }
73
80
  getRedisConnections = async () => {
74
81
  if (!this.redisClient) throw new Error('Redis client not provided');
82
+
83
+ // node-redis v3 – MUST use callback to get the actual result
75
84
  if (this.redisClientType === REDIS_V3) {
76
- return this.redisClient.send_command('CLIENT', ['LIST']);
85
+ return new Promise((resolve, reject) => {
86
+ this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {
87
+ if (err) {
88
+ reject(new Error(`Failed to get CLIENT LIST: ${err.message}`));
89
+ } else resolve(result);
90
+ });
91
+ });
77
92
  }
93
+
94
+ // node-redis v4 or ioredis – Promise API
78
95
  if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {
79
- return this.redisClient.sendCommand(['CLIENT', 'LIST']);
96
+ try {
97
+ return this.redisClient.sendCommand(['CLIENT', 'LIST']);
98
+ } catch (err) {
99
+ throw new Error(`Failed to get CLIENT LIST: ${err.message}`);
100
+ }
80
101
  }
81
102
  throw new Error('Unsupported Redis client type');
82
103
  };
@@ -110,14 +131,17 @@ class RedisMetricsClient extends MetricsClient {
110
131
  collectRedisMetrics = async () => {
111
132
  try {
112
133
  const [clientsInfo, memoryInfo, statsInfo, connections] = await Promise.all([this.getRedisInfo('clients'), this.getRedisInfo('memory'), this.getRedisInfo('stats'), this.getRedisConnections()]);
113
- console.log("connections: ", connections);
134
+ console.log('clientsInfo: ', clientsInfo);
135
+ console.log('memoryInfo: ', memoryInfo);
136
+ console.log('statsInfo: ', statsInfo);
137
+ console.log('connections: ', connections);
114
138
  const labels = this.getDefaultLabels();
115
139
  const parseRedisInfo = infoStr => Object.fromEntries(infoStr.split('\r\n').filter(line => line && !line.startsWith('#')).map(line => line.split(':', 2)).filter(parts => parts.length === 2 && parts[0] && parts[1]));
116
140
  const clients = parseRedisInfo(clientsInfo);
117
141
  const memory = parseRedisInfo(memoryInfo);
118
142
  const stats = parseRedisInfo(statsInfo);
119
143
  if (clients.connected_clients) {
120
- this.redisConnectionsGauge.set({
144
+ this.redisConnectionsCountGauge.set({
121
145
  ...labels,
122
146
  connection_type: 'connected'
123
147
  }, parseInt(clients.connected_clients, 10) || 0);
package/lib/metricsRedisClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","send_command","sendCommand","getRedisInfo","section","Promise","resolve","reject","info","err","result","message","collectRedisMetrics","clientsInfo","memoryInfo","statsInfo","connections","all","console","log","labels","getDefaultLabels","parseRedisInfo","infoStr","Object","fromEntries","split","filter","line","startsWith","map","parts","length","clients","memory","stats","connected_clients","set","connection_type","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n getRedisClientType,\n REDIS_V4,\n IOREDIS,\n REDIS_V3,\n} = require('./redisUtils')\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from MetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n * @param {string} [options.processType] - Process type (from MetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n */\n constructor({ redisClient, ...metricsConfig } = {}) {\n const intervalSec =\n metricsConfig.intervalSec ||\n parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n 5\n\n super({\n ...metricsConfig,\n scripDefaultMetrics: true,\n processType: metricsConfig.processType || 'queue-metrics',\n intervalSec,\n })\n\n /** Redis client used for metrics */\n this.redisClient = redisClient\n this.redisClientType = getRedisClientType(redisClient)\n\n /** Gauge for Redis client connections */\n this.redisConnectionsGauge = this.createGauge({\n name: 'app_redis_connections_count',\n help: 'Number of Redis client connections',\n labelNames: this.withDefaultLabels(['connection_type']),\n })\n\n /** Gauge for Redis memory usage */\n this.redisMemoryGauge = this.createGauge({\n name: 'app_redis_memory_bytes',\n help: 'Redis memory usage in bytes',\n labelNames: this.withDefaultLabels(['memory_type']),\n })\n\n /** Gauge for Redis operation stats */\n this.redisStatsGauge = this.createGauge({\n name: 'app_redis_stats_total',\n help: 'Redis operation statistics',\n labelNames: this.withDefaultLabels(['operation']),\n })\n\n this._setCleanupHandlers()\n }\n\n\n getRedisConnections = async () => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n if (this.redisClientType === REDIS_V3) {\n return this.redisClient.send_command('CLIENT', ['LIST'])\n }\n\n if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n return this.redisClient.sendCommand(['CLIENT', 'LIST'])\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 /**\n * Collect basic Redis INFO metrics: clients, memory, stats\n * @returns {Promise<void>}\n */\n collectRedisMetrics = async () => {\n try {\n const [clientsInfo, memoryInfo, statsInfo, connections] = await Promise.all([\n this.getRedisInfo('clients'),\n this.getRedisInfo('memory'),\n this.getRedisInfo('stats'),\n this.getRedisConnections()\n ])\n\n console.log(\"connections: \", connections)\n\n const labels = this.getDefaultLabels()\n\n const parseRedisInfo = infoStr =>\n Object.fromEntries(\n infoStr\n .split('\\r\\n')\n .filter(line => line && !line.startsWith('#'))\n .map(line => line.split(':', 2))\n .filter(parts => parts.length === 2 && parts[0] && parts[1])\n )\n\n const clients = parseRedisInfo(clientsInfo)\n const memory = parseRedisInfo(memoryInfo)\n const stats = parseRedisInfo(statsInfo)\n\n if (clients.connected_clients) {\n this.redisConnectionsGauge.set(\n { ...labels, connection_type: 'connected' },\n parseInt(clients.connected_clients, 10) || 0\n )\n }\n\n if (memory.used_memory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'used' },\n parseInt(memory.used_memory, 10) || 0\n )\n }\n if (memory.maxmemory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'max' },\n parseInt(memory.maxmemory, 10) || 0\n )\n }\n\n if (stats.instantaneous_ops_per_sec) {\n this.redisStatsGauge.set(\n { ...labels, operation: 'ops_per_sec' },\n parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n )\n }\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect Redis metrics:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all Redis and push to Prometheus Pushgateway\n * @returns {Promise<void>}\n */\n pushRedisMetrics = async () => {\n try {\n await this.collectRedisMetrics()\n await this.gatewayPush()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for Redis`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n console.error(\n `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n )\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.pushRedisMetrics().catch(err => {\n console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n })\n })\n }\n\n /**\n * Cleanup Redis client and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n try {\n if (!this.redisClient) return\n\n if (\n this.redisClientType === REDIS_V3 ||\n this.redisClientType === REDIS_V4\n ) {\n await this.redisClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n await this.redisClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing Redis client:', err)\n }\n process.exit(0)\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsCountGauge","createGauge","name","help","labelNames","withDefaultLabels","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","getRedisInfo","section","info","collectRedisMetrics","clientsInfo","memoryInfo","statsInfo","connections","all","console","log","labels","getDefaultLabels","parseRedisInfo","infoStr","Object","fromEntries","split","filter","line","startsWith","map","parts","length","clients","memory","stats","connected_clients","set","connection_type","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n getRedisClientType,\n REDIS_V4,\n IOREDIS,\n REDIS_V3,\n} = require('./redisUtils')\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n /**\n * @param {Object} options\n * @param {any} options.redisClient - Redis client instance (required)\n * @param {string} [options.appName] - Application name (from MetricsClient)\n * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n * @param {string} [options.processType] - Process type (from MetricsClient)\n * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n */\n constructor({ redisClient, ...metricsConfig } = {}) {\n const intervalSec =\n metricsConfig.intervalSec ||\n parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n 5\n\n super({\n ...metricsConfig,\n scripDefaultMetrics: true,\n processType: metricsConfig.processType || 'queue-metrics',\n intervalSec,\n })\n\n /** Redis client used for metrics */\n this.redisClient = redisClient\n this.redisClientType = getRedisClientType(redisClient)\n\n /** Gauge for Redis client connections count */\n this.redisConnectionsCountGauge = this.createGauge({\n name: 'app_redis_connections_count',\n help: 'Number of Redis client connections',\n labelNames: this.withDefaultLabels(['connection_type']),\n })\n\n // /** Gauge for Redis client connections */\n // this.redisConnectionsGauge = this.createGauge({\n // name: 'app_redis_connections',\n // help: 'Redis client connections',\n // labelNames: this.withDefaultLabels(['connection_type']),\n // })\n\n /** Gauge for Redis memory usage */\n this.redisMemoryGauge = this.createGauge({\n name: 'app_redis_memory_bytes',\n help: 'Redis memory usage in bytes',\n labelNames: this.withDefaultLabels(['memory_type']),\n })\n\n /** Gauge for Redis operation stats */\n this.redisStatsGauge = this.createGauge({\n name: 'app_redis_stats_total',\n help: 'Redis operation statistics',\n labelNames: this.withDefaultLabels(['operation']),\n })\n\n this._setCleanupHandlers()\n }\n\n getRedisConnections = async () => {\n if (!this.redisClient) throw new Error('Redis client not provided')\n\n // node-redis v3 – MUST use callback to get the actual result\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 or ioredis – Promise API\n if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\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 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 /**\n * Collect basic Redis INFO metrics: clients, memory, stats\n * @returns {Promise<void>}\n */\n collectRedisMetrics = async () => {\n try {\n const [clientsInfo, memoryInfo, statsInfo, connections] =\n await Promise.all([\n this.getRedisInfo('clients'),\n this.getRedisInfo('memory'),\n this.getRedisInfo('stats'),\n this.getRedisConnections(),\n ])\n\n console.log('clientsInfo: ', clientsInfo)\n console.log('memoryInfo: ', memoryInfo)\n console.log('statsInfo: ', statsInfo)\n console.log('connections: ', connections)\n\n const labels = this.getDefaultLabels()\n\n const parseRedisInfo = infoStr =>\n Object.fromEntries(\n infoStr\n .split('\\r\\n')\n .filter(line => line && !line.startsWith('#'))\n .map(line => line.split(':', 2))\n .filter(parts => parts.length === 2 && parts[0] && parts[1])\n )\n\n const clients = parseRedisInfo(clientsInfo)\n const memory = parseRedisInfo(memoryInfo)\n const stats = parseRedisInfo(statsInfo)\n\n if (clients.connected_clients) {\n this.redisConnectionsCountGauge.set(\n { ...labels, connection_type: 'connected' },\n parseInt(clients.connected_clients, 10) || 0\n )\n }\n\n if (memory.used_memory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'used' },\n parseInt(memory.used_memory, 10) || 0\n )\n }\n if (memory.maxmemory) {\n this.redisMemoryGauge.set(\n { ...labels, memory_type: 'max' },\n parseInt(memory.maxmemory, 10) || 0\n )\n }\n\n if (stats.instantaneous_ops_per_sec) {\n this.redisStatsGauge.set(\n { ...labels, operation: 'ops_per_sec' },\n parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n )\n }\n } catch (error) {\n console.warn(\n `[queue-metrics] Failed to collect Redis metrics:`,\n error.message\n )\n }\n }\n\n /**\n * Collect metrics for all Redis and push to Prometheus Pushgateway\n * @returns {Promise<void>}\n */\n pushRedisMetrics = async () => {\n try {\n await this.collectRedisMetrics()\n await this.gatewayPush()\n\n if (this.metricsLogValues) {\n const metricObjects = await this.registry.getMetricsAsJSON()\n console.info(\n `[queue-metrics] Collected metrics for Redis`,\n JSON.stringify(metricObjects, null, 2)\n )\n }\n } catch (error) {\n console.error(\n `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n )\n throw error\n }\n }\n\n /**\n * Start periodic collection.\n * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n */\n startPush = (intervalSec = this.intervalSec) => {\n this._startPush(intervalSec, () => {\n this.pushRedisMetrics().catch(err => {\n console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n })\n })\n }\n\n /**\n * Cleanup Redis client and exit process.\n * @returns {Promise<void>}\n */\n cleanup = async () => {\n try {\n if (!this.redisClient) return\n\n if (\n this.redisClientType === REDIS_V3 ||\n this.redisClientType === REDIS_V4\n ) {\n await this.redisClient.quit()\n } else if (this.redisClientType === IOREDIS) {\n await this.redisClient.disconnect()\n }\n } catch (err) {\n console.error('[queue-metrics] Error closing Redis client:', err)\n }\n process.exit(0)\n }\n\n _setCleanupHandlers = () => {\n process.on('SIGINT', this.cleanup)\n process.on('SIGTERM', this.cleanup)\n }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adalo/metrics",
3
- "version": "0.1.70",
3
+ "version": "0.1.71",
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",
package/src/metricsRedisClient.js CHANGED
@@ -45,13 +45,20 @@ class RedisMetricsClient extends MetricsClient {
45
45
  this.redisClient = redisClient
46
46
  this.redisClientType = getRedisClientType(redisClient)
47
47
 
48
- /** Gauge for Redis client connections */
49
- this.redisConnectionsGauge = this.createGauge({
48
+ /** Gauge for Redis client connections count */
49
+ this.redisConnectionsCountGauge = this.createGauge({
50
50
  name: 'app_redis_connections_count',
51
51
  help: 'Number of Redis client connections',
52
52
  labelNames: this.withDefaultLabels(['connection_type']),
53
53
  })
54
54
 
55
+ // /** Gauge for Redis client connections */
56
+ // this.redisConnectionsGauge = this.createGauge({
57
+ // name: 'app_redis_connections',
58
+ // help: 'Redis client connections',
59
+ // labelNames: this.withDefaultLabels(['connection_type']),
60
+ // })
61
+
55
62
  /** Gauge for Redis memory usage */
56
63
  this.redisMemoryGauge = this.createGauge({
57
64
  name: 'app_redis_memory_bytes',
@@ -69,16 +76,27 @@ class RedisMetricsClient extends MetricsClient {
69
76
  this._setCleanupHandlers()
70
77
  }
71
78
 
72
-
73
79
  getRedisConnections = async () => {
74
80
  if (!this.redisClient) throw new Error('Redis client not provided')
75
81
 
82
+ // node-redis v3 – MUST use callback to get the actual result
76
83
  if (this.redisClientType === REDIS_V3) {
77
- return this.redisClient.send_command('CLIENT', ['LIST'])
84
+ return new Promise((resolve, reject) => {
85
+ this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {
86
+ if (err) {
87
+ reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))
88
+ } else resolve(result)
89
+ })
90
+ })
78
91
  }
79
92
 
93
+ // node-redis v4 or ioredis – Promise API
80
94
  if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {
81
- return this.redisClient.sendCommand(['CLIENT', 'LIST'])
95
+ try {
96
+ return this.redisClient.sendCommand(['CLIENT', 'LIST'])
97
+ } catch (err) {
98
+ throw new Error(`Failed to get CLIENT LIST: ${err.message}`)
99
+ }
82
100
  }
83
101
 
84
102
  throw new Error('Unsupported Redis client type')
@@ -115,14 +133,18 @@ class RedisMetricsClient extends MetricsClient {
115
133
  */
116
134
  collectRedisMetrics = async () => {
117
135
  try {
118
- const [clientsInfo, memoryInfo, statsInfo, connections] = await Promise.all([
119
- this.getRedisInfo('clients'),
120
- this.getRedisInfo('memory'),
121
- this.getRedisInfo('stats'),
122
- this.getRedisConnections()
123
- ])
136
+ const [clientsInfo, memoryInfo, statsInfo, connections] =
137
+ await Promise.all([
138
+ this.getRedisInfo('clients'),
139
+ this.getRedisInfo('memory'),
140
+ this.getRedisInfo('stats'),
141
+ this.getRedisConnections(),
142
+ ])
124
143
 
125
- console.log("connections: ", connections)
144
+ console.log('clientsInfo: ', clientsInfo)
145
+ console.log('memoryInfo: ', memoryInfo)
146
+ console.log('statsInfo: ', statsInfo)
147
+ console.log('connections: ', connections)
126
148
 
127
149
  const labels = this.getDefaultLabels()
128
150
 
@@ -140,7 +162,7 @@ class RedisMetricsClient extends MetricsClient {
140
162
  const stats = parseRedisInfo(statsInfo)
141
163
 
142
164
  if (clients.connected_clients) {
143
- this.redisConnectionsGauge.set(
165
+ this.redisConnectionsCountGauge.set(
144
166
  { ...labels, connection_type: 'connected' },
145
167
  parseInt(clients.connected_clients, 10) || 0
146
168
  )