@adalo/metrics 0.1.105 → 0.1.107

package/.eslintrc

@@ -55,6 +55,7 @@
     "no-underscore-dangle": "off",
     "class-methods-use-this": "off",
     "no-await-in-loop": "off",
-    "no-console": "off"
+    "no-console": "off",
+    "no-continue": "off"
   }
 }

package/README.md

@@ -22,7 +22,7 @@ import { MetricsClient } from '@adalo/metrics-js'
 const metrics = new MetricsClient({ appName: 'my-app', enabled: true })
 
 // Express middleware
-app.use(metrics.countHttpRequestMiddleware)
+app.use(metrics.trackHttpRequestMiddleware)
 
 
 // Start metrics push

package/lib/metricsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsClient.d.ts","sourceRoot":"","sources":["../src/metricsClient.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH;IACE;;;;;;;;;;;;;OAaG;IACH;QAZ2B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAuD7C;IApDC,gBAA4E;IAC5E,eAAqE;IACrE,oBAG6B;IAC7B,iBAAuE;IACvE,mBAC+D;IAC/D,uBACoE;IACpE,kBAC0E;IAC1E,oBAGI;IACJ,wCAAiD;IAEjD,mBAAyF;IAEzF,uEAAsC;IAGtC;;;;MAIC;IAED,wEAOC;IACD,WAAgB;IAChB,aAAkB;IAClB,sBAA2B;IAE3B,mEAAmE;IACnE;YADkB,MAAM,SAAc,MAAM,GAAG,QAAQ,MAAM,CAAC;MACvC;IACvB,yBAAyB;IACzB,uBAAgC;IASlC;;;OAGG;IACH,4BA4DC;IAED;;;;;;;;OAQG;IACH;QAN2B,IAAI,EAApB,MAAM;QACU,IAAI,EAApB,MAAM;QACuC,QAAQ,UAAzC,MAAM,GAAC,QAAQ,MAAM,CAAC;QACf,UAAU;UAC3B,OAAO,aAAa,EAAE,KAAK,CAuBvC;IAED;;;;;;;;;;;OAWG;IACH;QAR0B,IAAI,EAAnB,MAAM;QACS,IAAI,EAAnB,MAAM;QACY,UAAU;kBAEhB,MAAM,mBAAmB,MAAM,KAAK,IAAI,CAuB9D;IAED;;;OAGG;IACH,0BAFa,MAAM,CA2BlB;IAED;;;OAGG;IACH,oBAFa,MAAM,CAiBlB;IAED;;;OAGG;IACH,2BAFa,MAAM,CAWlB;IAED;;;OAGG;IACH,2BAFa,MAAM,CAgBlB;IAED;;;OAGG;IACH,cAFa,QAAQ,MAAM,CAAC,CAO3B;IAED;;;;;;;;;;OAUG;IACH;QAP0B,MAAM,EAArB,MAAM;QACS,KAAK,EAApB,MAAM;QACS,WAAW,EAA1B,MAAM;QACU,KAAK;QACL,UAAU;QACX,QAAQ,EAAvB,MAAM;aA2BhB;IAED;;;OAGG;IACH,oEA+BC;IAED;;OAEG;IACH,6BAKC;IAED;;OAEG;IACH,iCA+BC;IAED,sEAuBC;IAED;;;;;;;;;OASG;IACH,iFAEC;IAED;;;OAGG;IACH,eAFa,QAAQ,IAAI,CAAC,CAOzB;IAED;;;;;;;;;OASG;IACH,yBAuDC;IAED;;;;;;;;;OASG;IACH;;;;;;sBAFa,QAAQ,IAAI,CAAC,CAUzB;IAED;;;;;;;OAOG;IACH;;;sBAFa,QAAQ,IAAI,CAAC,CAYzB;IAED;;;;;;OAMG;IACH,6BAHW,MAAM,EAAE,KACN,MAAM,EAAE,CAIpB;IAED;;;;MAEC;IAED,gCAGC;IAID,8BAEC;IAED,gCAEC;IAED,4EAEC;CACF"}
+{"version":3,"file":"metricsClient.d.ts","sourceRoot":"","sources":["../src/metricsClient.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH;IACE;;;;;;;;;;;;;OAaG;IACH;QAZ2B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QAChB,mBAAmB;QAClB,iBAAiB;OAuD7C;IApDC,gBAA4E;IAC5E,eAAqE;IACrE,oBAG6B;IAC7B,iBAAuE;IACvE,mBAC+D;IAC/D,uBACoE;IACpE,kBAC0E;IAC1E,oBAGI;IACJ,wCAAiD;IAEjD,mBAAyF;IAEzF,uEAAsC;IAGtC;;;;MAIC;IAED,wEAOC;IACD,WAAgB;IAChB,aAAkB;IAClB,sBAA2B;IAE3B,mEAAmE;IACnE;YADkB,MAAM,SAAc,MAAM,GAAG,QAAQ,MAAM,CAAC;MACvC;IACvB,yBAAyB;IACzB,uBAAgC;IASlC;;;OAGG;IACH,4BA4DC;IAED;;;;;;;;OAQG;IACH;QAN2B,IAAI,EAApB,MAAM;QACU,IAAI,EAApB,MAAM;QACuC,QAAQ,UAAzC,MAAM,GAAC,QAAQ,MAAM,CAAC;QACf,UAAU;UAC3B,OAAO,aAAa,EAAE,KAAK,CAuBvC;IAED;;;;;;;;;;;OAWG;IACH;QAR0B,IAAI,EAAnB,MAAM;QACS,IAAI,EAAnB,MAAM;QACY,UAAU;kBAEhB,MAAM,mBAAmB,MAAM,KAAK,IAAI,CAuB9D;IAED;;;OAGG;IACH,0BAFa,MAAM,CA2BlB;IAED;;;OAGG;IACH,oBAFa,MAAM,CAiBlB;IAED;;;OAGG;IACH,2BAFa,MAAM,CAWlB;IAED;;;OAGG;IACH,2BAFa,MAAM,CAgBlB;IAED;;;OAGG;IACH,cAFa,QAAQ,MAAM,CAAC,CAO3B;IAED;;;;;;;;;;OAUG;IACH;QAP0B,MAAM,EAArB,MAAM;QACS,KAAK,EAApB,MAAM;QACS,WAAW,EAA1B,MAAM;QACU,KAAK;QACL,UAAU;QACX,QAAQ,EAAvB,MAAM;aA2BhB;IAED;;;OAGG;IACH,oEA+BC;IAED;;OAEG;IACH,6BAKC;IAED;;OAEG;IACH,iCA+BC;IAED,sEAuBC;IAED;;;;;;;;;OASG;IACH,iFAEC;IAED;;;OAGG;IACH,eAFa,QAAQ,IAAI,CAAC,CAOzB;IAED;;;;;;;;;OASG;IACH,yBA4EC;IAED;;;;;;;;;OASG;IACH;;;;;;sBAFa,QAAQ,IAAI,CAAC,CAUzB;IAED;;;;;;;OAOG;IACH;;;sBAFa,QAAQ,IAAI,CAAC,CAYzB;IAED;;;;;;OAMG;IACH,6BAHW,MAAM,EAAE,KACN,MAAM,EAAE,CAIpB;IAED;;;;MAEC;IAED,gCAGC;IAID,8BAEC;IAED,gCAEC;IAED,4EAEC;CACF"}

package/lib/metricsClient.js

@@ -435,25 +435,44 @@ class MetricsClient {
         return;
       }
       const text = await res.text();
-      const regex = new RegExp(`(?:instance="([^"]+)".*job="${this.appName}"|job="${this.appName}".*instance="([^"]+)")`, 'g');
-      const instances = new Set();
+      const metricRegex = /([a-zA-Z_:][a-zA-Z0-9_:]*)\{([^}]*)\}/gm;
+      const labelRegex = /(\w+)="([^"]*)"/g;
+      const uniqueLabelSets = new Set();
       let match;
       // eslint-disable-next-line no-cond-assign
-      while ((match = regex.exec(text)) !== null) {
-        const instance = match[1] || match[2];
-        if (instance && instance !== this.dynoId) instances.add(instance);
+      while ((match = metricRegex.exec(text)) !== null) {
+        const rawLabels = match[2];
+        let lr;
+        const labels = {};
+
+        // eslint-disable-next-line no-cond-assign
+        while ((lr = labelRegex.exec(rawLabels)) !== null) {
+          // eslint-disable-next-line prefer-destructuring
+          labels[lr[1]] = lr[2];
+        }
+        if (labels.job === this.appName && labels.process_type === this.processType) {
+          uniqueLabelSets.add(JSON.stringify(labels));
+        }
+      }
+      if (uniqueLabelSets.size === 0) {
+        console.log(`${this.prefixLogs} No metrics found for job ${this.appName}`);
+        return;
       }
-      if (instances.size === 0) {
+      const oldLabelSets = [...uniqueLabelSets].map(s => JSON.parse(s)).filter(labels => labels.instance && labels.instance !== this.dynoId && labels.process_type === this.processType);
+      if (oldLabelSets.length === 0) {
         console.log(`${this.prefixLogs} No old dynos to delete.`);
         return;
       }
-      for (const instance of instances) {
-        await this.gatewayDelete({
-          groupings: {
-            instance
-          }
-        });
-        console.log(`${this.prefixLogs} Deleted metrics for old dyno: ${instance}`);
+      for (const labels of oldLabelSets) {
+        try {
+          await this.gatewayDelete({
+            jobName: this.appName,
+            groupings: labels
+          });
+          console.log(`${this.prefixLogs} Deleted metrics for dyno: ${labels.instance}, labels: ${Object.keys(labels)} `);
+        } catch (err) {
+          console.error(`${this.prefixLogs} Failed to delete metrics for ${labels.instance}:`, err);
+        }
       }
       console.log(`${this.prefixLogs} Cleared all old instances for job ${this.appName}`);
     } catch (err) {
@@ -474,9 +493,9 @@ class MetricsClient {
   gatewayDelete = async (params = {}) => {
     return this.gateway.delete({
       jobName: params.jobName || this.appName,
-      groupings: {
-        process_type: params.groupings?.process_type || this.processType,
-        instance: params.groupings?.instance || this.dynoId
+      groupings: params.groupings || {
+        process_type: this.processType,
+        instance: this.dynoId
       }
     });
   };

package/lib/metricsClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsClient.js","names":["client","require","fs","os","https","MetricsClient","constructor","config","appName","process","env","BUILD_APP_NAME","dynoId","HOSTNAME","processType","BUILD_DYNO_PROCESS_TYPE","enabled","METRICS_ENABLED","logValues","METRICS_LOG_VALUES","pushgatewayUrl","METRICS_PUSHGATEWAY_URL","authToken","pushgatewaySecret","METRICS_PUSHGATEWAY_SECRET","intervalSec","parseInt","METRICS_INTERVAL_SEC","startupValidation","prefixLogs","_registry","Registry","collectDefaultMetrics","register","defaultLabels","app","dyno_id","process_type","gateway","Pushgateway","headers","Authorization","agent","Agent","keepAlive","gauges","counters","countersFunctions","gaugeUpdaters","_lastUsageMicros","_lastCheckTime","Date","now","_clearOldWorkers","removeOldMetrics","scripDefaultMetrics","_initDefaultMetrics","_setCleanupHandlers","createGauge","name","help","updateFn","getCpuUsagePercent","getAvailableCPUs","getContainerMemoryUsage","measureLag","getContainerMemoryLimit","uptime","createCounter","labelNames","withDefaultLabels","Object","keys","g","Gauge","registers","c","Counter","data","value","inc","stat","readFileSync","match","currentUsage","deltaUsage","deltaTime","cpuMaxPath","existsSync","quotaStr","periodStr","trim","split","cpus","length","memoryUsage","rss","path","val","parsed","totalmem","Promise","resolve","start","setImmediate","trackHttpRequest","method","route","status_code","appId","databaseId","duration","app_requests_total","app_requests_total_duration","trackHttpRequestMiddleware","req","res","next","on","params","body","query","datasourceId","statusCode","clearAllCounters","metricsLogValues","console","log","values","forEach","counter","reset","pushMetrics","entries","result","undefined","set","err","error","gatewayPush","metrics","getMetricsAsJSON","JSON","stringify","_startPush","interval","customPushMetics","warn","setInterval","catch","startPush","cleanup","gatewayDelete","exit","url","fetch","Accept","ok","status","text","regex","RegExp","instances","Set","exec","instance","add","size","groupings","delete","jobName","push","labels","getDefaultLabels","metricsEnabled","registry","module","exports"],"sources":["../src/metricsClient.js"],"sourcesContent":["const client = require('prom-client')\nconst fs = require('fs')\nconst os = require('os')\nconst https = require('https')\n\n/**\n * MetricsClient handles Prometheus metrics collection and push.\n * Supports gauges, counters, default metrics, and custom metrics.\n */\nclass MetricsClient {\n  /**\n   * @param {Object} config\n   * @param {string} [config.appName] Name of the application\n   * @param {string} [config.dynoId] Dyno/instance ID\n   * @param {string} [config.processType] Process type (web, worker, etc.)\n   * @param {boolean} [config.enabled] Enable metrics collection\n   * @param {boolean} [config.logValues] Log metrics values to console\n   * @param {string} [config.pushgatewayUrl] PushGateway URL\n   * @param {string} [config.pushgatewaySecret] PushGateway secret token\n   * @param {number} [config.intervalSec] Interval in seconds for pushing metrics\n   * @param {boolean} [config.removeOldMetrics] Enable to clear metrics by service name\n   * @param {boolean} [config.scripDefaultMetrics] Enable to scip default metrics creation\n   * @param {function} [config.startupValidation] Add to validate on start push.\n   */\n  constructor(config = {}) {\n    this.appName = config.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    this.dynoId = config.dynoId || process.env.HOSTNAME || 'unknown-dyno'\n    this.processType =\n      config.processType ||\n      process.env.BUILD_DYNO_PROCESS_TYPE ||\n      'undefined_build_dyno_type'\n    this.enabled = config.enabled ?? process.env.METRICS_ENABLED === 'true'\n    this.logValues =\n      config.logValues ?? process.env.METRICS_LOG_VALUES === 'true'\n    this.pushgatewayUrl =\n      config.pushgatewayUrl || process.env.METRICS_PUSHGATEWAY_URL || ''\n    this.authToken =\n      config.pushgatewaySecret || process.env.METRICS_PUSHGATEWAY_SECRET || ''\n    this.intervalSec =\n      config.intervalSec ||\n      parseInt(process.env.METRICS_INTERVAL_SEC || '', 10) ||\n      15\n    this.startupValidation = config.startupValidation\n\n    this.prefixLogs = `[${this.processType}] [${this.appName}] [${this.dynoId}] [Monitoring]`\n\n    this._registry = new client.Registry()\n    client.collectDefaultMetrics({ register: this._registry })\n\n    this.defaultLabels = {\n      app: this.appName,\n      dyno_id: this.dynoId,\n      process_type: this.processType,\n    }\n\n    this.gateway = new client.Pushgateway(\n      this.pushgatewayUrl,\n      {\n        headers: { Authorization: `Basic ${this.authToken}` },\n        agent: new https.Agent({ keepAlive: true }),\n      },\n      this._registry\n    )\n    this.gauges = {}\n    this.counters = {}\n    this.countersFunctions = {}\n\n    /** @type {Object<string, function(): number | Promise<number>>} */\n    this.gaugeUpdaters = {}\n    this._lastUsageMicros = 0\n    this._lastCheckTime = Date.now()\n\n    this._clearOldWorkers(config.removeOldMetrics)\n    if (!config.scripDefaultMetrics) {\n      this._initDefaultMetrics()\n    }\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * Register all built-in default Gauges and Counters.\n   * @private\n   */\n  _initDefaultMetrics = () => {\n    this.createGauge({\n      name: 'app_process_cpu_usage_percent',\n      help: 'Current CPU usage of the Node.js process in percent',\n      updateFn: this.getCpuUsagePercent,\n    })\n\n    this.createGauge({\n      name: 'app_available_cpu_count',\n      help: 'How many CPU cores are available to this process',\n      updateFn: this.getAvailableCPUs,\n    })\n\n    this.createGauge({\n      name: 'app_container_memory_usage_bytes',\n      help: 'Current container RAM usage from cgroup',\n      updateFn: this.getContainerMemoryUsage,\n    })\n\n    this.createGauge({\n      name: 'app_event_loop_lag_ms',\n      help: 'Estimated event loop lag in milliseconds',\n      updateFn: this.measureLag,\n    })\n\n    this.createGauge({\n      name: 'app_container_memory_limit_bytes',\n      help: 'Max RAM available to container from cgroup (memory.max)',\n      updateFn: this.getContainerMemoryLimit,\n    })\n\n    this.createGauge({\n      name: 'app_uptime_seconds',\n      help: 'How long the process has been running',\n      updateFn: process.uptime,\n    })\n\n    this.createCounter({\n      name: 'app_requests_total',\n      help: 'How long the process has been running',\n      labelNames: this.withDefaultLabels([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n    })\n\n    this.createCounter({\n      name: 'app_requests_total_duration',\n      help: 'How long the process has been running',\n      labelNames: this.withDefaultLabels([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n    })\n  }\n\n  /**\n   * Create a gauge metric.\n   * @param {Object} options - Gauge configuration\n   * @param {string} options.name - Name of the gauge\n   * @param {string} options.help - Help text describing the gauge\n   * @param {function(): number|Promise<number>} [options.updateFn] - Optional function returning the gauge value\n   * @param {string[]} [options.labelNames] - Optional custom label names\n   * @returns {import('prom-client').Gauge} The created Prometheus gauge\n   */\n  createGauge = ({\n    name,\n    help,\n    updateFn,\n    labelNames = Object.keys(this.defaultLabels),\n  }) => {\n    if (this.gauges[name]) return this.gauges[name]\n\n    const g = new client.Gauge({\n      name,\n      help,\n      labelNames,\n      registers: [this._registry],\n    })\n    this.gauges[name] = g\n\n    if (updateFn && typeof updateFn === 'function') {\n      this.gaugeUpdaters[name] = updateFn\n    }\n\n    return g\n  }\n\n  /**\n   * Create a Prometheus Counter metric.\n   *\n   * @param {Object} params - Counter configuration\n   * @param {string} params.name - Metric name\n   * @param {string} params.help - Metric description\n   * @param {string[]} [params.labelNames] - Optional list of label names. Defaults to this.defaultLabels keys.\n   *\n   * @returns {(labels?: Object, incrementValue?: number) => void}\n   *          A function to increment the counter.\n   *          Usage: (labels?, incrementValue?)\n   */\n  createCounter({ name, help, labelNames = Object.keys(this.defaultLabels) }) {\n    if (this.counters[name]) return this.countersFunctions[name]\n\n    const c = new client.Counter({\n      name,\n      help,\n      labelNames,\n      registers: [this._registry],\n    })\n    this.counters[name] = c\n\n    this.countersFunctions = {\n      ...this.countersFunctions,\n      [name]: (data = {}, value = 1) => {\n        c.inc({ ...this.defaultLabels, ...data }, value)\n      },\n    }\n\n    return this.countersFunctions[name]\n  }\n\n  /**\n   * Get CPU usage percent (cgroup-aware)\n   * @returns {number}\n   */\n  getCpuUsagePercent = () => {\n    try {\n      const stat = fs.readFileSync('/sys/fs/cgroup/cpu.stat', 'utf-8')\n      const match = stat.match(/usage_usec (\\d+)/)\n      if (!match) return 0\n\n      const now = Date.now()\n      const currentUsage = parseInt(match[1], 10)\n\n      if (this._lastUsageMicros === 0) {\n        this._lastUsageMicros = currentUsage\n        this._lastCheckTime = now\n        return 0\n      }\n\n      const deltaUsage = currentUsage - this._lastUsageMicros\n      const deltaTime = now - this._lastCheckTime\n\n      this._lastUsageMicros = currentUsage\n      this._lastCheckTime = now\n\n      return (deltaUsage / (deltaTime * 1000)) * 100\n    } catch {\n      return 0\n    }\n  }\n\n  /**\n   * Get available CPU cores.\n   * @returns {number}\n   */\n  getAvailableCPUs() {\n    try {\n      const cpuMaxPath = '/sys/fs/cgroup/cpu.max'\n      if (fs.existsSync(cpuMaxPath)) {\n        const [quotaStr, periodStr] = fs\n          .readFileSync(cpuMaxPath, 'utf8')\n          .trim()\n          .split(' ')\n        if (quotaStr === 'max') return os.cpus().length\n        return parseInt(quotaStr, 10) / parseInt(periodStr, 10)\n      }\n      return os.cpus().length\n    } catch {\n      return 1\n    }\n  }\n\n  /**\n   * Get container memory usage in bytes.\n   * @returns {number}\n   */\n  getContainerMemoryUsage() {\n    try {\n      return parseInt(\n        fs.readFileSync('/sys/fs/cgroup/memory.current', 'utf-8').trim(),\n        10\n      )\n    } catch {\n      return process.memoryUsage().rss\n    }\n  }\n\n  /**\n   * Get container memory limit in bytes.\n   * @returns {number}\n   */\n  getContainerMemoryLimit() {\n    try {\n      const path = '/sys/fs/cgroup/memory.max'\n      if (fs.existsSync(path)) {\n        const val = fs.readFileSync(path, 'utf-8').trim()\n        if (val !== 'max') {\n          const parsed = parseInt(val, 10)\n          if (parsed && parsed < os.totalmem()) return parsed\n        }\n      }\n      return os.totalmem()\n    } catch {\n      return os.totalmem()\n    }\n  }\n\n  /**\n   * Measure event loop lag in ms.\n   * @returns {Promise<number>}\n   */\n  measureLag() {\n    return new Promise(resolve => {\n      const start = Date.now()\n      setImmediate(() => resolve(Date.now() - start))\n    })\n  }\n\n  /**\n   * Increment the HTTP requests counter with detailed request information.\n   *\n   * @param {Object} params - The parameters for the request counter.\n   * @param {string} params.method - HTTP method (GET, POST, etc.).\n   * @param {string} params.route - The full requested URL or route.\n   * @param {number} params.status_code - HTTP response status code.\n   * @param {string} [params.appId=''] - Optional application identifier.\n   * @param {string} [params.databaseId=''] - Optional database identifier.\n   * @param {number} params.duration - Request duration in milliseconds.\n   */\n  trackHttpRequest({\n    method,\n    route,\n    status_code,\n    appId = '',\n    databaseId = '',\n    duration,\n  }) {\n    this.countersFunctions?.app_requests_total({\n      method,\n      route,\n      status_code,\n      appId,\n      databaseId,\n    })\n    this.countersFunctions?.app_requests_total_duration(\n      {\n        method,\n        route,\n        status_code,\n        appId,\n        databaseId,\n      },\n      duration\n    )\n  }\n\n  /**\n   * Express middleware to track HTTP requests.\n   * Track the `app_requests_total` and `app_requests_total_duration` metric.\n   */\n  trackHttpRequestMiddleware = (req, res, next) => {\n    if (req.method === 'OPTIONS') {\n      next()\n      return\n    }\n\n    const start = Date.now()\n    res.on('finish', () => {\n      const route = req.route?.path || req.path || 'unknown'\n      const appId =\n        req.params?.appId || req.body?.appId || req.query?.appId || ''\n      const databaseId =\n        req.params?.databaseId ||\n        req.body?.databaseId ||\n        req.query?.databaseId ||\n        req.params?.datasourceId ||\n        req.body?.datasourceId ||\n        req.query?.datasourceId ||\n        ''\n\n      this.trackHttpRequest({\n        method: req.method,\n        route,\n        status_code: res.statusCode,\n        appId,\n        databaseId,\n        duration: Date.now() - start,\n      })\n    })\n\n    next()\n  }\n\n  /**\n   * Clear all collected counters\n   */\n  clearAllCounters = () => {\n    if (this.metricsLogValues) {\n      console.log('Counters to clear: ', Object.keys(this.counters))\n    }\n    Object.values(this.counters).forEach(counter => counter.reset())\n  }\n\n  /**\n   * Push all gauges and counters to PushGateway and optionally log.\n   */\n  pushMetrics = async () => {\n    try {\n      for (const [name, updateFn] of Object.entries(this.gaugeUpdaters)) {\n        try {\n          if (!updateFn) {\n            return\n          }\n          const result = updateFn()\n          const val = result instanceof Promise ? await result : result\n          if (val !== undefined) this.gauges[name].set(this.defaultLabels, val)\n        } catch (err) {\n          console.error(\n            `${this.prefixLogs} Failed to update gauge ${name}:`,\n            err\n          )\n        }\n      }\n\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.logValues) {\n        const metrics = await this._registry.getMetricsAsJSON()\n        console.log(\n          `${this.prefixLogs} Metrics:\\n`,\n          JSON.stringify(metrics, null, 2)\n        )\n      }\n    } catch (err) {\n      console.error(`${this.prefixLogs} Failed to push metrics:`, err)\n    }\n  }\n\n  _startPush = (interval = this.intervalSec, customPushMetics = undefined) => {\n    if (!this.enabled) {\n      console.warn(`${this.prefixLogs} Metrics disabled`)\n      return\n    }\n\n    if (this.startupValidation && !this.startupValidation()) {\n      return\n    }\n\n    if (customPushMetics && typeof customPushMetics === 'function') {\n      setInterval(() => customPushMetics(), interval * 1000)\n    } else {\n      setInterval(() => {\n        this.pushMetrics().catch(err => {\n          console.error(`${this.prefixLogs} Failed to push metrics:`, err)\n        })\n      }, interval * 1000)\n    }\n\n    console.warn(\n      `${this.prefixLogs} Metrics collection started. (interval: ${this.intervalSec}s)`\n    )\n  }\n\n  /**\n   * Start periodic metrics collection and push.\n   *\n   * This method wraps the internal `_startPush` method.\n   * If a `customPushMetrics` function is provided, it will be executed\n   * at the given interval instead of the default `pushMetrics` behavior.\n   *\n   * @param {number} [interval=this.intervalSec] - Interval in seconds between pushes.\n   * @param {() => void | Promise<void>} [customPushMetrics] - Optional custom push function. If provided, Prometheus push is skipped.\n   */\n  startPush = (interval, customPushMetics = undefined) => {\n    this._startPush(interval, customPushMetics)\n  }\n\n  /**\n   * Cleanup metrics and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    if (this.enabled) {\n      await this.gatewayDelete()\n    }\n    process.exit(0)\n  }\n\n  /**\n   * Remove old/stale dyno/instance metrics from PushGateway.\n   *\n   * Compares existing PushGateway metrics for this job and deletes any instances\n   * that do not match the current dynoId.\n   *\n   * @param {boolean} removeOldMetrics If true, performs cleanup; otherwise does nothing\n   * @returns {Promise<void>}\n   * @private\n   */\n  _clearOldWorkers = async removeOldMetrics => {\n    if (!removeOldMetrics) return\n\n    try {\n      const url = `${this.pushgatewayUrl}/metrics`\n      const res = await fetch(url, {\n        headers: {\n          Authorization: `Basic ${this.authToken}`,\n          Accept: 'text/plain',\n        },\n      })\n\n      if (!res.ok) {\n        console.error(\n          `${this.prefixLogs} Failed to fetch metrics: ${res.status}`\n        )\n        return\n      }\n\n      const text = await res.text()\n\n      const regex = new RegExp(\n        `(?:instance=\"([^\"]+)\".*job=\"${this.appName}\"|job=\"${this.appName}\".*instance=\"([^\"]+)\")`,\n        'g'\n      )\n      const instances = new Set()\n      let match\n      // eslint-disable-next-line no-cond-assign\n      while ((match = regex.exec(text)) !== null) {\n        const instance = match[1] || match[2]\n        if (instance && instance !== this.dynoId) instances.add(instance)\n      }\n\n      if (instances.size === 0) {\n        console.log(`${this.prefixLogs} No old dynos to delete.`)\n        return\n      }\n\n      for (const instance of instances) {\n        await this.gatewayDelete({\n          groupings: {\n            instance,\n          },\n        })\n        console.log(\n          `${this.prefixLogs} Deleted metrics for old dyno: ${instance}`\n        )\n      }\n\n      console.log(\n        `${this.prefixLogs} Cleared all old instances for job ${this.appName}`\n      )\n    } catch (err) {\n      console.error(`${this.prefixLogs} Error deleting old metrics:`, err)\n    }\n  }\n\n  /**\n   * Delete metrics for this job/instance from PushGateway.\n   *\n   * @param {Object} [params]\n   * @param {string} [params.jobName] Job name (defaults to appName)\n   * @param {Object} [params.groupings] Grouping labels\n   * @param {string} [params.groupings.process_type] Process type label\n   * @param {string} [params.groupings.instance] Instance/dyno ID\n   * @returns {Promise<void>}\n   */\n  gatewayDelete = async (params = {}) => {\n    return this.gateway.delete({\n      jobName: params.jobName || this.appName,\n      groupings: {\n        process_type: params.groupings?.process_type || this.processType,\n        instance: params.groupings?.instance || this.dynoId,\n      },\n    })\n  }\n\n  /**\n   * Push metrics to PushGateway.\n   *\n   * @param {object} [params]\n   * @param {string} [params.jobName]\n   * @param {object} [params.groupings]\n   * @returns {Promise<void>}\n   */\n  gatewayPush = async (params = {}) => {\n    const groupings = {\n      process_type: this.processType,\n      instance: this.dynoId,\n      ...(params.groupings || {}),\n    }\n    return this.gateway.push({\n      jobName: params.jobName || this.appName,\n      groupings,\n    })\n  }\n\n  /**\n   * Merge the default metric labels (`app`, `dyno_id`, `process_type`)\n   * with custom label names.\n   *\n   * @param {string[]} labels Additional label names\n   * @returns {string[]} Combined label names\n   */\n  withDefaultLabels = (labels = []) => {\n    return [...Object.keys(this.defaultLabels), ...labels]\n  }\n\n  getDefaultLabels = (labels = []) => {\n    return this.defaultLabels\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  // GETTERS\n\n  get metricsEnabled() {\n    return this.enabled\n  }\n\n  get metricsLogValues() {\n    return this.logValues\n  }\n\n  get registry() {\n    return this._registry\n  }\n}\n\nmodule.exports = { MetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsClient.js","names":["client","require","fs","os","https","MetricsClient","constructor","config","appName","process","env","BUILD_APP_NAME","dynoId","HOSTNAME","processType","BUILD_DYNO_PROCESS_TYPE","enabled","METRICS_ENABLED","logValues","METRICS_LOG_VALUES","pushgatewayUrl","METRICS_PUSHGATEWAY_URL","authToken","pushgatewaySecret","METRICS_PUSHGATEWAY_SECRET","intervalSec","parseInt","METRICS_INTERVAL_SEC","startupValidation","prefixLogs","_registry","Registry","collectDefaultMetrics","register","defaultLabels","app","dyno_id","process_type","gateway","Pushgateway","headers","Authorization","agent","Agent","keepAlive","gauges","counters","countersFunctions","gaugeUpdaters","_lastUsageMicros","_lastCheckTime","Date","now","_clearOldWorkers","removeOldMetrics","scripDefaultMetrics","_initDefaultMetrics","_setCleanupHandlers","createGauge","name","help","updateFn","getCpuUsagePercent","getAvailableCPUs","getContainerMemoryUsage","measureLag","getContainerMemoryLimit","uptime","createCounter","labelNames","withDefaultLabels","Object","keys","g","Gauge","registers","c","Counter","data","value","inc","stat","readFileSync","match","currentUsage","deltaUsage","deltaTime","cpuMaxPath","existsSync","quotaStr","periodStr","trim","split","cpus","length","memoryUsage","rss","path","val","parsed","totalmem","Promise","resolve","start","setImmediate","trackHttpRequest","method","route","status_code","appId","databaseId","duration","app_requests_total","app_requests_total_duration","trackHttpRequestMiddleware","req","res","next","on","params","body","query","datasourceId","statusCode","clearAllCounters","metricsLogValues","console","log","values","forEach","counter","reset","pushMetrics","entries","result","undefined","set","err","error","gatewayPush","metrics","getMetricsAsJSON","JSON","stringify","_startPush","interval","customPushMetics","warn","setInterval","catch","startPush","cleanup","gatewayDelete","exit","url","fetch","Accept","ok","status","text","metricRegex","labelRegex","uniqueLabelSets","Set","exec","rawLabels","lr","labels","job","add","size","oldLabelSets","map","s","parse","filter","instance","jobName","groupings","delete","push","getDefaultLabels","metricsEnabled","registry","module","exports"],"sources":["../src/metricsClient.js"],"sourcesContent":["const client = require('prom-client')\nconst fs = require('fs')\nconst os = require('os')\nconst https = require('https')\n\n/**\n * MetricsClient handles Prometheus metrics collection and push.\n * Supports gauges, counters, default metrics, and custom metrics.\n */\nclass MetricsClient {\n  /**\n   * @param {Object} config\n   * @param {string} [config.appName] Name of the application\n   * @param {string} [config.dynoId] Dyno/instance ID\n   * @param {string} [config.processType] Process type (web, worker, etc.)\n   * @param {boolean} [config.enabled] Enable metrics collection\n   * @param {boolean} [config.logValues] Log metrics values to console\n   * @param {string} [config.pushgatewayUrl] PushGateway URL\n   * @param {string} [config.pushgatewaySecret] PushGateway secret token\n   * @param {number} [config.intervalSec] Interval in seconds for pushing metrics\n   * @param {boolean} [config.removeOldMetrics] Enable to clear metrics by service name\n   * @param {boolean} [config.scripDefaultMetrics] Enable to scip default metrics creation\n   * @param {function} [config.startupValidation] Add to validate on start push.\n   */\n  constructor(config = {}) {\n    this.appName = config.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    this.dynoId = config.dynoId || process.env.HOSTNAME || 'unknown-dyno'\n    this.processType =\n      config.processType ||\n      process.env.BUILD_DYNO_PROCESS_TYPE ||\n      'undefined_build_dyno_type'\n    this.enabled = config.enabled ?? process.env.METRICS_ENABLED === 'true'\n    this.logValues =\n      config.logValues ?? process.env.METRICS_LOG_VALUES === 'true'\n    this.pushgatewayUrl =\n      config.pushgatewayUrl || process.env.METRICS_PUSHGATEWAY_URL || ''\n    this.authToken =\n      config.pushgatewaySecret || process.env.METRICS_PUSHGATEWAY_SECRET || ''\n    this.intervalSec =\n      config.intervalSec ||\n      parseInt(process.env.METRICS_INTERVAL_SEC || '', 10) ||\n      15\n    this.startupValidation = config.startupValidation\n\n    this.prefixLogs = `[${this.processType}] [${this.appName}] [${this.dynoId}] [Monitoring]`\n\n    this._registry = new client.Registry()\n    client.collectDefaultMetrics({ register: this._registry })\n\n    this.defaultLabels = {\n      app: this.appName,\n      dyno_id: this.dynoId,\n      process_type: this.processType,\n    }\n\n    this.gateway = new client.Pushgateway(\n      this.pushgatewayUrl,\n      {\n        headers: { Authorization: `Basic ${this.authToken}` },\n        agent: new https.Agent({ keepAlive: true }),\n      },\n      this._registry\n    )\n    this.gauges = {}\n    this.counters = {}\n    this.countersFunctions = {}\n\n    /** @type {Object<string, function(): number | Promise<number>>} */\n    this.gaugeUpdaters = {}\n    this._lastUsageMicros = 0\n    this._lastCheckTime = Date.now()\n\n    this._clearOldWorkers(config.removeOldMetrics)\n    if (!config.scripDefaultMetrics) {\n      this._initDefaultMetrics()\n    }\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * Register all built-in default Gauges and Counters.\n   * @private\n   */\n  _initDefaultMetrics = () => {\n    this.createGauge({\n      name: 'app_process_cpu_usage_percent',\n      help: 'Current CPU usage of the Node.js process in percent',\n      updateFn: this.getCpuUsagePercent,\n    })\n\n    this.createGauge({\n      name: 'app_available_cpu_count',\n      help: 'How many CPU cores are available to this process',\n      updateFn: this.getAvailableCPUs,\n    })\n\n    this.createGauge({\n      name: 'app_container_memory_usage_bytes',\n      help: 'Current container RAM usage from cgroup',\n      updateFn: this.getContainerMemoryUsage,\n    })\n\n    this.createGauge({\n      name: 'app_event_loop_lag_ms',\n      help: 'Estimated event loop lag in milliseconds',\n      updateFn: this.measureLag,\n    })\n\n    this.createGauge({\n      name: 'app_container_memory_limit_bytes',\n      help: 'Max RAM available to container from cgroup (memory.max)',\n      updateFn: this.getContainerMemoryLimit,\n    })\n\n    this.createGauge({\n      name: 'app_uptime_seconds',\n      help: 'How long the process has been running',\n      updateFn: process.uptime,\n    })\n\n    this.createCounter({\n      name: 'app_requests_total',\n      help: 'How long the process has been running',\n      labelNames: this.withDefaultLabels([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n    })\n\n    this.createCounter({\n      name: 'app_requests_total_duration',\n      help: 'How long the process has been running',\n      labelNames: this.withDefaultLabels([\n        'method',\n        'route',\n        'appId',\n        'databaseId',\n        'status_code',\n      ]),\n    })\n  }\n\n  /**\n   * Create a gauge metric.\n   * @param {Object} options - Gauge configuration\n   * @param {string} options.name - Name of the gauge\n   * @param {string} options.help - Help text describing the gauge\n   * @param {function(): number|Promise<number>} [options.updateFn] - Optional function returning the gauge value\n   * @param {string[]} [options.labelNames] - Optional custom label names\n   * @returns {import('prom-client').Gauge} The created Prometheus gauge\n   */\n  createGauge = ({\n    name,\n    help,\n    updateFn,\n    labelNames = Object.keys(this.defaultLabels),\n  }) => {\n    if (this.gauges[name]) return this.gauges[name]\n\n    const g = new client.Gauge({\n      name,\n      help,\n      labelNames,\n      registers: [this._registry],\n    })\n    this.gauges[name] = g\n\n    if (updateFn && typeof updateFn === 'function') {\n      this.gaugeUpdaters[name] = updateFn\n    }\n\n    return g\n  }\n\n  /**\n   * Create a Prometheus Counter metric.\n   *\n   * @param {Object} params - Counter configuration\n   * @param {string} params.name - Metric name\n   * @param {string} params.help - Metric description\n   * @param {string[]} [params.labelNames] - Optional list of label names. Defaults to this.defaultLabels keys.\n   *\n   * @returns {(labels?: Object, incrementValue?: number) => void}\n   *          A function to increment the counter.\n   *          Usage: (labels?, incrementValue?)\n   */\n  createCounter({ name, help, labelNames = Object.keys(this.defaultLabels) }) {\n    if (this.counters[name]) return this.countersFunctions[name]\n\n    const c = new client.Counter({\n      name,\n      help,\n      labelNames,\n      registers: [this._registry],\n    })\n    this.counters[name] = c\n\n    this.countersFunctions = {\n      ...this.countersFunctions,\n      [name]: (data = {}, value = 1) => {\n        c.inc({ ...this.defaultLabels, ...data }, value)\n      },\n    }\n\n    return this.countersFunctions[name]\n  }\n\n  /**\n   * Get CPU usage percent (cgroup-aware)\n   * @returns {number}\n   */\n  getCpuUsagePercent = () => {\n    try {\n      const stat = fs.readFileSync('/sys/fs/cgroup/cpu.stat', 'utf-8')\n      const match = stat.match(/usage_usec (\\d+)/)\n      if (!match) return 0\n\n      const now = Date.now()\n      const currentUsage = parseInt(match[1], 10)\n\n      if (this._lastUsageMicros === 0) {\n        this._lastUsageMicros = currentUsage\n        this._lastCheckTime = now\n        return 0\n      }\n\n      const deltaUsage = currentUsage - this._lastUsageMicros\n      const deltaTime = now - this._lastCheckTime\n\n      this._lastUsageMicros = currentUsage\n      this._lastCheckTime = now\n\n      return (deltaUsage / (deltaTime * 1000)) * 100\n    } catch {\n      return 0\n    }\n  }\n\n  /**\n   * Get available CPU cores.\n   * @returns {number}\n   */\n  getAvailableCPUs() {\n    try {\n      const cpuMaxPath = '/sys/fs/cgroup/cpu.max'\n      if (fs.existsSync(cpuMaxPath)) {\n        const [quotaStr, periodStr] = fs\n          .readFileSync(cpuMaxPath, 'utf8')\n          .trim()\n          .split(' ')\n        if (quotaStr === 'max') return os.cpus().length\n        return parseInt(quotaStr, 10) / parseInt(periodStr, 10)\n      }\n      return os.cpus().length\n    } catch {\n      return 1\n    }\n  }\n\n  /**\n   * Get container memory usage in bytes.\n   * @returns {number}\n   */\n  getContainerMemoryUsage() {\n    try {\n      return parseInt(\n        fs.readFileSync('/sys/fs/cgroup/memory.current', 'utf-8').trim(),\n        10\n      )\n    } catch {\n      return process.memoryUsage().rss\n    }\n  }\n\n  /**\n   * Get container memory limit in bytes.\n   * @returns {number}\n   */\n  getContainerMemoryLimit() {\n    try {\n      const path = '/sys/fs/cgroup/memory.max'\n      if (fs.existsSync(path)) {\n        const val = fs.readFileSync(path, 'utf-8').trim()\n        if (val !== 'max') {\n          const parsed = parseInt(val, 10)\n          if (parsed && parsed < os.totalmem()) return parsed\n        }\n      }\n      return os.totalmem()\n    } catch {\n      return os.totalmem()\n    }\n  }\n\n  /**\n   * Measure event loop lag in ms.\n   * @returns {Promise<number>}\n   */\n  measureLag() {\n    return new Promise(resolve => {\n      const start = Date.now()\n      setImmediate(() => resolve(Date.now() - start))\n    })\n  }\n\n  /**\n   * Increment the HTTP requests counter with detailed request information.\n   *\n   * @param {Object} params - The parameters for the request counter.\n   * @param {string} params.method - HTTP method (GET, POST, etc.).\n   * @param {string} params.route - The full requested URL or route.\n   * @param {number} params.status_code - HTTP response status code.\n   * @param {string} [params.appId=''] - Optional application identifier.\n   * @param {string} [params.databaseId=''] - Optional database identifier.\n   * @param {number} params.duration - Request duration in milliseconds.\n   */\n  trackHttpRequest({\n    method,\n    route,\n    status_code,\n    appId = '',\n    databaseId = '',\n    duration,\n  }) {\n    this.countersFunctions?.app_requests_total({\n      method,\n      route,\n      status_code,\n      appId,\n      databaseId,\n    })\n    this.countersFunctions?.app_requests_total_duration(\n      {\n        method,\n        route,\n        status_code,\n        appId,\n        databaseId,\n      },\n      duration\n    )\n  }\n\n  /**\n   * Express middleware to track HTTP requests.\n   * Track the `app_requests_total` and `app_requests_total_duration` metric.\n   */\n  trackHttpRequestMiddleware = (req, res, next) => {\n    if (req.method === 'OPTIONS') {\n      next()\n      return\n    }\n\n    const start = Date.now()\n    res.on('finish', () => {\n      const route = req.route?.path || req.path || 'unknown'\n      const appId =\n        req.params?.appId || req.body?.appId || req.query?.appId || ''\n      const databaseId =\n        req.params?.databaseId ||\n        req.body?.databaseId ||\n        req.query?.databaseId ||\n        req.params?.datasourceId ||\n        req.body?.datasourceId ||\n        req.query?.datasourceId ||\n        ''\n\n      this.trackHttpRequest({\n        method: req.method,\n        route,\n        status_code: res.statusCode,\n        appId,\n        databaseId,\n        duration: Date.now() - start,\n      })\n    })\n\n    next()\n  }\n\n  /**\n   * Clear all collected counters\n   */\n  clearAllCounters = () => {\n    if (this.metricsLogValues) {\n      console.log('Counters to clear: ', Object.keys(this.counters))\n    }\n    Object.values(this.counters).forEach(counter => counter.reset())\n  }\n\n  /**\n   * Push all gauges and counters to PushGateway and optionally log.\n   */\n  pushMetrics = async () => {\n    try {\n      for (const [name, updateFn] of Object.entries(this.gaugeUpdaters)) {\n        try {\n          if (!updateFn) {\n            return\n          }\n          const result = updateFn()\n          const val = result instanceof Promise ? await result : result\n          if (val !== undefined) this.gauges[name].set(this.defaultLabels, val)\n        } catch (err) {\n          console.error(\n            `${this.prefixLogs} Failed to update gauge ${name}:`,\n            err\n          )\n        }\n      }\n\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.logValues) {\n        const metrics = await this._registry.getMetricsAsJSON()\n        console.log(\n          `${this.prefixLogs} Metrics:\\n`,\n          JSON.stringify(metrics, null, 2)\n        )\n      }\n    } catch (err) {\n      console.error(`${this.prefixLogs} Failed to push metrics:`, err)\n    }\n  }\n\n  _startPush = (interval = this.intervalSec, customPushMetics = undefined) => {\n    if (!this.enabled) {\n      console.warn(`${this.prefixLogs} Metrics disabled`)\n      return\n    }\n\n    if (this.startupValidation && !this.startupValidation()) {\n      return\n    }\n\n    if (customPushMetics && typeof customPushMetics === 'function') {\n      setInterval(() => customPushMetics(), interval * 1000)\n    } else {\n      setInterval(() => {\n        this.pushMetrics().catch(err => {\n          console.error(`${this.prefixLogs} Failed to push metrics:`, err)\n        })\n      }, interval * 1000)\n    }\n\n    console.warn(\n      `${this.prefixLogs} Metrics collection started. (interval: ${this.intervalSec}s)`\n    )\n  }\n\n  /**\n   * Start periodic metrics collection and push.\n   *\n   * This method wraps the internal `_startPush` method.\n   * If a `customPushMetrics` function is provided, it will be executed\n   * at the given interval instead of the default `pushMetrics` behavior.\n   *\n   * @param {number} [interval=this.intervalSec] - Interval in seconds between pushes.\n   * @param {() => void | Promise<void>} [customPushMetrics] - Optional custom push function. If provided, Prometheus push is skipped.\n   */\n  startPush = (interval, customPushMetics = undefined) => {\n    this._startPush(interval, customPushMetics)\n  }\n\n  /**\n   * Cleanup metrics and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    if (this.enabled) {\n      await this.gatewayDelete()\n    }\n    process.exit(0)\n  }\n\n  /**\n   * Remove old/stale dyno/instance metrics from PushGateway.\n   *\n   * Compares existing PushGateway metrics for this job and deletes any instances\n   * that do not match the current dynoId.\n   *\n   * @param {boolean} removeOldMetrics If true, performs cleanup; otherwise does nothing\n   * @returns {Promise<void>}\n   * @private\n   */\n  _clearOldWorkers = async removeOldMetrics => {\n    if (!removeOldMetrics) return\n\n    try {\n      const url = `${this.pushgatewayUrl}/metrics`\n      const res = await fetch(url, {\n        headers: {\n          Authorization: `Basic ${this.authToken}`,\n          Accept: 'text/plain',\n        },\n      })\n\n      if (!res.ok) {\n        console.error(`${this.prefixLogs} Failed to fetch metrics: ${res.status}`)\n        return\n      }\n\n      const text = await res.text()\n\n\n      const metricRegex = /([a-zA-Z_:][a-zA-Z0-9_:]*)\\{([^}]*)\\}/gm\n      const labelRegex = /(\\w+)=\"([^\"]*)\"/g\n\n      const uniqueLabelSets = new Set()\n\n      let match\n      // eslint-disable-next-line no-cond-assign\n      while ((match = metricRegex.exec(text)) !== null) {\n        const rawLabels = match[2]\n        let lr\n        const labels = {}\n\n        // eslint-disable-next-line no-cond-assign\n        while ((lr = labelRegex.exec(rawLabels)) !== null) {\n          // eslint-disable-next-line prefer-destructuring\n          labels[lr[1]] = lr[2]\n        }\n\n        if (labels.job === this.appName && labels.process_type === this.processType) {\n          uniqueLabelSets.add(JSON.stringify(labels))\n        }\n      }\n\n      if (uniqueLabelSets.size === 0) {\n        console.log(`${this.prefixLogs} No metrics found for job ${this.appName}`)\n        return\n      }\n\n      const oldLabelSets = [...uniqueLabelSets]\n        .map(s => JSON.parse(s))\n        .filter(labels =>\n          labels.instance &&\n          labels.instance !== this.dynoId &&\n          labels.process_type === this.processType\n        )\n\n      if (oldLabelSets.length === 0) {\n        console.log(`${this.prefixLogs} No old dynos to delete.`)\n        return\n      }\n\n      for (const labels of oldLabelSets) {\n          try {\n            await this.gatewayDelete({ jobName: this.appName, groupings: labels })\n            console.log(`${this.prefixLogs} Deleted metrics for dyno: ${labels.instance}, labels: ${Object.keys(labels)} `)\n          } catch (err) {\n            console.error(`${this.prefixLogs} Failed to delete metrics for ${labels.instance}:`, err)\n          }\n      }\n\n      console.log(\n        `${this.prefixLogs} Cleared all old instances for job ${this.appName}`\n      )\n    } catch (err) {\n      console.error(`${this.prefixLogs} Error deleting old metrics:`, err)\n    }\n  }\n\n  /**\n   * Delete metrics for this job/instance from PushGateway.\n   *\n   * @param {Object} [params]\n   * @param {string} [params.jobName] Job name (defaults to appName)\n   * @param {Object} [params.groupings] Grouping labels\n   * @param {string} [params.groupings.process_type] Process type label\n   * @param {string} [params.groupings.instance] Instance/dyno ID\n   * @returns {Promise<void>}\n   */\n  gatewayDelete = async (params = {}) => {\n    return this.gateway.delete({\n      jobName: params.jobName || this.appName,\n      groupings: params.groupings || {\n        process_type: this.processType,\n        instance: this.dynoId,\n      },\n    })\n  }\n\n  /**\n   * Push metrics to PushGateway.\n   *\n   * @param {object} [params]\n   * @param {string} [params.jobName]\n   * @param {object} [params.groupings]\n   * @returns {Promise<void>}\n   */\n  gatewayPush = async (params = {}) => {\n    const groupings = {\n      process_type: this.processType,\n      instance: this.dynoId,\n      ...(params.groupings || {}),\n    }\n    return this.gateway.push({\n      jobName: params.jobName || this.appName,\n      groupings,\n    })\n  }\n\n  /**\n   * Merge the default metric labels (`app`, `dyno_id`, `process_type`)\n   * with custom label names.\n   *\n   * @param {string[]} labels Additional label names\n   * @returns {string[]} Combined label names\n   */\n  withDefaultLabels = (labels = []) => {\n    return [...Object.keys(this.defaultLabels), ...labels]\n  }\n\n  getDefaultLabels = (labels = []) => {\n    return this.defaultLabels\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  // GETTERS\n\n  get metricsEnabled() {\n    return this.enabled\n  }\n\n  get metricsLogValues() {\n    return this.logValues\n  }\n\n  get registry() {\n    return this._registry\n  }\n}\n\nmodule.exports = { MetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/redisUtils.d.ts

@@ -41,7 +41,8 @@ export const IOREDIS: "IOREDIS";
  *
  * @param {string} [name='undefined-name'] - Fallback app name if BUILD_APP_NAME is not set.
  * @param {string} [appName='undefined-app'] - appName
+ * @param processName
  * @returns {string}
  */
-export function getCorrectNameForRedis(name?: string | undefined, appName?: string | undefined): string;
+export function getRedisName({ name, appName, processName }?: string | undefined): string;
 //# sourceMappingURL=redisUtils.d.ts.map

package/lib/redisUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redisUtils.d.ts","sourceRoot":"","sources":["../src/redisUtils.js"],"names":[],"mappings":"AAmBA;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAoB/C;AA4BD;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAmB/C;AAjDD;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAoB/C;AA2BD;;;;;GAKG;AACH,kCAHW,GAAG,GACD,OAAO,CASnB;AAED;;;;;GAKG;AACH,2CAHW,GAAG,GACD,MAAM,CAiBlB;AApID,kCAA2B;AAC3B,kCAA2B;AAC3B,gCAAyB;AAKzB;;;;;;GAMG;AAEH,iGAHa,MAAM,CAKlB"}
+{"version":3,"file":"redisUtils.d.ts","sourceRoot":"","sources":["../src/redisUtils.js"],"names":[],"mappings":"AAoBA;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAoB/C;AA4BD;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAmB/C;AAjDD;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAoB/C;AA2BD;;;;;GAKG;AACH,kCAHW,GAAG,GACD,OAAO,CASnB;AAED;;;;;GAKG;AACH,2CAHW,GAAG,GACD,MAAM,CAiBlB;AArID,kCAA2B;AAC3B,kCAA2B;AAC3B,gCAAyB;AAKzB;;;;;;;GAOG;AAEH,mFAHa,MAAM,CAKlB"}

package/lib/redisUtils.js

@@ -11,11 +11,16 @@ const defaultAppName = process.env.BUILD_APP_NAME || 'undefined-app';
  *
  * @param {string} [name='undefined-name'] - Fallback app name if BUILD_APP_NAME is not set.
  * @param {string} [appName='undefined-app'] - appName
+ * @param processName
  * @returns {string}
  */
 // eslint-disable-next-line @typescript-eslint/default-param-last
-const getCorrectNameForRedis = (name = 'undefined-name', appName) => {
-  return `${appName || defaultAppName}:${dyno}:${name}`;
+const getRedisName = ({
+  name = 'undefined-name',
+  appName,
+  processName
+}) => {
+  return `${appName || defaultAppName}:${processName || dyno}:${name}`;
 };
 
 /**
@@ -28,7 +33,7 @@ const createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {
   return (client, name) => {
     if (process.env.NODE_ENV !== 'test') {
       client.on('connect', () => {
-        client.send_command('CLIENT', ['SETNAME', getCorrectNameForRedis(name, defaultAppName)], err => {
+        client.send_command('CLIENT', ['SETNAME', getRedisName(name, defaultAppName)], err => {
           if (err) {
             console.error(`Failed to set client name for ${name}:`, err);
           } else {
@@ -50,7 +55,7 @@ const createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {
   return (client, name) => {
     if (process.env.NODE_ENV !== 'test') {
       client.once('connect', () => {
-        client.call('CLIENT', ['SETNAME', getCorrectNameForRedis(name, defaultAppName)]).then(() => {
+        client.call('CLIENT', ['SETNAME', getRedisName(name, defaultAppName)]).then(() => {
           console.log(`Connected to Redis for pid:${process.pid} (${name})`);
         }).catch(err => {
           console.error(`Failed to set client name for ${name}:`, err);
@@ -71,7 +76,7 @@ const createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {
     if (process.env.NODE_ENV !== 'test') {
       client.on('ready', async () => {
         try {
-          await client.sendCommand(['CLIENT', 'SETNAME', getCorrectNameForRedis(name, defaultAppName)]);
+          await client.sendCommand(['CLIENT', 'SETNAME', getRedisName(name, defaultAppName)]);
           console.log(`Connected to Redis for pid:${process.pid} (${name})`);
         } catch (err) {
           console.error(`Failed to set client name for ${name}:`, err);
@@ -121,6 +126,6 @@ module.exports = {
   REDIS_V4,
   REDIS_V3,
   IOREDIS,
-  getCorrectNameForRedis
+  getRedisName
 };
 //# sourceMappingURL=redisUtils.js.map

package/lib/redisUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"redisUtils.js","names":["REDIS_V4","REDIS_V3","IOREDIS","dyno","process","env","BUILD_DYNO_PROCESS_TYPE","defaultAppName","BUILD_APP_NAME","getCorrectNameForRedis","name","appName","createSetClientNameForRedisV3","client","NODE_ENV","on","send_command","err","console","error","log","pid","createSetClientNameForIoredis","once","call","then","catch","createSetClientNameForRedisV4","sendCommand","isIORedis","disconnect","options","undefined","getRedisClientType","info","Error","module","exports"],"sources":["../src/redisUtils.js"],"sourcesContent":["const REDIS_V4 = 'REDIS_V4'\nconst REDIS_V3 = 'REDIS_V3'\nconst IOREDIS = 'IOREDIS'\n\nconst dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'\nconst defaultAppName = process.env.BUILD_APP_NAME || 'undefined-app'\n\n/**\n * Get default redis client name\n *\n * @param {string} [name='undefined-name'] - Fallback app name if BUILD_APP_NAME is not set.\n * @param {string} [appName='undefined-app'] - appName\n * @returns {string}\n */\n// eslint-disable-next-line @typescript-eslint/default-param-last\nconst getCorrectNameForRedis = (name = 'undefined-name', appName) => {\n  return `${appName || defaultAppName}:${dyno}:${name}`\n}\n\n/**\n * Creates a configured setClientName function for node-redis v3.\n *\n * @param {string} [defaultAppName='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {\n  return (client, name) => {\n    if (process.env.NODE_ENV !== 'test') {\n      client.on('connect', () => {\n        client.send_command(\n          'CLIENT',\n          ['SETNAME', getCorrectNameForRedis(name, defaultAppName)],\n          err => {\n            if (err) {\n              console.error(`Failed to set client name for ${name}:`, err)\n            } else {\n              console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n            }\n          }\n        )\n      })\n    }\n  }\n}\n\n/**\n * Creates a function to set Redis client name for ioredis.\n *\n * @param {string} [defaultAppName='undefined-app']\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {\n  return (client, name) => {\n    if (process.env.NODE_ENV !== 'test') {\n      client.once('connect', () => {\n        client\n          .call('CLIENT', [\n            'SETNAME',\n            getCorrectNameForRedis(name, defaultAppName),\n          ])\n          .then(() => {\n            console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n          })\n          .catch(err => {\n            console.error(`Failed to set client name for ${name}:`, err)\n          })\n      })\n    }\n  }\n}\n\n/**\n * Creates a function to set Redis client name for node-redis v4.\n *\n * @param {string} [defaultAppName='undefined-app']\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {\n  return (client, name) => {\n    if (process.env.NODE_ENV !== 'test') {\n      client.on('ready', async () => {\n        try {\n          await client.sendCommand([\n            'CLIENT',\n            'SETNAME',\n            getCorrectNameForRedis(name, defaultAppName),\n          ])\n          console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n        } catch (err) {\n          console.error(`Failed to set client name for ${name}:`, err)\n        }\n      })\n    }\n  }\n}\n\n/**\n * Check if a Redis client is an ioredis instance\n *\n * @param {any} client - Redis client instance\n * @returns {boolean} True if the client is ioredis\n */\nconst isIORedis = client => {\n  return (\n    client &&\n    typeof client.sendCommand === 'function' &&\n    typeof client.disconnect === 'function' &&\n    client.options !== undefined\n  )\n}\n\n/**\n * Get Redis client type\n *\n * @param {any} client - Redis client instance\n * @returns {string} One of IOREDIS, REDIS_V3, REDIS_V4\n */\nconst getRedisClientType = client => {\n  if (isIORedis(client)) {\n    console.log('Detected node-redis ioredis')\n    return IOREDIS\n  }\n  if (typeof client?.send_command === 'function') {\n    console.log('Detected node-redis redis_v3')\n    return REDIS_V3\n  }\n  if (typeof client.info === 'function') {\n    console.log('Detected node-redis redis_v4')\n    return REDIS_V4\n  }\n\n  throw new Error(`Failed to get Redis client type`)\n}\n\nmodule.exports = {\n  createSetClientNameForRedisV3,\n  createSetClientNameForRedisV4,\n  createSetClientNameForIoredis,\n  isIORedis,\n  getRedisClientType,\n  REDIS_V4,\n  REDIS_V3,\n  IOREDIS,\n  getCorrectNameForRedis,\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"redisUtils.js","names":["REDIS_V4","REDIS_V3","IOREDIS","dyno","process","env","BUILD_DYNO_PROCESS_TYPE","defaultAppName","BUILD_APP_NAME","getRedisName","name","appName","processName","createSetClientNameForRedisV3","client","NODE_ENV","on","send_command","err","console","error","log","pid","createSetClientNameForIoredis","once","call","then","catch","createSetClientNameForRedisV4","sendCommand","isIORedis","disconnect","options","undefined","getRedisClientType","info","Error","module","exports"],"sources":["../src/redisUtils.js"],"sourcesContent":["const REDIS_V4 = 'REDIS_V4'\nconst REDIS_V3 = 'REDIS_V3'\nconst IOREDIS = 'IOREDIS'\n\nconst dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'\nconst defaultAppName = process.env.BUILD_APP_NAME || 'undefined-app'\n\n/**\n * Get default redis client name\n *\n * @param {string} [name='undefined-name'] - Fallback app name if BUILD_APP_NAME is not set.\n * @param {string} [appName='undefined-app'] - appName\n * @param processName\n * @returns {string}\n */\n// eslint-disable-next-line @typescript-eslint/default-param-last\nconst getRedisName = ({ name = 'undefined-name', appName, processName }) => {\n  return `${appName || defaultAppName}:${processName || dyno}:${name}`\n}\n\n/**\n * Creates a configured setClientName function for node-redis v3.\n *\n * @param {string} [defaultAppName='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {\n  return (client, name) => {\n    if (process.env.NODE_ENV !== 'test') {\n      client.on('connect', () => {\n        client.send_command(\n          'CLIENT',\n          ['SETNAME', getRedisName(name, defaultAppName)],\n          err => {\n            if (err) {\n              console.error(`Failed to set client name for ${name}:`, err)\n            } else {\n              console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n            }\n          }\n        )\n      })\n    }\n  }\n}\n\n/**\n * Creates a function to set Redis client name for ioredis.\n *\n * @param {string} [defaultAppName='undefined-app']\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {\n  return (client, name) => {\n    if (process.env.NODE_ENV !== 'test') {\n      client.once('connect', () => {\n        client\n          .call('CLIENT', [\n            'SETNAME',\n            getRedisName(name, defaultAppName),\n          ])\n          .then(() => {\n            console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n          })\n          .catch(err => {\n            console.error(`Failed to set client name for ${name}:`, err)\n          })\n      })\n    }\n  }\n}\n\n/**\n * Creates a function to set Redis client name for node-redis v4.\n *\n * @param {string} [defaultAppName='undefined-app']\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {\n  return (client, name) => {\n    if (process.env.NODE_ENV !== 'test') {\n      client.on('ready', async () => {\n        try {\n          await client.sendCommand([\n            'CLIENT',\n            'SETNAME',\n            getRedisName(name, defaultAppName),\n          ])\n          console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n        } catch (err) {\n          console.error(`Failed to set client name for ${name}:`, err)\n        }\n      })\n    }\n  }\n}\n\n/**\n * Check if a Redis client is an ioredis instance\n *\n * @param {any} client - Redis client instance\n * @returns {boolean} True if the client is ioredis\n */\nconst isIORedis = client => {\n  return (\n    client &&\n    typeof client.sendCommand === 'function' &&\n    typeof client.disconnect === 'function' &&\n    client.options !== undefined\n  )\n}\n\n/**\n * Get Redis client type\n *\n * @param {any} client - Redis client instance\n * @returns {string} One of IOREDIS, REDIS_V3, REDIS_V4\n */\nconst getRedisClientType = client => {\n  if (isIORedis(client)) {\n    console.log('Detected node-redis ioredis')\n    return IOREDIS\n  }\n  if (typeof client?.send_command === 'function') {\n    console.log('Detected node-redis redis_v3')\n    return REDIS_V3\n  }\n  if (typeof client.info === 'function') {\n    console.log('Detected node-redis redis_v4')\n    return REDIS_V4\n  }\n\n  throw new Error(`Failed to get Redis client type`)\n}\n\nmodule.exports = {\n  createSetClientNameForRedisV3,\n  createSetClientNameForRedisV4,\n  createSetClientNameForIoredis,\n  isIORedis,\n  getRedisClientType,\n  REDIS_V4,\n  REDIS_V3,\n  IOREDIS,\n  getRedisName,\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adalo/metrics",
-  "version": "0.1.105",
+  "version": "0.1.107",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/metricsClient.js

@@ -500,40 +500,61 @@ class MetricsClient {
       })
 
       if (!res.ok) {
-        console.error(
-          `${this.prefixLogs} Failed to fetch metrics: ${res.status}`
-        )
+        console.error(`${this.prefixLogs} Failed to fetch metrics: ${res.status}`)
         return
       }
 
       const text = await res.text()
 
-      const regex = new RegExp(
-        `(?:instance="([^"]+)".*job="${this.appName}"|job="${this.appName}".*instance="([^"]+)")`,
-        'g'
-      )
-      const instances = new Set()
+
+      const metricRegex = /([a-zA-Z_:][a-zA-Z0-9_:]*)\{([^}]*)\}/gm
+      const labelRegex = /(\w+)="([^"]*)"/g
+
+      const uniqueLabelSets = new Set()
+
       let match
       // eslint-disable-next-line no-cond-assign
-      while ((match = regex.exec(text)) !== null) {
-        const instance = match[1] || match[2]
-        if (instance && instance !== this.dynoId) instances.add(instance)
+      while ((match = metricRegex.exec(text)) !== null) {
+        const rawLabels = match[2]
+        let lr
+        const labels = {}
+
+        // eslint-disable-next-line no-cond-assign
+        while ((lr = labelRegex.exec(rawLabels)) !== null) {
+          // eslint-disable-next-line prefer-destructuring
+          labels[lr[1]] = lr[2]
+        }
+
+        if (labels.job === this.appName && labels.process_type === this.processType) {
+          uniqueLabelSets.add(JSON.stringify(labels))
+        }
       }
 
-      if (instances.size === 0) {
-        console.log(`${this.prefixLogs} No old dynos to delete.`)
+      if (uniqueLabelSets.size === 0) {
+        console.log(`${this.prefixLogs} No metrics found for job ${this.appName}`)
         return
       }
 
-      for (const instance of instances) {
-        await this.gatewayDelete({
-          groupings: {
-            instance,
-          },
-        })
-        console.log(
-          `${this.prefixLogs} Deleted metrics for old dyno: ${instance}`
+      const oldLabelSets = [...uniqueLabelSets]
+        .map(s => JSON.parse(s))
+        .filter(labels =>
+          labels.instance &&
+          labels.instance !== this.dynoId &&
+          labels.process_type === this.processType
         )
+
+      if (oldLabelSets.length === 0) {
+        console.log(`${this.prefixLogs} No old dynos to delete.`)
+        return
+      }
+
+      for (const labels of oldLabelSets) {
+          try {
+            await this.gatewayDelete({ jobName: this.appName, groupings: labels })
+            console.log(`${this.prefixLogs} Deleted metrics for dyno: ${labels.instance}, labels: ${Object.keys(labels)} `)
+          } catch (err) {
+            console.error(`${this.prefixLogs} Failed to delete metrics for ${labels.instance}:`, err)
+          }
       }
 
       console.log(
@@ -557,9 +578,9 @@ class MetricsClient {
   gatewayDelete = async (params = {}) => {
     return this.gateway.delete({
       jobName: params.jobName || this.appName,
-      groupings: {
-        process_type: params.groupings?.process_type || this.processType,
-        instance: params.groupings?.instance || this.dynoId,
+      groupings: params.groupings || {
+        process_type: this.processType,
+        instance: this.dynoId,
       },
     })
   }

package/src/redisUtils.js

@@ -10,11 +10,12 @@ const defaultAppName = process.env.BUILD_APP_NAME || 'undefined-app'
  *
  * @param {string} [name='undefined-name'] - Fallback app name if BUILD_APP_NAME is not set.
  * @param {string} [appName='undefined-app'] - appName
+ * @param processName
  * @returns {string}
  */
 // eslint-disable-next-line @typescript-eslint/default-param-last
-const getCorrectNameForRedis = (name = 'undefined-name', appName) => {
-  return `${appName || defaultAppName}:${dyno}:${name}`
+const getRedisName = ({ name = 'undefined-name', appName, processName }) => {
+  return `${appName || defaultAppName}:${processName || dyno}:${name}`
 }
 
 /**
@@ -29,7 +30,7 @@ const createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {
       client.on('connect', () => {
         client.send_command(
           'CLIENT',
-          ['SETNAME', getCorrectNameForRedis(name, defaultAppName)],
+          ['SETNAME', getRedisName(name, defaultAppName)],
           err => {
             if (err) {
               console.error(`Failed to set client name for ${name}:`, err)
@@ -56,7 +57,7 @@ const createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {
         client
           .call('CLIENT', [
             'SETNAME',
-            getCorrectNameForRedis(name, defaultAppName),
+            getRedisName(name, defaultAppName),
           ])
           .then(() => {
             console.log(`Connected to Redis for pid:${process.pid} (${name})`)
@@ -83,7 +84,7 @@ const createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {
           await client.sendCommand([
             'CLIENT',
             'SETNAME',
-            getCorrectNameForRedis(name, defaultAppName),
+            getRedisName(name, defaultAppName),
           ])
           console.log(`Connected to Redis for pid:${process.pid} (${name})`)
         } catch (err) {
@@ -141,5 +142,5 @@ module.exports = {
   REDIS_V4,
   REDIS_V3,
   IOREDIS,
-  getCorrectNameForRedis,
+  getRedisName,
 }