@adalo/metrics 0.1.113 → 0.1.115

package/src/metricsRedisClient.js

@@ -1,4 +1,4 @@
-const { MetricsClient } = require('.')
+const { BaseMetricsClient } = require('./baseMetricsClient')
 const {
   getRedisClientType,
   REDIS_V4,
@@ -10,26 +10,25 @@ const redisConnectionStableFields = ['name', 'flags', 'cmd']
 const redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']
 
 /**
- * RedisMetricsClient extends MetricsClient to collect
+ * RedisMetricsClient extends BaseMetricsClient to collect
  * Redis metrics periodically and push them to Prometheus Pushgateway.
  *
- * @extends MetricsClient
+ * @extends BaseMetricsClient
  */
-class RedisMetricsClient extends MetricsClient {
+class RedisMetricsClient extends BaseMetricsClient {
   /**
    * @param {Object} options
    * @param {any} options.redisClient - Redis client instance (required)
-   * @param {string} [options.appName] - Application name (from MetricsClient)
-   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)
-   * @param {string} [options.processType] - Process type (from MetricsClient)
-   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)
-   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)
-   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)
-   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)
-   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)
-   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)
-   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)
-   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)
+   * @param {string} [options.appName] - Application name (from BaseMetricsClient)
+   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)
+   * @param {string} [options.processType] - Process type (from BaseMetricsClient)
+   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)
+   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)
+   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)
+   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)
+   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)
+   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)
+   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)
    */
   constructor({ redisClient, ...metricsConfig } = {}) {
     const intervalSec =
@@ -39,7 +38,6 @@ class RedisMetricsClient extends MetricsClient {
 
     super({
       ...metricsConfig,
-      scripDefaultMetrics: true,
       processType: metricsConfig.processType || 'queue-metrics',
       intervalSec,
     })
@@ -142,14 +140,10 @@ class RedisMetricsClient extends MetricsClient {
       .split('\n')
       .filter(line => line.trim() !== '')
       .map(line => {
-        console.log("parseRedisConnections line: ", line)
         const parts = line.split(' ')
         const client = {}
-        console.log("parseRedisConnections parts: ", parts)
-
         parts.forEach(p => {
           const [k, v] = p.split('=')
-          console.log("parseRedisConnections part includes: ", redisConnectionFields.includes(k))
           if (redisConnectionFields.includes(k)) {
             client[k] = v
           }
@@ -182,14 +176,14 @@ class RedisMetricsClient extends MetricsClient {
 
       const grouped = {}
       connections.forEach(conn => {
-        const { name, flags, 'tot-mem': totMem } = conn
+        const { name, flags, 'tot-mem': totMem, cmd } = conn
 
         // build grouping key (includes default gauge labels later)
-        const key = JSON.stringify({ name, flags })
+        const key = JSON.stringify({ name, flags, cmd })
 
         if (!grouped[key]) {
           grouped[key] = {
-            labels: { name, flags },
+            labels: { name, flags, cmd },
             count: 0,
             memory: 0,
           }