@adalo/metrics 0.1.171 → 0.1.173

package/lib/health/healthCheckClient.js

@@ -31,7 +31,7 @@ const DEFAULT_HEALTH_CONFIG = {
   checkIntervalMs: 30_000,
   staleThresholdMs: 180_000,
   checkTimeoutMs: 15_000,
-  maxDbConnectLatencyMs: readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 1000
+  maxDbConnectLatencyMs: readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 30_000
 };
 const SENSITIVE_PATTERNS = [{
   pattern: /(postgres(?:ql)?|mysql|mongodb|redis|amqp):\/\/([^:]+):([^@]+)@([^:/]+)(:\d+)?\/([^\s?]+)/gi,

package/lib/health/healthCheckClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"healthCheckClient.js","names":["createDatabasePool","runHealthCheck","closePool","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","HealthCheckCache","readNumberEnv","name","raw","process","env","undefined","num","Number","isFinite","DEFAULT_HEALTH_CONFIG","checkIntervalMs","staleThresholdMs","checkTimeoutMs","maxDbConnectLatencyMs","SENSITIVE_PATTERNS","pattern","replacement","maskSensitiveData","text","masked","replace","HealthCheckClient","constructor","options","healthConfig","config","appName","BUILD_APP_NAME","prefixLogs","_refreshPromise","_databasePools","Map","_resources","resources","redisClient","_getRedisClientForCache","_redisClientType","_cache","cacheKey","_getEnv","resource","redisResource","find","r","client","_getPool","url","has","pool","type","set","get","_checkDatabase","status","error","timings","maxConnect","connectMs","err","healthCheckTimings","message","_checkRedis","pong","Promise","resolve","reject","ping","result","_performHealthCheckInternal","sortedResources","Object","keys","sort","reduce","acc","key","hasError","values","some","lastCheckAt","Date","now","isStale","_formatResult","cached","performHealthCheck","then","catch","getCachedResult","console","refreshCache","clearCache","_log503Failure","req","payload","requestId","headers","id","line","msg","request_id","resourceErrors","entries","filter","map","warn","JSON","stringify","healthHandler","res","body","json","statusCode","cleanup","clear","module","exports"],"sources":["../../src/health/healthCheckClient.js"],"sourcesContent":["const {\n  createDatabasePool,\n  runHealthCheck,\n  closePool,\n} = require('./databaseChecker')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('../redisUtils')\nconst { HealthCheckCache } = require('./healthCheckCache')\n\n/**\n * @param {string} name\n * @returns {number | undefined}\n */\nfunction readNumberEnv(name) {\n  const raw = process.env[name]\n  if (raw == null || raw === '') return undefined\n  const num = Number(raw)\n  return Number.isFinite(num) ? num : undefined\n}\n\n/** @type {{ checkIntervalMs: number, staleThresholdMs: number, checkTimeoutMs: number, maxDbConnectLatencyMs: number }} */\nconst DEFAULT_HEALTH_CONFIG = {\n  checkIntervalMs: 30_000,\n  staleThresholdMs: 180_000,\n  checkTimeoutMs: 15_000,\n  maxDbConnectLatencyMs:\n    readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 1000,\n}\n\nconst SENSITIVE_PATTERNS = [\n  {\n    pattern:\n      /(postgres(?:ql)?|mysql|mongodb|redis|amqp):\\/\\/([^:]+):([^@]+)@([^:/]+)(:\\d+)?\\/([^\\s?]+)/gi,\n    replacement: '$1://***:***@***$5/***',\n  },\n  {\n    pattern: /(\\w+):\\/\\/([^:]+):([^@]+)@([^\\s/]+)/gi,\n    replacement: '$1://***:***@***',\n  },\n  {\n    pattern:\n      /(password|passwd|pwd|secret|token|api[_-]?key|auth[_-]?token)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n  {\n    pattern:\n      /(database|table|schema|role|user|relation|column|index)\\s*[\"']([^\"']+)[\"']/gi,\n    replacement: '$1 \"***\"',\n  },\n  {\n    pattern: /\\b(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})(:\\d+)?\\b/g,\n    replacement: '***$2',\n  },\n  {\n    pattern: /\\b(host|hostname|server)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n]\n\n/**\n * @param {string} text\n * @returns {string}\n */\nfunction maskSensitiveData(text) {\n  if (!text || typeof text !== 'string') return text\n  let masked = text\n  for (const { pattern, replacement } of SENSITIVE_PATTERNS) {\n    masked = masked.replace(pattern, replacement)\n  }\n  return masked\n}\n\n/**\n * @typedef {{ env: string, url?: string } | { env: string, client?: any }} HealthResource\n */\nclass HealthCheckClient {\n  /**\n   * @param {Object} options\n   * @param {HealthResource[]} options.resources - Must include Redis resource with client\n   * @param {Object} [options.config]\n   * @param {string} [options.appName] - For cache key: healthcheck:${appName}\n   * @param {string} [options.cacheKey] - Redis key (overrides appName)\n   */\n  constructor(options = {}) {\n    this.healthConfig = { ...DEFAULT_HEALTH_CONFIG, ...options.config }\n    this.appName =\n      options.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n\n    this.prefixLogs = `[${this.appName}] [HealthCheck]`\n\n    this._refreshPromise = null\n    /** @type {Map<string, { pool: any, type: string }>} */\n    this._databasePools = new Map()\n\n    /** @type {HealthResource[]} */\n    this._resources = options.resources || []\n\n    const redisClient = this._getRedisClientForCache()\n    if (redisClient) {\n      this._redisClientType = getRedisClientType(redisClient)\n    }\n\n    this._cache = new HealthCheckCache({\n      redisClient: redisClient || null,\n      cacheKey: options.cacheKey,\n      appName: this.appName,\n      staleThresholdMs: this.healthConfig.staleThresholdMs,\n    })\n  }\n\n  _getEnv(resource) {\n    return resource.env ?? resource.name\n  }\n\n  _getRedisClientForCache() {\n    const redisResource = this._resources.find(r => 'client' in r && r.client)\n    return redisResource?.client || null\n  }\n\n  _getPool(env, url) {\n    if (!this._databasePools.has(env)) {\n      const { pool, type } = createDatabasePool(\n        env,\n        url,\n        this.healthConfig.checkTimeoutMs\n      )\n      this._databasePools.set(env, { pool, type })\n    }\n    return this._databasePools.get(env)\n  }\n\n  async _checkDatabase(resource) {\n    const env = this._getEnv(resource)\n    const url = 'url' in resource ? resource.url : process.env[env]\n    if (!url) {\n      return { status: 'error', error: `Env ${env} not set` }\n    }\n\n    try {\n      const { pool, type } = this._getPool(env, url)\n      const timings = await runHealthCheck(pool, type)\n\n      const maxConnect = this.healthConfig.maxDbConnectLatencyMs\n      if (\n        typeof maxConnect === 'number' &&\n        Number.isFinite(maxConnect) &&\n        timings?.connectMs != null &&\n        timings.connectMs > maxConnect\n      ) {\n        return {\n          status: 'error',\n          error: `DB connect latency ${timings.connectMs}ms exceeds ${maxConnect}ms`,\n          connectMs: timings.connectMs,\n        }\n      }\n\n      return { status: 'ok', connectMs: timings.connectMs }\n    } catch (err) {\n      const timings = err?.healthCheckTimings\n      return {\n        status: 'error',\n        error: maskSensitiveData(err.message),\n        ...(timings && typeof timings === 'object'\n          ? { connectMs: timings.connectMs }\n          : {}),\n      }\n    }\n  }\n\n  async _checkRedis(resource) {\n    const { client } = resource\n    if (!client) return { status: 'ok' }\n\n    try {\n      let pong\n      if (this._redisClientType === REDIS_V3) {\n        pong = await new Promise((resolve, reject) => {\n          client.ping((err, result) => {\n            if (err) reject(err)\n            else resolve(result)\n          })\n        })\n      } else if (\n        this._redisClientType === REDIS_V4 ||\n        this._redisClientType === IOREDIS\n      ) {\n        pong = await client.ping()\n      } else {\n        return { status: 'error', error: 'Unknown Redis client type' }\n      }\n\n      return pong === 'PONG'\n        ? { status: 'ok' }\n        : { status: 'error', error: `Unexpected: ${pong}` }\n    } catch (err) {\n      return { status: 'error', error: maskSensitiveData(err.message) }\n    }\n  }\n\n  async _performHealthCheckInternal() {\n    const resources = {}\n\n    for (const resource of this._resources) {\n      const env = this._getEnv(resource)\n\n      if ('client' in resource && resource.client) {\n        resources[env] = await this._checkRedis(resource)\n      } else {\n        resources[env] = await this._checkDatabase(resource)\n      }\n    }\n\n    const sortedResources = Object.keys(resources)\n      .sort()\n      .reduce((acc, key) => {\n        acc[key] = resources[key]\n        return acc\n      }, {})\n\n    const hasError = Object.values(resources).some(r => r.status === 'error')\n    const lastCheckAt = Date.now()\n\n    return {\n      status: hasError ? 'error' : 'ok',\n      lastCheckAt,\n      resources: sortedResources,\n      isStale: false,\n      config: this.healthConfig,\n    }\n  }\n\n  _formatResult(result, cached = false) {\n    const isStale =\n      !result.lastCheckAt ||\n      Date.now() - result.lastCheckAt > this.healthConfig.staleThresholdMs\n\n    return {\n      ...result,\n      isStale,\n      status: isStale ? 'stale' : result.status,\n      ...(isStale && {\n        error:\n          'Health check data is stale, health-check worker may not be running. Resource statuses are unknown.',\n      }),\n      ...(cached && { cached: true }),\n    }\n  }\n\n  async performHealthCheck() {\n    if (this._refreshPromise) {\n      return this._refreshPromise\n    }\n\n    this._refreshPromise = this._performHealthCheckInternal()\n      .then(result => {\n        this._refreshPromise = null\n        return this._formatResult(result)\n      })\n      .catch(err => {\n        this._refreshPromise = null\n        throw err\n      })\n\n    return this._refreshPromise\n  }\n\n  async getCachedResult() {\n    try {\n      const cached = await this._cache.get()\n      if (cached) return this._formatResult(cached)\n      return null\n    } catch (err) {\n      console.error(`${this.prefixLogs} Failed to read from cache:`, err)\n      return {\n        status: 'error',\n        lastCheckAt: null,\n        resources: {},\n        isStale: true,\n        error:\n          'Redis unavailable, unable to read health status of other resources',\n        config: this.healthConfig,\n      }\n    }\n  }\n\n  async refreshCache() {\n    const result = await this._performHealthCheckInternal()\n    await this._cache.set(result)\n    return result\n  }\n\n  clearCache() {\n    this._refreshPromise = null\n  }\n\n  /**\n   * Logs a structured line when health returns 503 so log drains / Loki can store\n   * and query failed health data. Includes request_id when present for correlation\n   * with router logs.\n   * @param {object} req - Express request (for request_id header)\n   * @param {object} payload - Safe summary of the 503 response body\n   */\n  _log503Failure(req, payload) {\n    const requestId =\n      (req && req.headers && req.headers['x-request-id']) ||\n      (req && req.id) ||\n      null\n    const line = {\n      msg: 'HealthCheck 503',\n      appName: this.appName,\n      request_id: requestId,\n      error: payload.error,\n      isStale: payload.isStale,\n      status: payload.status,\n      resourceErrors:\n        payload.resources &&\n        Object.entries(payload.resources)\n          .filter(([, r]) => r && r.status === 'error')\n          .map(([env, r]) => ({ env, error: r.error })),\n    }\n    console.warn(JSON.stringify(line))\n  }\n\n  healthHandler() {\n    return async (req, res) => {\n      try {\n        const result = await this.getCachedResult()\n\n        if (!result) {\n          const body = {\n            status: 'error',\n            lastCheckAt: null,\n            resources: {},\n            isStale: true,\n            error:\n              'No health check data yet, health-check worker may not be running',\n            config: this.healthConfig,\n          }\n          this._log503Failure(req, body)\n          res.status(503).json(body)\n          return\n        }\n\n        const statusCode = result.status === 'ok' ? 200 : 503\n        if (statusCode === 503) {\n          this._log503Failure(req, result)\n        }\n        res.status(statusCode).json(result)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Health check failed:`, err)\n        const body = {\n          status: 'error',\n          lastCheckAt: null,\n          resources: {},\n          isStale: true,\n          error:\n            'Redis unavailable, unable to read health status of other resources',\n          config: this.healthConfig,\n        }\n        this._log503Failure(req, body)\n        res.status(503).json(body)\n      }\n    }\n  }\n\n  async cleanup() {\n    for (const [, { pool }] of this._databasePools) {\n      try {\n        await closePool(pool)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Error closing database pool:`, err)\n      }\n    }\n    this._databasePools.clear()\n  }\n}\n\nmodule.exports = { HealthCheckClient, DEFAULT_HEALTH_CONFIG }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"healthCheckClient.js","names":["createDatabasePool","runHealthCheck","closePool","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","HealthCheckCache","readNumberEnv","name","raw","process","env","undefined","num","Number","isFinite","DEFAULT_HEALTH_CONFIG","checkIntervalMs","staleThresholdMs","checkTimeoutMs","maxDbConnectLatencyMs","SENSITIVE_PATTERNS","pattern","replacement","maskSensitiveData","text","masked","replace","HealthCheckClient","constructor","options","healthConfig","config","appName","BUILD_APP_NAME","prefixLogs","_refreshPromise","_databasePools","Map","_resources","resources","redisClient","_getRedisClientForCache","_redisClientType","_cache","cacheKey","_getEnv","resource","redisResource","find","r","client","_getPool","url","has","pool","type","set","get","_checkDatabase","status","error","timings","maxConnect","connectMs","err","healthCheckTimings","message","_checkRedis","pong","Promise","resolve","reject","ping","result","_performHealthCheckInternal","sortedResources","Object","keys","sort","reduce","acc","key","hasError","values","some","lastCheckAt","Date","now","isStale","_formatResult","cached","performHealthCheck","then","catch","getCachedResult","console","refreshCache","clearCache","_log503Failure","req","payload","requestId","headers","id","line","msg","request_id","resourceErrors","entries","filter","map","warn","JSON","stringify","healthHandler","res","body","json","statusCode","cleanup","clear","module","exports"],"sources":["../../src/health/healthCheckClient.js"],"sourcesContent":["const {\n  createDatabasePool,\n  runHealthCheck,\n  closePool,\n} = require('./databaseChecker')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('../redisUtils')\nconst { HealthCheckCache } = require('./healthCheckCache')\n\n/**\n * @param {string} name\n * @returns {number | undefined}\n */\nfunction readNumberEnv(name) {\n  const raw = process.env[name]\n  if (raw == null || raw === '') return undefined\n  const num = Number(raw)\n  return Number.isFinite(num) ? num : undefined\n}\n\n/** @type {{ checkIntervalMs: number, staleThresholdMs: number, checkTimeoutMs: number, maxDbConnectLatencyMs: number }} */\nconst DEFAULT_HEALTH_CONFIG = {\n  checkIntervalMs: 30_000,\n  staleThresholdMs: 180_000,\n  checkTimeoutMs: 15_000,\n  maxDbConnectLatencyMs:\n    readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 30_000,\n}\n\nconst SENSITIVE_PATTERNS = [\n  {\n    pattern:\n      /(postgres(?:ql)?|mysql|mongodb|redis|amqp):\\/\\/([^:]+):([^@]+)@([^:/]+)(:\\d+)?\\/([^\\s?]+)/gi,\n    replacement: '$1://***:***@***$5/***',\n  },\n  {\n    pattern: /(\\w+):\\/\\/([^:]+):([^@]+)@([^\\s/]+)/gi,\n    replacement: '$1://***:***@***',\n  },\n  {\n    pattern:\n      /(password|passwd|pwd|secret|token|api[_-]?key|auth[_-]?token)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n  {\n    pattern:\n      /(database|table|schema|role|user|relation|column|index)\\s*[\"']([^\"']+)[\"']/gi,\n    replacement: '$1 \"***\"',\n  },\n  {\n    pattern: /\\b(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})(:\\d+)?\\b/g,\n    replacement: '***$2',\n  },\n  {\n    pattern: /\\b(host|hostname|server)[\"\\s]*[:=][\"\\s]*([^\\s,}\"]+)/gi,\n    replacement: '$1=***',\n  },\n]\n\n/**\n * @param {string} text\n * @returns {string}\n */\nfunction maskSensitiveData(text) {\n  if (!text || typeof text !== 'string') return text\n  let masked = text\n  for (const { pattern, replacement } of SENSITIVE_PATTERNS) {\n    masked = masked.replace(pattern, replacement)\n  }\n  return masked\n}\n\n/**\n * @typedef {{ env: string, url?: string } | { env: string, client?: any }} HealthResource\n */\nclass HealthCheckClient {\n  /**\n   * @param {Object} options\n   * @param {HealthResource[]} options.resources - Must include Redis resource with client\n   * @param {Object} [options.config]\n   * @param {string} [options.appName] - For cache key: healthcheck:${appName}\n   * @param {string} [options.cacheKey] - Redis key (overrides appName)\n   */\n  constructor(options = {}) {\n    this.healthConfig = { ...DEFAULT_HEALTH_CONFIG, ...options.config }\n    this.appName =\n      options.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n\n    this.prefixLogs = `[${this.appName}] [HealthCheck]`\n\n    this._refreshPromise = null\n    /** @type {Map<string, { pool: any, type: string }>} */\n    this._databasePools = new Map()\n\n    /** @type {HealthResource[]} */\n    this._resources = options.resources || []\n\n    const redisClient = this._getRedisClientForCache()\n    if (redisClient) {\n      this._redisClientType = getRedisClientType(redisClient)\n    }\n\n    this._cache = new HealthCheckCache({\n      redisClient: redisClient || null,\n      cacheKey: options.cacheKey,\n      appName: this.appName,\n      staleThresholdMs: this.healthConfig.staleThresholdMs,\n    })\n  }\n\n  _getEnv(resource) {\n    return resource.env ?? resource.name\n  }\n\n  _getRedisClientForCache() {\n    const redisResource = this._resources.find(r => 'client' in r && r.client)\n    return redisResource?.client || null\n  }\n\n  _getPool(env, url) {\n    if (!this._databasePools.has(env)) {\n      const { pool, type } = createDatabasePool(\n        env,\n        url,\n        this.healthConfig.checkTimeoutMs\n      )\n      this._databasePools.set(env, { pool, type })\n    }\n    return this._databasePools.get(env)\n  }\n\n  async _checkDatabase(resource) {\n    const env = this._getEnv(resource)\n    const url = 'url' in resource ? resource.url : process.env[env]\n    if (!url) {\n      return { status: 'error', error: `Env ${env} not set` }\n    }\n\n    try {\n      const { pool, type } = this._getPool(env, url)\n      const timings = await runHealthCheck(pool, type)\n\n      const maxConnect = this.healthConfig.maxDbConnectLatencyMs\n      if (\n        typeof maxConnect === 'number' &&\n        Number.isFinite(maxConnect) &&\n        timings?.connectMs != null &&\n        timings.connectMs > maxConnect\n      ) {\n        return {\n          status: 'error',\n          error: `DB connect latency ${timings.connectMs}ms exceeds ${maxConnect}ms`,\n          connectMs: timings.connectMs,\n        }\n      }\n\n      return { status: 'ok', connectMs: timings.connectMs }\n    } catch (err) {\n      const timings = err?.healthCheckTimings\n      return {\n        status: 'error',\n        error: maskSensitiveData(err.message),\n        ...(timings && typeof timings === 'object'\n          ? { connectMs: timings.connectMs }\n          : {}),\n      }\n    }\n  }\n\n  async _checkRedis(resource) {\n    const { client } = resource\n    if (!client) return { status: 'ok' }\n\n    try {\n      let pong\n      if (this._redisClientType === REDIS_V3) {\n        pong = await new Promise((resolve, reject) => {\n          client.ping((err, result) => {\n            if (err) reject(err)\n            else resolve(result)\n          })\n        })\n      } else if (\n        this._redisClientType === REDIS_V4 ||\n        this._redisClientType === IOREDIS\n      ) {\n        pong = await client.ping()\n      } else {\n        return { status: 'error', error: 'Unknown Redis client type' }\n      }\n\n      return pong === 'PONG'\n        ? { status: 'ok' }\n        : { status: 'error', error: `Unexpected: ${pong}` }\n    } catch (err) {\n      return { status: 'error', error: maskSensitiveData(err.message) }\n    }\n  }\n\n  async _performHealthCheckInternal() {\n    const resources = {}\n\n    for (const resource of this._resources) {\n      const env = this._getEnv(resource)\n\n      if ('client' in resource && resource.client) {\n        resources[env] = await this._checkRedis(resource)\n      } else {\n        resources[env] = await this._checkDatabase(resource)\n      }\n    }\n\n    const sortedResources = Object.keys(resources)\n      .sort()\n      .reduce((acc, key) => {\n        acc[key] = resources[key]\n        return acc\n      }, {})\n\n    const hasError = Object.values(resources).some(r => r.status === 'error')\n    const lastCheckAt = Date.now()\n\n    return {\n      status: hasError ? 'error' : 'ok',\n      lastCheckAt,\n      resources: sortedResources,\n      isStale: false,\n      config: this.healthConfig,\n    }\n  }\n\n  _formatResult(result, cached = false) {\n    const isStale =\n      !result.lastCheckAt ||\n      Date.now() - result.lastCheckAt > this.healthConfig.staleThresholdMs\n\n    return {\n      ...result,\n      isStale,\n      status: isStale ? 'stale' : result.status,\n      ...(isStale && {\n        error:\n          'Health check data is stale, health-check worker may not be running. Resource statuses are unknown.',\n      }),\n      ...(cached && { cached: true }),\n    }\n  }\n\n  async performHealthCheck() {\n    if (this._refreshPromise) {\n      return this._refreshPromise\n    }\n\n    this._refreshPromise = this._performHealthCheckInternal()\n      .then(result => {\n        this._refreshPromise = null\n        return this._formatResult(result)\n      })\n      .catch(err => {\n        this._refreshPromise = null\n        throw err\n      })\n\n    return this._refreshPromise\n  }\n\n  async getCachedResult() {\n    try {\n      const cached = await this._cache.get()\n      if (cached) return this._formatResult(cached)\n      return null\n    } catch (err) {\n      console.error(`${this.prefixLogs} Failed to read from cache:`, err)\n      return {\n        status: 'error',\n        lastCheckAt: null,\n        resources: {},\n        isStale: true,\n        error:\n          'Redis unavailable, unable to read health status of other resources',\n        config: this.healthConfig,\n      }\n    }\n  }\n\n  async refreshCache() {\n    const result = await this._performHealthCheckInternal()\n    await this._cache.set(result)\n    return result\n  }\n\n  clearCache() {\n    this._refreshPromise = null\n  }\n\n  /**\n   * Logs a structured line when health returns 503 so log drains / Loki can store\n   * and query failed health data. Includes request_id when present for correlation\n   * with router logs.\n   * @param {object} req - Express request (for request_id header)\n   * @param {object} payload - Safe summary of the 503 response body\n   */\n  _log503Failure(req, payload) {\n    const requestId =\n      (req && req.headers && req.headers['x-request-id']) ||\n      (req && req.id) ||\n      null\n    const line = {\n      msg: 'HealthCheck 503',\n      appName: this.appName,\n      request_id: requestId,\n      error: payload.error,\n      isStale: payload.isStale,\n      status: payload.status,\n      resourceErrors:\n        payload.resources &&\n        Object.entries(payload.resources)\n          .filter(([, r]) => r && r.status === 'error')\n          .map(([env, r]) => ({ env, error: r.error })),\n    }\n    console.warn(JSON.stringify(line))\n  }\n\n  healthHandler() {\n    return async (req, res) => {\n      try {\n        const result = await this.getCachedResult()\n\n        if (!result) {\n          const body = {\n            status: 'error',\n            lastCheckAt: null,\n            resources: {},\n            isStale: true,\n            error:\n              'No health check data yet, health-check worker may not be running',\n            config: this.healthConfig,\n          }\n          this._log503Failure(req, body)\n          res.status(503).json(body)\n          return\n        }\n\n        const statusCode = result.status === 'ok' ? 200 : 503\n        if (statusCode === 503) {\n          this._log503Failure(req, result)\n        }\n        res.status(statusCode).json(result)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Health check failed:`, err)\n        const body = {\n          status: 'error',\n          lastCheckAt: null,\n          resources: {},\n          isStale: true,\n          error:\n            'Redis unavailable, unable to read health status of other resources',\n          config: this.healthConfig,\n        }\n        this._log503Failure(req, body)\n        res.status(503).json(body)\n      }\n    }\n  }\n\n  async cleanup() {\n    for (const [, { pool }] of this._databasePools) {\n      try {\n        await closePool(pool)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Error closing database pool:`, err)\n      }\n    }\n    this._databasePools.clear()\n  }\n}\n\nmodule.exports = { HealthCheckClient, DEFAULT_HEALTH_CONFIG }\n"],"mappings":"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","ignoreList":[]}

package/lib/health/healthCheckWorker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"healthCheckWorker.d.ts","sourceRoot":"","sources":["../../src/health/healthCheckWorker.js"],"names":[],"mappings":"AAYA,2EA0DC"}
+{"version":3,"file":"healthCheckWorker.d.ts","sourceRoot":"","sources":["../../src/health/healthCheckWorker.js"],"names":[],"mappings":"AA2BA,2EA4DC"}

package/lib/health/healthCheckWorker.js

@@ -19,6 +19,18 @@ const {
 const {
   DEFAULT_HEALTH_CONFIG
 } = require('./healthCheckClient');
+
+/** Latency above this (ms) triggers a warning log on the worker. 2000 = 2 seconds. */
+const LATENCY_WARNING_MS = 2000;
+function logLatencyWarnings(prefixLogs, result) {
+  const resources = result?.resources || {};
+  for (const [env, r] of Object.entries(resources)) {
+    const connectMs = r?.connectMs;
+    if (typeof connectMs === 'number' && connectMs > LATENCY_WARNING_MS) {
+      console.warn(`${prefixLogs} DB connect latency high: ${env} connectMs=${connectMs}ms (threshold ${LATENCY_WARNING_MS}ms)`);
+    }
+  }
+}
 function createHealthCheckWorker(options) {
   const {
     refreshIntervalMs = DEFAULT_HEALTH_CONFIG.checkIntervalMs,
@@ -34,7 +46,8 @@ function createHealthCheckWorker(options) {
     console.log(`${prefixLogs} Starting health check worker...`);
     console.log(`${prefixLogs} Refresh interval: ${refreshIntervalMs}ms`);
     try {
-      await healthCheckClient.refreshCache();
+      const result = await healthCheckClient.refreshCache();
+      logLatencyWarnings(prefixLogs, result);
       if (logValues) {
         console.log(`${prefixLogs} Initial health check completed`);
       }
@@ -44,6 +57,7 @@ function createHealthCheckWorker(options) {
     const interval = setInterval(async () => {
       try {
         const result = await healthCheckClient.refreshCache();
+        logLatencyWarnings(prefixLogs, result);
         if (logValues) {
           console.log(`${prefixLogs} Health check refreshed at ${result.lastCheckAt}, status: ${result.status}`);
         }

package/lib/health/healthCheckWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"healthCheckWorker.js","names":["createHealthCheckWorkerClient","require","DEFAULT_HEALTH_CONFIG","createHealthCheckWorker","options","refreshIntervalMs","checkIntervalMs","workerClientOptions","appName","process","env","BUILD_APP_NAME","dynoId","HOSTNAME","processType","BUILD_DYNO_PROCESS_TYPE","logValues","HEALTH_LOG_VALUES","prefixLogs","healthCheckClient","runHealthCheckWorker","console","log","refreshCache","err","error","interval","setInterval","result","lastCheckAt","status","on","clearInterval","cleanup","finally","exit"],"sources":["../../src/health/healthCheckWorker.js"],"sourcesContent":["/**\n * @param {Object} options\n * @param {{ name: string } | { name: string, url?: string } | { name: string, client: any }}[] options.resources - Must include Redis resource with client\n * @param {string} [options.appName]\n * @param {number} [options.refreshIntervalMs]\n * @param {string} [options.databaseUrl]\n * @param {string} [options.databaseName]\n * @param {Object<string, string>} [options.additionalDatabaseUrls]\n */\nconst { createHealthCheckWorkerClient } = require('./healthCheckUtils')\nconst { DEFAULT_HEALTH_CONFIG } = require('./healthCheckClient')\n\nexport function createHealthCheckWorker(options) {\n  const {\n    refreshIntervalMs = DEFAULT_HEALTH_CONFIG.checkIntervalMs,\n    ...workerClientOptions\n  } = options\n\n  const appName =\n    workerClientOptions.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n  const dynoId = process.env.HOSTNAME || 'unknown-dyno'\n  const processType =\n    process.env.BUILD_DYNO_PROCESS_TYPE || 'health-check-worker'\n  const logValues = process.env.HEALTH_LOG_VALUES === 'true'\n  const prefixLogs = `[${processType}] [${appName}] [${dynoId}] [HealthCheck]`\n\n  const healthCheckClient = createHealthCheckWorkerClient(workerClientOptions)\n\n  return async function runHealthCheckWorker() {\n    console.log(`${prefixLogs} Starting health check worker...`)\n    console.log(`${prefixLogs} Refresh interval: ${refreshIntervalMs}ms`)\n\n    try {\n      await healthCheckClient.refreshCache()\n      if (logValues) {\n        console.log(`${prefixLogs} Initial health check completed`)\n      }\n    } catch (err) {\n      console.error(`${prefixLogs} Initial health check failed:`, err)\n    }\n\n    const interval = setInterval(async () => {\n      try {\n        const result = await healthCheckClient.refreshCache()\n        if (logValues) {\n          console.log(\n            `${prefixLogs} Health check refreshed at ${result.lastCheckAt}, status: ${result.status}`\n          )\n        }\n      } catch (err) {\n        console.error(`${prefixLogs} Health check refresh failed:`, err)\n      }\n    }, refreshIntervalMs)\n\n    process.on('SIGTERM', () => {\n      console.log(`${prefixLogs} Received SIGTERM, shutting down...`)\n      clearInterval(interval)\n      healthCheckClient.cleanup().finally(() => {\n        process.exit(0)\n      })\n    })\n\n    process.on('SIGINT', () => {\n      console.log(`${prefixLogs} Received SIGINT, shutting down...`)\n      clearInterval(interval)\n      healthCheckClient.cleanup().finally(() => {\n        process.exit(0)\n      })\n    })\n  }\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM;EAAEA;AAA8B,CAAC,GAAGC,OAAO,CAAC,oBAAoB,CAAC;AACvE,MAAM;EAAEC;AAAsB,CAAC,GAAGD,OAAO,CAAC,qBAAqB,CAAC;AAEzD,SAASE,uBAAuBA,CAACC,OAAO,EAAE;EAC/C,MAAM;IACJC,iBAAiB,GAAGH,qBAAqB,CAACI,eAAe;IACzD,GAAGC;EACL,CAAC,GAAGH,OAAO;EAEX,MAAMI,OAAO,GACXD,mBAAmB,CAACC,OAAO,IAAIC,OAAO,CAACC,GAAG,CAACC,cAAc,IAAI,aAAa;EAC5E,MAAMC,MAAM,GAAGH,OAAO,CAACC,GAAG,CAACG,QAAQ,IAAI,cAAc;EACrD,MAAMC,WAAW,GACfL,OAAO,CAACC,GAAG,CAACK,uBAAuB,IAAI,qBAAqB;EAC9D,MAAMC,SAAS,GAAGP,OAAO,CAACC,GAAG,CAACO,iBAAiB,KAAK,MAAM;EAC1D,MAAMC,UAAU,GAAG,IAAIJ,WAAW,MAAMN,OAAO,MAAMI,MAAM,iBAAiB;EAE5E,MAAMO,iBAAiB,GAAGnB,6BAA6B,CAACO,mBAAmB,CAAC;EAE5E,OAAO,eAAea,oBAAoBA,CAAA,EAAG;IAC3CC,OAAO,CAACC,GAAG,CAAC,GAAGJ,UAAU,kCAAkC,CAAC;IAC5DG,OAAO,CAACC,GAAG,CAAC,GAAGJ,UAAU,sBAAsBb,iBAAiB,IAAI,CAAC;IAErE,IAAI;MACF,MAAMc,iBAAiB,CAACI,YAAY,CAAC,CAAC;MACtC,IAAIP,SAAS,EAAE;QACbK,OAAO,CAACC,GAAG,CAAC,GAAGJ,UAAU,iCAAiC,CAAC;MAC7D;IACF,CAAC,CAAC,OAAOM,GAAG,EAAE;MACZH,OAAO,CAACI,KAAK,CAAC,GAAGP,UAAU,+BAA+B,EAAEM,GAAG,CAAC;IAClE;IAEA,MAAME,QAAQ,GAAGC,WAAW,CAAC,YAAY;MACvC,IAAI;QACF,MAAMC,MAAM,GAAG,MAAMT,iBAAiB,CAACI,YAAY,CAAC,CAAC;QACrD,IAAIP,SAAS,EAAE;UACbK,OAAO,CAACC,GAAG,CACT,GAAGJ,UAAU,8BAA8BU,MAAM,CAACC,WAAW,aAAaD,MAAM,CAACE,MAAM,EACzF,CAAC;QACH;MACF,CAAC,CAAC,OAAON,GAAG,EAAE;QACZH,OAAO,CAACI,KAAK,CAAC,GAAGP,UAAU,+BAA+B,EAAEM,GAAG,CAAC;MAClE;IACF,CAAC,EAAEnB,iBAAiB,CAAC;IAErBI,OAAO,CAACsB,EAAE,CAAC,SAAS,EAAE,MAAM;MAC1BV,OAAO,CAACC,GAAG,CAAC,GAAGJ,UAAU,qCAAqC,CAAC;MAC/Dc,aAAa,CAACN,QAAQ,CAAC;MACvBP,iBAAiB,CAACc,OAAO,CAAC,CAAC,CAACC,OAAO,CAAC,MAAM;QACxCzB,OAAO,CAAC0B,IAAI,CAAC,CAAC,CAAC;MACjB,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF1B,OAAO,CAACsB,EAAE,CAAC,QAAQ,EAAE,MAAM;MACzBV,OAAO,CAACC,GAAG,CAAC,GAAGJ,UAAU,oCAAoC,CAAC;MAC9Dc,aAAa,CAACN,QAAQ,CAAC;MACvBP,iBAAiB,CAACc,OAAO,CAAC,CAAC,CAACC,OAAO,CAAC,MAAM;QACxCzB,OAAO,CAAC0B,IAAI,CAAC,CAAC,CAAC;MACjB,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"healthCheckWorker.js","names":["createHealthCheckWorkerClient","require","DEFAULT_HEALTH_CONFIG","LATENCY_WARNING_MS","logLatencyWarnings","prefixLogs","result","resources","env","r","Object","entries","connectMs","console","warn","createHealthCheckWorker","options","refreshIntervalMs","checkIntervalMs","workerClientOptions","appName","process","BUILD_APP_NAME","dynoId","HOSTNAME","processType","BUILD_DYNO_PROCESS_TYPE","logValues","HEALTH_LOG_VALUES","healthCheckClient","runHealthCheckWorker","log","refreshCache","err","error","interval","setInterval","lastCheckAt","status","on","clearInterval","cleanup","finally","exit"],"sources":["../../src/health/healthCheckWorker.js"],"sourcesContent":["/**\n * @param {Object} options\n * @param {{ name: string } | { name: string, url?: string } | { name: string, client: any }}[] options.resources - Must include Redis resource with client\n * @param {string} [options.appName]\n * @param {number} [options.refreshIntervalMs]\n * @param {string} [options.databaseUrl]\n * @param {string} [options.databaseName]\n * @param {Object<string, string>} [options.additionalDatabaseUrls]\n */\nconst { createHealthCheckWorkerClient } = require('./healthCheckUtils')\nconst { DEFAULT_HEALTH_CONFIG } = require('./healthCheckClient')\n\n/** Latency above this (ms) triggers a warning log on the worker. 2000 = 2 seconds. */\nconst LATENCY_WARNING_MS = 2000\n\nfunction logLatencyWarnings(prefixLogs, result) {\n  const resources = result?.resources || {}\n  for (const [env, r] of Object.entries(resources)) {\n    const connectMs = r?.connectMs\n    if (typeof connectMs === 'number' && connectMs > LATENCY_WARNING_MS) {\n      console.warn(\n        `${prefixLogs} DB connect latency high: ${env} connectMs=${connectMs}ms (threshold ${LATENCY_WARNING_MS}ms)`\n      )\n    }\n  }\n}\n\nexport function createHealthCheckWorker(options) {\n  const {\n    refreshIntervalMs = DEFAULT_HEALTH_CONFIG.checkIntervalMs,\n    ...workerClientOptions\n  } = options\n\n  const appName =\n    workerClientOptions.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n  const dynoId = process.env.HOSTNAME || 'unknown-dyno'\n  const processType =\n    process.env.BUILD_DYNO_PROCESS_TYPE || 'health-check-worker'\n  const logValues = process.env.HEALTH_LOG_VALUES === 'true'\n  const prefixLogs = `[${processType}] [${appName}] [${dynoId}] [HealthCheck]`\n\n  const healthCheckClient = createHealthCheckWorkerClient(workerClientOptions)\n\n  return async function runHealthCheckWorker() {\n    console.log(`${prefixLogs} Starting health check worker...`)\n    console.log(`${prefixLogs} Refresh interval: ${refreshIntervalMs}ms`)\n\n    try {\n      const result = await healthCheckClient.refreshCache()\n      logLatencyWarnings(prefixLogs, result)\n      if (logValues) {\n        console.log(`${prefixLogs} Initial health check completed`)\n      }\n    } catch (err) {\n      console.error(`${prefixLogs} Initial health check failed:`, err)\n    }\n\n    const interval = setInterval(async () => {\n      try {\n        const result = await healthCheckClient.refreshCache()\n        logLatencyWarnings(prefixLogs, result)\n        if (logValues) {\n          console.log(\n            `${prefixLogs} Health check refreshed at ${result.lastCheckAt}, status: ${result.status}`\n          )\n        }\n      } catch (err) {\n        console.error(`${prefixLogs} Health check refresh failed:`, err)\n      }\n    }, refreshIntervalMs)\n\n    process.on('SIGTERM', () => {\n      console.log(`${prefixLogs} Received SIGTERM, shutting down...`)\n      clearInterval(interval)\n      healthCheckClient.cleanup().finally(() => {\n        process.exit(0)\n      })\n    })\n\n    process.on('SIGINT', () => {\n      console.log(`${prefixLogs} Received SIGINT, shutting down...`)\n      clearInterval(interval)\n      healthCheckClient.cleanup().finally(() => {\n        process.exit(0)\n      })\n    })\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/baseMetricsClient.d.ts

@@ -49,6 +49,11 @@ export class BaseMetricsClient {
         dyno_id: string;
         process_type: string;
     };
+    /** Default labels without dyno_id (for HTTP metrics so dyno_id is not included). */
+    defaultLabelsWithoutDynoId: {
+        app: string;
+        process_type: string;
+    };
     gateway: any;
     gauges: {};
     counters: {};
@@ -80,15 +85,17 @@ export class BaseMetricsClient {
      * @param {string} params.name - Metric name
      * @param {string} params.help - Metric description
      * @param {string[]} [params.labelNames] - Optional list of label names. Defaults to this.defaultLabels keys.
+     * @param {boolean} [params.useLabelsWithoutDynoId=false] - If true, counter uses app/process_type only (no dyno_id). Use for HTTP metrics.
      *
      * @returns {(labels?: Object, incrementValue?: number) => void}
      *          A function to increment the counter.
      *          Usage: (labels?, incrementValue?)
      */
-    createCounter({ name, help, labelNames }: {
+    createCounter({ name, help, labelNames, useLabelsWithoutDynoId, }: {
         name: string;
         help: string;
         labelNames?: string[] | undefined;
+        useLabelsWithoutDynoId?: boolean | undefined;
     }): (labels?: Object, incrementValue?: number) => void;
     /**
      * Clear all collected counters
@@ -158,6 +165,14 @@ export class BaseMetricsClient {
      * @returns {string[]} Combined label names
      */
     withDefaultLabels: (labels?: string[]) => string[];
+    /**
+     * Merge default labels without dyno_id (`app`, `process_type`) with custom label names.
+     * Use for HTTP metrics so dyno_id is not included.
+     *
+     * @param {string[]} labels Additional label names
+     * @returns {string[]} Combined label names
+     */
+    withDefaultLabelsWithoutDynoId: (labels?: string[]) => string[];
     getDefaultLabels: (labels?: any[]) => {
         app: string;
         dyno_id: string;

package/lib/metrics/baseMetricsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseMetricsClient.d.ts","sourceRoot":"","sources":["../../src/metrics/baseMetricsClient.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH;IACE;;;;;;;;;;;;;OAaG;IACH;QAZ2B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAoD7C;IAjDC,gBAA4E;IAC5E,eAAqE;IACrE,oBAG6B;IAC7B,iBAAuE;IACvE,mBAC+D;IAC/D,uBACoE;IACpE,kBAC0E;IAC1E,oBAGI;IACJ,wCAAiD;IACjD,4BAEoD;IACpD,0BAEmD;IAEnD,mBAAyF;IAEzF,uEAAsC;IAGtC;;;;MAIC;IAGD,aAAmB;IACnB,WAAgB;IAChB,aAAkB;IAClB,sBAA2B;IAE3B,mEAAmE;IACnE;YADkB,MAAM,SAAc,MAAM,GAAG,QAAQ,MAAM,CAAC;MACvC;IAKvB,sCAAwC;IAG1C;;;;;;;;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;;OAEG;IACH,6BAKC;IAED;;OAEG;IACH,kCAiCC;IAED,sEAmDC;IA/CK,+CAA0D;IAiDhE,iCAEC;IAED;;;;;;;;;OASG;IACH,iFAEC;IAED;;;OAGG;IACH,eAFa,QAAQ,IAAI,CAAC,CAOzB;IAED;;;;;;;;;OASG;IACH,yBAEC;IAED;;;OAGG;IACH,qBAFa,QAAQ,IAAI,CAAC,CAezB;IAED;;;OAGG;IACH,8BAkDC;IAED;;;;;OAKG;IACH,8CAFa,QAAQ,IAAI,CAAC,CAgBzB;IAED;;;OAGG;IACH,uBAoDC;IAED;;;;;;OAMG;IACH,6BAHW,MAAM,EAAE,KACN,MAAM,EAAE,CAIpB;IAED;;;;MAEC;IAED,gCAGC;IAID,8BAEC;IAED,gCAEC;IAED,4EAEC;IAED,sCAEC;IAED,2DAWC;CACF"}
+{"version":3,"file":"baseMetricsClient.d.ts","sourceRoot":"","sources":["../../src/metrics/baseMetricsClient.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH;IACE;;;;;;;;;;;;;OAaG;IACH;QAZ2B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OA0D7C;IAvDC,gBAA4E;IAC5E,eAAqE;IACrE,oBAG6B;IAC7B,iBAAuE;IACvE,mBAC+D;IAC/D,uBACoE;IACpE,kBAC0E;IAC1E,oBAGI;IACJ,wCAAiD;IACjD,4BAEoD;IACpD,0BAEmD;IAEnD,mBAAyF;IAEzF,uEAAsC;IAGtC;;;;MAIC;IAED,oFAAoF;IACpF;;;MAGC;IAGD,aAAmB;IACnB,WAAgB;IAChB,aAAkB;IAClB,sBAA2B;IAE3B,mEAAmE;IACnE;YADkB,MAAM,SAAc,MAAM,GAAG,QAAQ,MAAM,CAAC;MACvC;IAKvB,sCAAwC;IAG1C;;;;;;;;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;;;;;;;;;;;;OAYG;IACH;QAT0B,IAAI,EAAnB,MAAM;QACS,IAAI,EAAnB,MAAM;QACY,UAAU;QACX,sBAAsB;kBAE3B,MAAM,mBAAmB,MAAM,KAAK,IAAI,CAgC9D;IAED;;OAEG;IACH,6BAKC;IAED;;OAEG;IACH,kCAiCC;IAED,sEAmDC;IA/CK,+CAA0D;IAiDhE,iCAEC;IAED;;;;;;;;;OASG;IACH,iFAEC;IAED;;;OAGG;IACH,eAFa,QAAQ,IAAI,CAAC,CAOzB;IAED;;;;;;;;;OASG;IACH,yBAEC;IAED;;;OAGG;IACH,qBAFa,QAAQ,IAAI,CAAC,CAezB;IAED;;;OAGG;IACH,8BAkDC;IAED;;;;;OAKG;IACH,8CAFa,QAAQ,IAAI,CAAC,CAgBzB;IAED;;;OAGG;IACH,uBAoDC;IAED;;;;;;OAMG;IACH,6BAHW,MAAM,EAAE,KACN,MAAM,EAAE,CAIpB;IAED;;;;;;OAMG;IACH,0CAHW,MAAM,EAAE,KACN,MAAM,EAAE,CAIpB;IAED;;;;MAEC;IAED,gCAGC;IAID,8BAEC;IAED,gCAEC;IAED,4EAEC;IAED,sCAEC;IAED,2DAWC;CACF"}

package/lib/metrics/baseMetricsClient.js

@@ -50,6 +50,12 @@ class BaseMetricsClient {
       process_type: this.processType
     };
 
+    /** Default labels without dyno_id (for HTTP metrics so dyno_id is not included). */
+    this.defaultLabelsWithoutDynoId = {
+      app: this.appName,
+      process_type: this.processType
+    };
+
     // Always push to configured URL (VM-agent). No Pushgateway.
     this.gateway = null;
     this.gauges = {};
@@ -99,6 +105,7 @@ class BaseMetricsClient {
    * @param {string} params.name - Metric name
    * @param {string} params.help - Metric description
    * @param {string[]} [params.labelNames] - Optional list of label names. Defaults to this.defaultLabels keys.
+   * @param {boolean} [params.useLabelsWithoutDynoId=false] - If true, counter uses app/process_type only (no dyno_id). Use for HTTP metrics.
    *
    * @returns {(labels?: Object, incrementValue?: number) => void}
    *          A function to increment the counter.
@@ -107,9 +114,11 @@ class BaseMetricsClient {
   createCounter({
     name,
     help,
-    labelNames = Object.keys(this.defaultLabels)
+    labelNames = Object.keys(this.defaultLabels),
+    useLabelsWithoutDynoId = false
   }) {
     if (this.counters[name]) return this.countersFunctions[name];
+    const defaultSet = useLabelsWithoutDynoId ? this.defaultLabelsWithoutDynoId : this.defaultLabels;
     const c = new client.Counter({
       name,
       help,
@@ -121,7 +130,7 @@ class BaseMetricsClient {
       ...this.countersFunctions,
       [name]: (data = {}, value = 1) => {
         c.inc({
-          ...this.defaultLabels,
+          ...defaultSet,
           ...data
         }, value);
       }
@@ -387,6 +396,17 @@ class BaseMetricsClient {
   withDefaultLabels = (labels = []) => {
     return [...Object.keys(this.defaultLabels), ...labels];
   };
+
+  /**
+   * Merge default labels without dyno_id (`app`, `process_type`) with custom label names.
+   * Use for HTTP metrics so dyno_id is not included.
+   *
+   * @param {string[]} labels Additional label names
+   * @returns {string[]} Combined label names
+   */
+  withDefaultLabelsWithoutDynoId = (labels = []) => {
+    return [...Object.keys(this.defaultLabelsWithoutDynoId), ...labels];
+  };
   getDefaultLabels = (labels = []) => {
     return this.defaultLabels;
   };

package/lib/metrics/baseMetricsClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseMetricsClient.js","names":["client","require","https","http","URL","BaseMetricsClient","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","disablePushgateway","METRICS_DISABLE_PUSHGATEWAY","removeOldMetrics","METRICS_REMOVE_OLD_METRICS","prefixLogs","_registry","Registry","collectDefaultMetrics","register","defaultLabels","app","dyno_id","process_type","gateway","gauges","counters","countersFunctions","gaugeUpdaters","_clearOldWorkers","_setCleanupHandlers","keepProcessAliveWhenDisabled","createGauge","name","help","updateFn","labelNames","Object","keys","g","Gauge","registers","createCounter","c","Counter","data","value","inc","clearAllCounters","metricsLogValues","console","log","values","forEach","counter","reset","_pushMetrics","entries","result","val","Promise","undefined","set","err","error","gatewayPush","metrics","getMetricsAsJSON","JSON","stringify","_startPush","interval","customPushMetics","warn","_idleInterval","setInterval","clearInterval","runPush","resolve","pushMetrics","catch","pushOrigin","trim","origin","startPush","cleanup","gatewayDelete","exit","_deleteFromVMByLabels","message","esc","s","String","replace","selector","u","reject","Error","path","encodeURIComponent","req","protocol","request","hostname","port","method","headers","Authorization","agent","Agent","keepAlive","res","statusCode","on","chunk","end","params","_pushToVMAgent","pushUrl","pathname","search","contentType","then","setHeader","Buffer","byteLength","withDefaultLabels","labels","getDefaultLabels","metricsEnabled","registry","getMetricsAsString","metricsMiddleware","status","module","exports"],"sources":["../../src/metrics/baseMetricsClient.js"],"sourcesContent":["const client = require('prom-client')\nconst https = require('https')\nconst http = require('http')\nconst { URL } = require('url')\n\n/**\n * BaseMetricsClient provides common functionality for all metrics clients.\n * Handles registry setup, push to remote (VM-agent), default labels, and common operations.\n * Always pushes registry to the configured URL (POST Prometheus text format + Basic auth). No Pushgateway.\n */\nclass BaseMetricsClient {\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] Push URL (VM-agent import endpoint, e.g. .../api/v1/import/prometheus). /metrics is for GET (scrape), not POST (push).\n   * @param {string} [config.pushgatewaySecret] Basic auth secret (Base64 of user:password)\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 {function} [config.startupValidation] Add to validate on start push.\n   * @param {boolean} [config.disablePushgateway] Disable pushing to Pushgateway (use HTTP scraping instead)\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    this.disablePushgateway =\n      config.disablePushgateway ??\n      process.env.METRICS_DISABLE_PUSHGATEWAY === 'true'\n    this.removeOldMetrics =\n      config.removeOldMetrics ??\n      process.env.METRICS_REMOVE_OLD_METRICS === 'true'\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    // Always push to configured URL (VM-agent). No Pushgateway.\n    this.gateway = null\n    this.gauges = {}\n    this.counters = {}\n    this.countersFunctions = {}\n\n    /** @type {Object<string, function(): number | Promise<number>>} */\n    this.gaugeUpdaters = {}\n\n    this._clearOldWorkers(config.removeOldMetrics)\n    this._setCleanupHandlers()\n\n    this.keepProcessAliveWhenDisabled = true\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   * 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            continue\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      if (!this.disablePushgateway) {\n        await this.gatewayPush()\n      }\n      // this.clearAllCounters() //TODO: or uncommit or delete (based on grafana expectation)\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      if (this.keepProcessAliveWhenDisabled && !this._idleInterval) {\n        this._idleInterval = setInterval(() => {}, 60 * 60 * 1000)\n      }\n      return\n    }\n\n    if (this._idleInterval) {\n      clearInterval(this._idleInterval)\n      this._idleInterval = null\n    }\n\n    if (this.startupValidation && !this.startupValidation()) {\n      return\n    }\n\n    const runPush = () => {\n      if (customPushMetics && typeof customPushMetics === 'function') {\n        return Promise.resolve(customPushMetics())\n      }\n      return this.pushMetrics()\n    }\n\n    if (customPushMetics && typeof customPushMetics === 'function') {\n      setInterval(() => customPushMetics(), interval * 1000)\n    } else {\n      setInterval(() => {\n        runPush().catch(err => {\n          console.error(`${this.prefixLogs} Failed to push metrics:`, err)\n        })\n      }, interval * 1000)\n    }\n\n    // First push immediately so metrics appear without waiting for the first interval\n    runPush().catch(err => {\n      console.error(`${this.prefixLogs} Failed to push metrics (initial):`, err)\n    })\n\n    let pushOrigin = 'none'\n    try {\n      if (this.pushgatewayUrl && this.pushgatewayUrl.trim()) {\n        pushOrigin = new URL(this.pushgatewayUrl.trim()).origin\n      }\n    } catch {\n      pushOrigin = 'invalid URL'\n    }\n    console.warn(\n      `${this.prefixLogs} Metrics collection started. (interval: ${this.intervalSec}s, push: ${pushOrigin})`\n    )\n  }\n\n  pushMetrics = async () => {\n    return this._pushMetrics()\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    // No Pushgateway; VM-agent does not support per-instance delete. Skip.\n  }\n\n  /**\n   * On shutdown: optionally delete this instance's metrics from VictoriaMetrics (by app, dyno_id, process_type).\n   * @returns {Promise<void>}\n   */\n  gatewayDelete = async () => {\n    if (\n      this.removeOldMetrics &&\n      this.pushgatewayUrl &&\n      this.pushgatewayUrl.trim()\n    ) {\n      await this._deleteFromVMByLabels().catch(err => {\n        console.warn(\n          `${this.prefixLogs} Deletion from VM on shutdown failed:`,\n          err.message\n        )\n      })\n    }\n  }\n\n  /**\n   * Call VictoriaMetrics delete_series API to remove all series matching this instance's labels (app, dyno_id, process_type).\n   * @private\n   */\n  _deleteFromVMByLabels = () => {\n    const esc = s => String(s).replace(/\\\\/g, '\\\\\\\\').replace(/\"/g, '\\\\\"')\n    const selector = `{app=\"${esc(this.appName)}\",dyno_id=\"${esc(\n      this.dynoId\n    )}\",process_type=\"${esc(this.processType)}\"}`\n    let origin\n    try {\n      const u = new URL((this.pushgatewayUrl || '').trim())\n      origin = u.origin\n    } catch {\n      return Promise.reject(new Error('Invalid push URL'))\n    }\n    const path = `/api/v1/admin/tsdb/delete_series?match[]=${encodeURIComponent(\n      selector\n    )}`\n    return new Promise((resolve, reject) => {\n      const u = new URL(origin)\n      const req = (u.protocol === 'https:' ? https : http).request(\n        {\n          hostname: u.hostname,\n          port: u.port || (u.protocol === 'https:' ? 443 : 80),\n          path,\n          method: 'POST',\n          headers: {\n            'Content-Length': '0',\n            Authorization: this.authToken\n              ? `Basic ${this.authToken}`\n              : undefined,\n          },\n          agent:\n            u.protocol === 'https:'\n              ? new https.Agent({ keepAlive: false })\n              : undefined,\n        },\n        res => {\n          if (res.statusCode >= 200 && res.statusCode < 300) resolve()\n          else {\n            let data = ''\n            res.on('data', chunk => {\n              data += chunk\n            })\n            res.on('end', () =>\n              reject(new Error(`Delete failed: ${res.statusCode} ${data}`))\n            )\n          }\n        }\n      )\n      req.on('error', reject)\n      req.end()\n    })\n  }\n\n  /**\n   * Push registry to configured URL (VM-agent). POST Prometheus text format + Basic auth.\n   *\n   * @param {object} [params] Unused; kept for API compatibility.\n   * @returns {Promise<void>}\n   */\n  gatewayPush = async (params = {}) => {\n    if (this.disablePushgateway) {\n      console.warn(\n        `${this.prefixLogs} Metrics push skipped: METRICS_DISABLE_PUSHGATEWAY is set`\n      )\n      return Promise.resolve()\n    }\n    if (!this.pushgatewayUrl || !this.pushgatewayUrl.trim()) {\n      console.warn(\n        `${this.prefixLogs} Metrics push skipped: METRICS_PUSHGATEWAY_URL is not set`\n      )\n      return Promise.resolve()\n    }\n    return this._pushToVMAgent()\n  }\n\n  /**\n   * POST registry (Prometheus text format) to VM-agent. VM-agent accepts push at /api/v1/import/prometheus; /metrics is GET (scrape) only.\n   * @private\n   */\n  _pushToVMAgent = () => {\n    let pushUrl = (this.pushgatewayUrl || '').trim()\n    try {\n      const u = new URL(pushUrl)\n      if (!u.pathname || u.pathname === '/' || u.pathname === '/metrics') {\n        pushUrl = `${u.origin}/api/v1/import/prometheus${u.search}`\n      }\n    } catch {\n      // leave pushUrl as-is\n    }\n    return new Promise((resolve, reject) => {\n      const u = new URL(pushUrl)\n      const req = (u.protocol === 'https:' ? https : http).request(\n        {\n          hostname: u.hostname,\n          port: u.port || (u.protocol === 'https:' ? 443 : 80),\n          path: u.pathname + u.search,\n          method: 'POST',\n          headers: {\n            'Content-Type': client.register.contentType,\n            Authorization: this.authToken\n              ? `Basic ${this.authToken}`\n              : undefined,\n          },\n          agent:\n            u.protocol === 'https:'\n              ? new https.Agent({ keepAlive: true })\n              : undefined,\n        },\n        res => {\n          if (res.statusCode >= 200 && res.statusCode < 300) {\n            resolve()\n          } else {\n            let data = ''\n            res.on('data', chunk => {\n              data += chunk\n            })\n            res.on('end', () =>\n              reject(new Error(`Push failed: ${res.statusCode} ${data}`))\n            )\n          }\n        }\n      )\n      req.on('error', reject)\n      this._registry\n        .metrics()\n        .then(metrics => {\n          req.setHeader('Content-Length', Buffer.byteLength(metrics, 'utf8'))\n          req.end(metrics, 'utf8')\n        })\n        .catch(reject)\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  async getMetricsAsString() {\n    return this._registry.metrics()\n  }\n\n  metricsMiddleware() {\n    return async (req, res) => {\n      try {\n        const metrics = await this.getMetricsAsString()\n        res.set('Content-Type', client.register.contentType)\n        res.end(metrics)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Failed to get metrics:`, err)\n        res.status(500).end('Failed to collect metrics')\n      }\n    }\n  }\n}\n\nmodule.exports = { BaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"baseMetricsClient.js","names":["client","require","https","http","URL","BaseMetricsClient","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","disablePushgateway","METRICS_DISABLE_PUSHGATEWAY","removeOldMetrics","METRICS_REMOVE_OLD_METRICS","prefixLogs","_registry","Registry","collectDefaultMetrics","register","defaultLabels","app","dyno_id","process_type","defaultLabelsWithoutDynoId","gateway","gauges","counters","countersFunctions","gaugeUpdaters","_clearOldWorkers","_setCleanupHandlers","keepProcessAliveWhenDisabled","createGauge","name","help","updateFn","labelNames","Object","keys","g","Gauge","registers","createCounter","useLabelsWithoutDynoId","defaultSet","c","Counter","data","value","inc","clearAllCounters","metricsLogValues","console","log","values","forEach","counter","reset","_pushMetrics","entries","result","val","Promise","undefined","set","err","error","gatewayPush","metrics","getMetricsAsJSON","JSON","stringify","_startPush","interval","customPushMetics","warn","_idleInterval","setInterval","clearInterval","runPush","resolve","pushMetrics","catch","pushOrigin","trim","origin","startPush","cleanup","gatewayDelete","exit","_deleteFromVMByLabels","message","esc","s","String","replace","selector","u","reject","Error","path","encodeURIComponent","req","protocol","request","hostname","port","method","headers","Authorization","agent","Agent","keepAlive","res","statusCode","on","chunk","end","params","_pushToVMAgent","pushUrl","pathname","search","contentType","then","setHeader","Buffer","byteLength","withDefaultLabels","labels","withDefaultLabelsWithoutDynoId","getDefaultLabels","metricsEnabled","registry","getMetricsAsString","metricsMiddleware","status","module","exports"],"sources":["../../src/metrics/baseMetricsClient.js"],"sourcesContent":["const client = require('prom-client')\nconst https = require('https')\nconst http = require('http')\nconst { URL } = require('url')\n\n/**\n * BaseMetricsClient provides common functionality for all metrics clients.\n * Handles registry setup, push to remote (VM-agent), default labels, and common operations.\n * Always pushes registry to the configured URL (POST Prometheus text format + Basic auth). No Pushgateway.\n */\nclass BaseMetricsClient {\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] Push URL (VM-agent import endpoint, e.g. .../api/v1/import/prometheus). /metrics is for GET (scrape), not POST (push).\n   * @param {string} [config.pushgatewaySecret] Basic auth secret (Base64 of user:password)\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 {function} [config.startupValidation] Add to validate on start push.\n   * @param {boolean} [config.disablePushgateway] Disable pushing to Pushgateway (use HTTP scraping instead)\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    this.disablePushgateway =\n      config.disablePushgateway ??\n      process.env.METRICS_DISABLE_PUSHGATEWAY === 'true'\n    this.removeOldMetrics =\n      config.removeOldMetrics ??\n      process.env.METRICS_REMOVE_OLD_METRICS === 'true'\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    /** Default labels without dyno_id (for HTTP metrics so dyno_id is not included). */\n    this.defaultLabelsWithoutDynoId = {\n      app: this.appName,\n      process_type: this.processType,\n    }\n\n    // Always push to configured URL (VM-agent). No Pushgateway.\n    this.gateway = null\n    this.gauges = {}\n    this.counters = {}\n    this.countersFunctions = {}\n\n    /** @type {Object<string, function(): number | Promise<number>>} */\n    this.gaugeUpdaters = {}\n\n    this._clearOldWorkers(config.removeOldMetrics)\n    this._setCleanupHandlers()\n\n    this.keepProcessAliveWhenDisabled = true\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   * @param {boolean} [params.useLabelsWithoutDynoId=false] - If true, counter uses app/process_type only (no dyno_id). Use for HTTP metrics.\n   *\n   * @returns {(labels?: Object, incrementValue?: number) => void}\n   *          A function to increment the counter.\n   *          Usage: (labels?, incrementValue?)\n   */\n  createCounter({\n    name,\n    help,\n    labelNames = Object.keys(this.defaultLabels),\n    useLabelsWithoutDynoId = false,\n  }) {\n    if (this.counters[name]) return this.countersFunctions[name]\n\n    const defaultSet = useLabelsWithoutDynoId\n      ? this.defaultLabelsWithoutDynoId\n      : this.defaultLabels\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({ ...defaultSet, ...data }, value)\n      },\n    }\n\n    return this.countersFunctions[name]\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            continue\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      if (!this.disablePushgateway) {\n        await this.gatewayPush()\n      }\n      // this.clearAllCounters() //TODO: or uncommit or delete (based on grafana expectation)\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      if (this.keepProcessAliveWhenDisabled && !this._idleInterval) {\n        this._idleInterval = setInterval(() => {}, 60 * 60 * 1000)\n      }\n      return\n    }\n\n    if (this._idleInterval) {\n      clearInterval(this._idleInterval)\n      this._idleInterval = null\n    }\n\n    if (this.startupValidation && !this.startupValidation()) {\n      return\n    }\n\n    const runPush = () => {\n      if (customPushMetics && typeof customPushMetics === 'function') {\n        return Promise.resolve(customPushMetics())\n      }\n      return this.pushMetrics()\n    }\n\n    if (customPushMetics && typeof customPushMetics === 'function') {\n      setInterval(() => customPushMetics(), interval * 1000)\n    } else {\n      setInterval(() => {\n        runPush().catch(err => {\n          console.error(`${this.prefixLogs} Failed to push metrics:`, err)\n        })\n      }, interval * 1000)\n    }\n\n    // First push immediately so metrics appear without waiting for the first interval\n    runPush().catch(err => {\n      console.error(`${this.prefixLogs} Failed to push metrics (initial):`, err)\n    })\n\n    let pushOrigin = 'none'\n    try {\n      if (this.pushgatewayUrl && this.pushgatewayUrl.trim()) {\n        pushOrigin = new URL(this.pushgatewayUrl.trim()).origin\n      }\n    } catch {\n      pushOrigin = 'invalid URL'\n    }\n    console.warn(\n      `${this.prefixLogs} Metrics collection started. (interval: ${this.intervalSec}s, push: ${pushOrigin})`\n    )\n  }\n\n  pushMetrics = async () => {\n    return this._pushMetrics()\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    // No Pushgateway; VM-agent does not support per-instance delete. Skip.\n  }\n\n  /**\n   * On shutdown: optionally delete this instance's metrics from VictoriaMetrics (by app, dyno_id, process_type).\n   * @returns {Promise<void>}\n   */\n  gatewayDelete = async () => {\n    if (\n      this.removeOldMetrics &&\n      this.pushgatewayUrl &&\n      this.pushgatewayUrl.trim()\n    ) {\n      await this._deleteFromVMByLabels().catch(err => {\n        console.warn(\n          `${this.prefixLogs} Deletion from VM on shutdown failed:`,\n          err.message\n        )\n      })\n    }\n  }\n\n  /**\n   * Call VictoriaMetrics delete_series API to remove all series matching this instance's labels (app, dyno_id, process_type).\n   * @private\n   */\n  _deleteFromVMByLabels = () => {\n    const esc = s => String(s).replace(/\\\\/g, '\\\\\\\\').replace(/\"/g, '\\\\\"')\n    const selector = `{app=\"${esc(this.appName)}\",dyno_id=\"${esc(\n      this.dynoId\n    )}\",process_type=\"${esc(this.processType)}\"}`\n    let origin\n    try {\n      const u = new URL((this.pushgatewayUrl || '').trim())\n      origin = u.origin\n    } catch {\n      return Promise.reject(new Error('Invalid push URL'))\n    }\n    const path = `/api/v1/admin/tsdb/delete_series?match[]=${encodeURIComponent(\n      selector\n    )}`\n    return new Promise((resolve, reject) => {\n      const u = new URL(origin)\n      const req = (u.protocol === 'https:' ? https : http).request(\n        {\n          hostname: u.hostname,\n          port: u.port || (u.protocol === 'https:' ? 443 : 80),\n          path,\n          method: 'POST',\n          headers: {\n            'Content-Length': '0',\n            Authorization: this.authToken\n              ? `Basic ${this.authToken}`\n              : undefined,\n          },\n          agent:\n            u.protocol === 'https:'\n              ? new https.Agent({ keepAlive: false })\n              : undefined,\n        },\n        res => {\n          if (res.statusCode >= 200 && res.statusCode < 300) resolve()\n          else {\n            let data = ''\n            res.on('data', chunk => {\n              data += chunk\n            })\n            res.on('end', () =>\n              reject(new Error(`Delete failed: ${res.statusCode} ${data}`))\n            )\n          }\n        }\n      )\n      req.on('error', reject)\n      req.end()\n    })\n  }\n\n  /**\n   * Push registry to configured URL (VM-agent). POST Prometheus text format + Basic auth.\n   *\n   * @param {object} [params] Unused; kept for API compatibility.\n   * @returns {Promise<void>}\n   */\n  gatewayPush = async (params = {}) => {\n    if (this.disablePushgateway) {\n      console.warn(\n        `${this.prefixLogs} Metrics push skipped: METRICS_DISABLE_PUSHGATEWAY is set`\n      )\n      return Promise.resolve()\n    }\n    if (!this.pushgatewayUrl || !this.pushgatewayUrl.trim()) {\n      console.warn(\n        `${this.prefixLogs} Metrics push skipped: METRICS_PUSHGATEWAY_URL is not set`\n      )\n      return Promise.resolve()\n    }\n    return this._pushToVMAgent()\n  }\n\n  /**\n   * POST registry (Prometheus text format) to VM-agent. VM-agent accepts push at /api/v1/import/prometheus; /metrics is GET (scrape) only.\n   * @private\n   */\n  _pushToVMAgent = () => {\n    let pushUrl = (this.pushgatewayUrl || '').trim()\n    try {\n      const u = new URL(pushUrl)\n      if (!u.pathname || u.pathname === '/' || u.pathname === '/metrics') {\n        pushUrl = `${u.origin}/api/v1/import/prometheus${u.search}`\n      }\n    } catch {\n      // leave pushUrl as-is\n    }\n    return new Promise((resolve, reject) => {\n      const u = new URL(pushUrl)\n      const req = (u.protocol === 'https:' ? https : http).request(\n        {\n          hostname: u.hostname,\n          port: u.port || (u.protocol === 'https:' ? 443 : 80),\n          path: u.pathname + u.search,\n          method: 'POST',\n          headers: {\n            'Content-Type': client.register.contentType,\n            Authorization: this.authToken\n              ? `Basic ${this.authToken}`\n              : undefined,\n          },\n          agent:\n            u.protocol === 'https:'\n              ? new https.Agent({ keepAlive: true })\n              : undefined,\n        },\n        res => {\n          if (res.statusCode >= 200 && res.statusCode < 300) {\n            resolve()\n          } else {\n            let data = ''\n            res.on('data', chunk => {\n              data += chunk\n            })\n            res.on('end', () =>\n              reject(new Error(`Push failed: ${res.statusCode} ${data}`))\n            )\n          }\n        }\n      )\n      req.on('error', reject)\n      this._registry\n        .metrics()\n        .then(metrics => {\n          req.setHeader('Content-Length', Buffer.byteLength(metrics, 'utf8'))\n          req.end(metrics, 'utf8')\n        })\n        .catch(reject)\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  /**\n   * Merge default labels without dyno_id (`app`, `process_type`) with custom label names.\n   * Use for HTTP metrics so dyno_id is not included.\n   *\n   * @param {string[]} labels Additional label names\n   * @returns {string[]} Combined label names\n   */\n  withDefaultLabelsWithoutDynoId = (labels = []) => {\n    return [...Object.keys(this.defaultLabelsWithoutDynoId), ...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  async getMetricsAsString() {\n    return this._registry.metrics()\n  }\n\n  metricsMiddleware() {\n    return async (req, res) => {\n      try {\n        const metrics = await this.getMetricsAsString()\n        res.set('Content-Type', client.register.contentType)\n        res.end(metrics)\n      } catch (err) {\n        console.error(`${this.prefixLogs} Failed to get metrics:`, err)\n        res.status(500).end('Failed to collect metrics')\n      }\n    }\n  }\n}\n\nmodule.exports = { BaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/metricsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsClient.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAb2B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,kBAAkB;QAClB,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAc7C;IATC,4BAGO;IAEP,yBAAyB;IACzB,uBAAgC;IAKlC;;;OAGG;IACH,4BA8DC;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;aA6BhB;IAED;;;OAGG;IACH,oEA+BC;CACF"}
+{"version":3,"file":"metricsClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsClient.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH;QAb2B,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,kBAAkB;QAClB,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAc7C;IATC,4BAGO;IAEP,yBAAyB;IACzB,uBAAgC;IAKlC;;;OAGG;IACH,4BAgEC;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;aA6BhB;IAED;;;OAGG;IACH,oEA+BC;CACF"}

package/lib/metrics/metricsClient.js

@@ -74,12 +74,14 @@ class MetricsClient extends BaseMetricsClient {
       this.createCounter({
         name: 'app_requests_total',
         help: 'Total number of HTTP requests',
-        labelNames: this.withDefaultLabels(['method', 'route', 'appId', 'databaseId', 'status_code'])
+        labelNames: this.withDefaultLabelsWithoutDynoId(['method', 'route', 'appId', 'databaseId', 'status_code']),
+        useLabelsWithoutDynoId: true
       });
       this.createCounter({
         name: 'app_requests_total_duration',
         help: 'Total duration of HTTP requests in milliseconds',
-        labelNames: this.withDefaultLabels(['method', 'route', 'appId', 'databaseId', 'status_code'])
+        labelNames: this.withDefaultLabelsWithoutDynoId(['method', 'route', 'appId', 'databaseId', 'status_code']),
+        useLabelsWithoutDynoId: true
       });
     }
   };

package/lib/metrics/metricsClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsClient.js","names":["fs","require","os","BaseMetricsClient","MetricsClient","constructor","config","httpMetricsEnabled","process","env","METRICS_HTTP_ENABLED","_lastUsageMicros","_lastCheckTime","Date","now","_initDefaultMetrics","createGauge","name","help","updateFn","getCpuUsagePercent","getAvailableCPUs","getContainerMemoryUsage","measureLag","getContainerMemoryLimit","uptime","createCounter","labelNames","withDefaultLabels","stat","readFileSync","match","currentUsage","parseInt","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","countersFunctions","app_requests_total","app_requests_total_duration","trackHttpRequestMiddleware","req","res","next","enabled","on","params","body","query","datasourceId","statusCode","module","exports"],"sources":["../../src/metrics/metricsClient.js"],"sourcesContent":["const fs = require('fs')\nconst os = require('os')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\n\n/**\n * MetricsClient handles Prometheus metrics collection and push.\n * Supports gauges, counters, default metrics, and custom metrics.\n * Extends BaseMetricsClient for common functionality.\n */\nclass MetricsClient extends BaseMetricsClient {\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.httpMetricsEnabled=false] Enable HTTP request metrics (app_requests_total, app_requests_total_duration)\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 {function} [config.startupValidation] Add to validate on start push.\n   * @param {boolean} [config.disablePushgateway] Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor(config = {}) {\n    super(config)\n\n    this.httpMetricsEnabled =\n      config.httpMetricsEnabled ??\n      process.env.METRICS_HTTP_ENABLED === 'true' ??\n      false\n\n    this._lastUsageMicros = 0\n    this._lastCheckTime = Date.now()\n\n    this._initDefaultMetrics()\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    if (this.httpMetricsEnabled) {\n      this.createCounter({\n        name: 'app_requests_total',\n        help: 'Total number of HTTP requests',\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: 'Total duration of HTTP requests in milliseconds',\n        labelNames: this.withDefaultLabels([\n          'method',\n          'route',\n          'appId',\n          'databaseId',\n          'status_code',\n        ]),\n      })\n    }\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    if (!this.httpMetricsEnabled) return\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 (!this.enabled || !this.httpMetricsEnabled || 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\nmodule.exports = { MetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsClient.js","names":["fs","require","os","BaseMetricsClient","MetricsClient","constructor","config","httpMetricsEnabled","process","env","METRICS_HTTP_ENABLED","_lastUsageMicros","_lastCheckTime","Date","now","_initDefaultMetrics","createGauge","name","help","updateFn","getCpuUsagePercent","getAvailableCPUs","getContainerMemoryUsage","measureLag","getContainerMemoryLimit","uptime","createCounter","labelNames","withDefaultLabelsWithoutDynoId","useLabelsWithoutDynoId","stat","readFileSync","match","currentUsage","parseInt","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","countersFunctions","app_requests_total","app_requests_total_duration","trackHttpRequestMiddleware","req","res","next","enabled","on","params","body","query","datasourceId","statusCode","module","exports"],"sources":["../../src/metrics/metricsClient.js"],"sourcesContent":["const fs = require('fs')\nconst os = require('os')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\n\n/**\n * MetricsClient handles Prometheus metrics collection and push.\n * Supports gauges, counters, default metrics, and custom metrics.\n * Extends BaseMetricsClient for common functionality.\n */\nclass MetricsClient extends BaseMetricsClient {\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.httpMetricsEnabled=false] Enable HTTP request metrics (app_requests_total, app_requests_total_duration)\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 {function} [config.startupValidation] Add to validate on start push.\n   * @param {boolean} [config.disablePushgateway] Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor(config = {}) {\n    super(config)\n\n    this.httpMetricsEnabled =\n      config.httpMetricsEnabled ??\n      process.env.METRICS_HTTP_ENABLED === 'true' ??\n      false\n\n    this._lastUsageMicros = 0\n    this._lastCheckTime = Date.now()\n\n    this._initDefaultMetrics()\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    if (this.httpMetricsEnabled) {\n      this.createCounter({\n        name: 'app_requests_total',\n        help: 'Total number of HTTP requests',\n        labelNames: this.withDefaultLabelsWithoutDynoId([\n          'method',\n          'route',\n          'appId',\n          'databaseId',\n          'status_code',\n        ]),\n        useLabelsWithoutDynoId: true,\n      })\n\n      this.createCounter({\n        name: 'app_requests_total_duration',\n        help: 'Total duration of HTTP requests in milliseconds',\n        labelNames: this.withDefaultLabelsWithoutDynoId([\n          'method',\n          'route',\n          'appId',\n          'databaseId',\n          'status_code',\n        ]),\n        useLabelsWithoutDynoId: true,\n      })\n    }\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    if (!this.httpMetricsEnabled) return\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 (!this.enabled || !this.httpMetricsEnabled || 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\nmodule.exports = { MetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/metricsDatabaseClient.d.ts

@@ -41,7 +41,7 @@ export class DatabaseMetricsClient extends BaseMetricsClient {
         disablePushgateway?: boolean | undefined;
     });
     databasePools: any[];
-    /** Gauge for Database connections */
+    /** Gauge for Database connections (no dyno_id). */
     databaseConnectionsGauge: import("prom-client").Gauge<string>;
     _addPool: (url: any, dbKey: any) => Pool;
     /**

package/lib/metrics/metricsDatabaseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsDatabaseClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;QAf2B,WAAW,EAA3B,MAAM;QACU,YAAY,EAA5B,MAAM;QAC2B,wBAAwB;;;QACxC,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAkF9C;IAtBC,qBAAuB;IAUvB,qCAAqC;IACrC,8DAQE;IAKJ,yCAKC;IAED;;;OAGG;IACH,gCAHW,IAAI,KACF,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CA4BrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}
+{"version":3,"file":"metricsDatabaseClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsDatabaseClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;;;OAgBG;IACH;QAf2B,WAAW,EAA3B,MAAM;QACU,YAAY,EAA5B,MAAM;QAC2B,wBAAwB;;;QACxC,OAAO;QACP,MAAM;QACN,WAAW;QACV,OAAO;QACP,SAAS;QACV,cAAc;QACd,iBAAiB;QACjB,WAAW;QACV,gBAAgB;QACf,iBAAiB;QAClB,kBAAkB;OAkF9C;IAtBC,qBAAuB;IAUvB,mDAAmD;IACnD,8DAQE;IAKJ,yCAKC;IAED;;;OAGG;IACH,gCAHW,IAAI,KACF,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CA4BrE;IAED;;;OAGG;IACH,8BAFa,QAAQ,IAAI,CAAC,CAsBzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAqBzB;IAED;;;OAGG;IACH,sDAMC;CAwBF"}

package/lib/metrics/metricsDatabaseClient.js

@@ -86,11 +86,11 @@ class DatabaseMetricsClient extends BaseMetricsClient {
       this._addPool(url, dbKey);
     }
 
-    /** Gauge for Database connections */
+    /** Gauge for Database connections (no dyno_id). */
     this.databaseConnectionsGauge = this.createGauge({
       name: 'app_database_connections',
       help: 'Postgres database connections',
-      labelNames: this.withDefaultLabels(['max_connections', 'database_name', 'db_key'])
+      labelNames: this.withDefaultLabelsWithoutDynoId(['max_connections', 'database_name', 'db_key'])
     });
     this._setCleanupHandlers();
   }
@@ -149,7 +149,7 @@ class DatabaseMetricsClient extends BaseMetricsClient {
           dbName
         } = await this.getDBConnectionsAndName(pool);
         this.databaseConnectionsGauge.set({
-          ...this.getDefaultLabels(),
+          ...this.defaultLabelsWithoutDynoId,
           database_name: pool.dbKey,
           max_connections: String(max),
           db_key: dbName

package/lib/metrics/metricsDatabaseClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","BaseMetricsClient","DatabaseMetricsClient","constructor","databaseUrl","databaseName","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","tmpAppName","appName","BUILD_APP_NAME","mainDbName","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","dbKey","url","Object","entries","p","processType","databasePools","_addPool","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","pool","push","getDBConnectionsAndName","currentRes","current","rows","maxRes","max","dbName","options","database","URL","pathname","replace","collectDatabaseMetrics","set","getDefaultLabels","database_name","max_connections","String","db_key","warn","pushDatabaseMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../../src/metrics/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass DatabaseMetricsClient extends BaseMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string} options.databaseName - Main database name for metrics\n   * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value\n   * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n   * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {function} [options.startupValidation] - Function to validate startup\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({\n    databaseUrl,\n    databaseName,\n    additional_database_urls = {},\n    ...metricsConfig\n  } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const tmpAppName =\n      metricsConfig.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    const mainDbName = databaseName || `${tmpAppName}_db`\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK: ${mainDbName}`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${dbKey}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${dbKey}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this._addPool(databaseUrl, mainDbName)\n    }\n\n    for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n      this._addPool(url, dbKey)\n    }\n\n    /** Gauge for Database connections */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabels([\n        'max_connections',\n        'database_name',\n        'db_key',\n      ]),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  _addPool = (url, dbKey) => {\n    const pool = new Pool({ connectionString: url })\n    pool.dbKey = dbKey\n    this.databasePools.push(pool)\n    return pool\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      let dbName = pool.options?.database\n      if (!dbName && pool.options?.connectionString) {\n        try {\n          const url = new URL(pool.options.connectionString)\n          dbName = url.pathname.replace(/^\\//, '')\n        } catch {\n          dbName = pool.options.connectionString\n        }\n      }\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.getDefaultLabels(),\n            database_name: pool.dbKey,\n            max_connections: String(max),\n            db_key: dbName,\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB 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.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\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 = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsDatabaseClient.js","names":["Pool","require","BaseMetricsClient","DatabaseMetricsClient","constructor","databaseUrl","databaseName","additional_database_urls","metricsConfig","intervalSec","parseInt","process","env","METRICS_DATABASE_INTERVAL_SEC","tmpAppName","appName","BUILD_APP_NAME","mainDbName","startupValidation","console","error","mainPool","connectionString","query","end","info","err","message","dbKey","url","Object","entries","p","processType","databasePools","_addPool","databaseConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabelsWithoutDynoId","_setCleanupHandlers","pool","push","getDBConnectionsAndName","currentRes","current","rows","maxRes","max","dbName","options","database","URL","pathname","replace","collectDatabaseMetrics","set","defaultLabelsWithoutDynoId","database_name","max_connections","String","db_key","warn","pushDatabaseMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","startPush","_startPush","catch","cleanup","exit","on","module","exports"],"sources":["../../src/metrics/metricsDatabaseClient.js"],"sourcesContent":["const { Pool } = require('pg')\nconst { BaseMetricsClient } = require('./baseMetricsClient')\n\n/**\n * DatabaseMetricsClient collects Postgres connection metrics\n * and pushes them to Prometheus Pushgateway.\n *\n * @extends BaseMetricsClient\n */\nclass DatabaseMetricsClient extends BaseMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {string} options.databaseUrl - Required main database URL\n   * @param {string} options.databaseName - Main database name for metrics\n   * @param {Object<string, string>} [options.additional_database_urls] - Optional additional DBs, keyed by custom name with URL as value\n   * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n   * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service\n   * @param {function} [options.startupValidation] - Function to validate startup\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({\n    databaseUrl,\n    databaseName,\n    additional_database_urls = {},\n    ...metricsConfig\n  } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_DATABASE_INTERVAL_SEC || '', 10) ||\n      60\n\n    const tmpAppName =\n      metricsConfig.appName || process.env.BUILD_APP_NAME || 'unknown-app'\n    const mainDbName = databaseName || `${tmpAppName}_db`\n\n    const startupValidation = async () => {\n      if (!databaseUrl) {\n        console.error(`[database-metrics] ❌ METRICS_DATABASE_URL is required`)\n        return false\n      }\n\n      try {\n        const mainPool = new Pool({ connectionString: databaseUrl })\n        await mainPool.query('SELECT 1')\n        await mainPool.end()\n        console.info(`[database-metrics] ✓ Main database OK: ${mainDbName}`)\n      } catch (err) {\n        console.error(\n          `[database-metrics] ❌ Cannot connect to main database: ${err.message}`\n        )\n        return false\n      }\n\n      for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n        try {\n          const p = new Pool({ connectionString: url })\n          await p.query('SELECT 1')\n          await p.end()\n          console.info(`[database-metrics] ✓ Additional database OK: ${dbKey}`)\n        } catch (err) {\n          console.error(\n            `[database-metrics] ⚠ Skipping additional database: ${dbKey}`\n          )\n          console.error(`[database-metrics]    ${err.message}`)\n        }\n      }\n\n      console.info(`[database-metrics] Database metrics collection starting`)\n      return true\n    }\n\n    super({\n      ...metricsConfig,\n      processType: metricsConfig.processType || 'database-metrics',\n      intervalSec,\n      startupValidation,\n    })\n\n    this.databasePools = []\n\n    if (databaseUrl) {\n      this._addPool(databaseUrl, mainDbName)\n    }\n\n    for (const [dbKey, url] of Object.entries(additional_database_urls)) {\n      this._addPool(url, dbKey)\n    }\n\n    /** Gauge for Database connections (no dyno_id). */\n    this.databaseConnectionsGauge = this.createGauge({\n      name: 'app_database_connections',\n      help: 'Postgres database connections',\n      labelNames: this.withDefaultLabelsWithoutDynoId([\n        'max_connections',\n        'database_name',\n        'db_key',\n      ]),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  _addPool = (url, dbKey) => {\n    const pool = new Pool({ connectionString: url })\n    pool.dbKey = dbKey\n    this.databasePools.push(pool)\n    return pool\n  }\n\n  /**\n   * @param {Pool} pool - PG connection pool\n   * @returns {Promise<{ current: number, max: number, dbName: string }>}\n   */\n  getDBConnectionsAndName = async pool => {\n    try {\n      const currentRes = await pool.query(\n        'SELECT COUNT(*) AS current FROM pg_stat_activity WHERE datname = current_database()'\n      )\n      const current = parseInt(currentRes.rows[0]?.current || 0, 10)\n\n      const maxRes = await pool.query(\n        \"SELECT current_setting('max_connections') AS max\"\n      )\n      const max = parseInt(maxRes.rows[0]?.max || 0, 10)\n\n      let dbName = pool.options?.database\n      if (!dbName && pool.options?.connectionString) {\n        try {\n          const url = new URL(pool.options.connectionString)\n          dbName = url.pathname.replace(/^\\//, '')\n        } catch {\n          dbName = pool.options.connectionString\n        }\n      }\n\n      return { current, max, dbName }\n    } catch (err) {\n      return { current: 0, max: 0, dbName: pool.options?.database || '' }\n    }\n  }\n\n  /**\n   * Collect database connection metrics for all configured pools\n   * @returns {Promise<void>}\n   */\n  collectDatabaseMetrics = async () => {\n    for (const pool of this.databasePools) {\n      try {\n        const { current, max, dbName } = await this.getDBConnectionsAndName(\n          pool\n        )\n\n        this.databaseConnectionsGauge.set(\n          {\n            ...this.defaultLabelsWithoutDynoId,\n            database_name: pool.dbKey,\n            max_connections: String(max),\n            db_key: dbName,\n          },\n          current\n        )\n      } catch (err) {\n        console.warn(`[database-metrics] Failed to collect: ${err.message}`)\n      }\n    }\n  }\n\n  /**\n   * Push database metrics to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushDatabaseMetrics = async () => {\n    try {\n      await this.collectDatabaseMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[database-metrics] Collected DB metrics`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[database-metrics] Failed to collect DB 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.pushDatabaseMetrics().catch(err => {\n        console.error(`[database-metrics] Failed to push DB metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup database pools and exit process\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (this.databasePools) {\n        for (const pool of this.databasePools) {\n          await pool.end()\n        }\n      }\n    } catch (err) {\n      console.error('[database-metrics] Error during cleanup:', err)\n    }\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 = { DatabaseMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/lib/metrics/metricsQueueRedisClient.d.ts

@@ -9,7 +9,7 @@ export class QueueRedisMetricsClient extends RedisMetricsClient {
     startupValidation: () => boolean;
     /** Cache for queue objects to avoid multiple connections */
     queueCache: Map<any, any>;
-    /** Gauge for queue jobs by status */
+    /** Gauge for queue jobs by status (no dyno_id). */
     queueJobsGauge: import("prom-client").Gauge<string>;
     /**
      * Execute a Redis command in a client-type safe way.

package/lib/metrics/metricsQueueRedisClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,qCAAqC;IACrC,oDAIE;IAKJ;;;;;OAKG;IACH,cAHW,MAAM,EAAE,KACN,QAAQ,GAAG,CAAC,CA6BxB;IAED,8BAGC;IAED,2DA6BC;IAED;;;;;;OAmBC;IAED;;;;;;OAwBC;IAED;;;;;;;;;;;OAWG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAyCzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}
+{"version":3,"file":"metricsQueueRedisClient.d.ts","sourceRoot":"","sources":["../../src/metrics/metricsQueueRedisClient.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH;IAgEI,wCAAsD;IACtD,iCAA0C;IAE1C,4DAA4D;IAa5D,0BAA2B;IAE3B,mDAAmD;IACnD,oDAIE;IAKJ;;;;;OAKG;IACH,cAHW,MAAM,EAAE,KACN,QAAQ,GAAG,CAAC,CA6BxB;IAED,8BAGC;IAED,2DA6BC;IAED;;;;;;OAmBC;IAED;;;;;;OAwBC;IAED;;;;;;;;;;;OAWG;IACH,uCAHW,MAAM,KACJ,QAAQ,IAAI,CAAC,CAyCzB;IAED;;;OAGG;IACH,2BAFa,QAAQ,IAAI,CAAC,CAuCzB;CAoCF"}

package/lib/metrics/metricsQueueRedisClient.js

@@ -81,11 +81,11 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
     // but we no longer store Queue instances.
     this.queueCache = new Map();
 
-    /** Gauge for queue jobs by status */
+    /** Gauge for queue jobs by status (no dyno_id). */
     this.queueJobsGauge = this.createGauge({
       name: 'app_queue_jobs_count',
       help: 'Number of app jobs in the queue by status',
-      labelNames: this.withDefaultLabels(['queue_name', 'status'])
+      labelNames: this.withDefaultLabelsWithoutDynoId(['queue_name', 'status'])
     });
     this._setCleanupHandlers();
   }
@@ -186,7 +186,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
       const queueType = await this._getQueueType(queueName);
       const health = queueType === 'bee' ? await this._getBeeQueueHealth(queueName) : await this._getBullHealth(queueName);
       const labels = {
-        ...this.getDefaultLabels(),
+        ...this.defaultLabelsWithoutDynoId,
         queue_name: queueName
       };
       this.queueJobsGauge.set({

package/lib/metrics/metricsQueueRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabels","_setCleanupHandlers","_send","args","Promise","reject","redisClientType","resolve","send_command","slice","err","result","sendCommand","call","_toNumber","v","n","parseInt","String","Number","isFinite","_getQueueType","queueName","forced","METRICS_QUEUE_TYPE","toLowerCase","bullPrefix","BULL_QUEUE_PREFIX","beePrefix","BEE_QUEUE_PREFIX","METRICS_BEE_QUEUE_PREFIX","bullWaitKey","beeWaitKey","bullExists","beeExists","all","_getBullHealth","prefix","base","waiting","active","succeeded","failed","delayed","_getBeeQueueHealth","collectSingleQueueMetrics","queueType","health","labels","getDefaultLabels","queue_name","set","status","warn","collectQueueMetrics","collectRedisMetrics","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","on","cleanup","queue","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n   * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const getConfiguredQueueNames = () => {\n      if (!process.env.METRICS_APP_REDIS_BQ) {\n        throw new Error(\n          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n        )\n      }\n\n      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n        .map(q => q.trim())\n        .filter(Boolean)\n\n      if (allQueues.length === 0) {\n        throw new Error(\n          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n            'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n        )\n      }\n\n      return [...new Set(allQueues)]\n    }\n\n    const startupValidation = () => {\n      try {\n        const queueNames = getConfiguredQueueNames()\n        console.info(\n          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n        )\n        return true\n      } catch (error) {\n        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n        console.error(\n          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n        console.error(\n          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n        )\n        console.error(`[queue-metrics] Skipping queue metrics collection`)\n        return false\n      }\n    }\n\n    super({\n      ...metricsConfig,\n      redisClient,\n      startupValidation,\n    })\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\n\n    /** Cache for queue objects to avoid multiple connections */\n    // NOTE:\n    // Historically we used `bee-queue`'s `Queue#checkHealth()` here.\n    // But bee-queue depends on `redis@3`, which is not compatible with Node 22\n    // in some environments and can crash with errors like:\n    // - \"this._ready.then is not a function\"\n    // - \"TypeError: this.stream.once is not a function\"\n    //\n    // To avoid pulling in node-redis v3 at runtime, we read queue counters\n    // directly from Redis using the *provided* redis client (ioredis or node-redis).\n    //\n    // Keep this map reserved for possible future caching (e.g. key schema detection),\n    // but we no longer store Queue instances.\n    this.queueCache = new Map()\n\n    /** Gauge for queue jobs by status */\n    this.queueJobsGauge = this.createGauge({\n      name: 'app_queue_jobs_count',\n      help: 'Number of app jobs in the queue by status',\n      labelNames: this.withDefaultLabels(['queue_name', 'status']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * Execute a Redis command in a client-type safe way.\n   *\n   * @param {string[]} args Command args array, e.g. ['LLEN', 'key']\n   * @returns {Promise<any>}\n   */\n  _send = args => {\n    if (!this.redisClient) {\n      return Promise.reject(new Error('Redis client not provided'))\n    }\n\n    // node-redis v3 (callback API)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command(args[0], args.slice(1), (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 (Promise API)\n    if (this.redisClientType === REDIS_V4) {\n      return this.redisClient.sendCommand(args)\n    }\n\n    // ioredis (Promise API)\n    if (this.redisClientType === IOREDIS) {\n      // ioredis supports `.call(command, ...args)`\n      return this.redisClient.call(args[0], ...args.slice(1))\n    }\n\n    return Promise.reject(new Error('Unsupported Redis client type'))\n  }\n\n  _toNumber = v => {\n    const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)\n    return Number.isFinite(n) ? n : 0\n  }\n\n  _getQueueType = async queueName => {\n    const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()\n    if (forced === 'bull' || forced === 'bee') return forced\n\n    const bullPrefix =\n      (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n    const beePrefix =\n      (\n        process.env.BEE_QUEUE_PREFIX ||\n        process.env.METRICS_BEE_QUEUE_PREFIX ||\n        'bq'\n      ).trim() || 'bq'\n\n    // Detect by checking the canonical \"waiting\" key names.\n    const bullWaitKey = `${bullPrefix}:${queueName}:wait`\n    const beeWaitKey = `${beePrefix}:${queueName}:waiting`\n\n    try {\n      const [bullExists, beeExists] = await Promise.all([\n        this._send(['EXISTS', bullWaitKey]),\n        this._send(['EXISTS', beeWaitKey]),\n      ])\n      if (this._toNumber(bullExists) > 0) return 'bull'\n      if (this._toNumber(beeExists) > 0) return 'bee'\n    } catch {\n      // If EXISTS is blocked/unavailable, fall back to trying bull first.\n    }\n\n    return 'bull'\n  }\n\n  _getBullHealth = async queueName => {\n    const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n    const base = `${prefix}:${queueName}:`\n\n    const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n      this._send(['LLEN', `${base}wait`]),\n      this._send(['LLEN', `${base}active`]),\n      this._send(['ZCARD', `${base}completed`]),\n      this._send(['ZCARD', `${base}failed`]),\n      this._send(['ZCARD', `${base}delayed`]),\n    ])\n\n    return {\n      waiting: this._toNumber(waiting),\n      active: this._toNumber(active),\n      succeeded: this._toNumber(succeeded),\n      failed: this._toNumber(failed),\n      delayed: this._toNumber(delayed),\n    }\n  }\n\n  _getBeeQueueHealth = async queueName => {\n    const prefix =\n      (\n        process.env.BEE_QUEUE_PREFIX ||\n        process.env.METRICS_BEE_QUEUE_PREFIX ||\n        'bq'\n      ).trim() || 'bq'\n    const base = `${prefix}:${queueName}:`\n\n    const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n      this._send(['LLEN', `${base}waiting`]),\n      this._send(['LLEN', `${base}active`]),\n      this._send(['SCARD', `${base}succeeded`]),\n      this._send(['SCARD', `${base}failed`]),\n      this._send(['ZCARD', `${base}delayed`]),\n    ])\n\n    return {\n      waiting: this._toNumber(waiting),\n      active: this._toNumber(active),\n      succeeded: this._toNumber(succeeded),\n      failed: this._toNumber(failed),\n      delayed: this._toNumber(delayed),\n    }\n  }\n\n  /**\n   * Collect metrics for a single queue and set gauges.\n   *\n   * Supports:\n   * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`\n   * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`\n   *\n   * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.\n   *\n   * @param {string} queueName - Name of the queue\n   * @returns {Promise<void>}\n   */\n  collectSingleQueueMetrics = async queueName => {\n    try {\n      const queueType = await this._getQueueType(queueName)\n      const health =\n        queueType === 'bee'\n          ? await this._getBeeQueueHealth(queueName)\n          : await this._getBullHealth(queueName)\n\n      const labels = {\n        ...this.getDefaultLabels(),\n        queue_name: queueName,\n      }\n\n      this.queueJobsGauge.set(\n        { ...labels, status: 'waiting' },\n        health.waiting || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'active' },\n        health.active || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'succeeded' },\n        health.succeeded || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'failed' },\n        health.failed || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'delayed' },\n        health.delayed || 0\n      )\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all queues and Redis, then push to Pushgateway\n   * @returns {Promise<void>}\n   */\n  collectQueueMetrics = async () => {\n    try {\n      const queueNames = this.getConfiguredQueueNames()\n\n      await this.collectRedisMetrics()\n      await Promise.allSettled(\n        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n      )\n\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      if (\n        error.message?.includes('No queues configured') ||\n        error.message?.includes('METRICS_APP_REDIS_BQ')\n      ) {\n        console.error(\n          `[queue-metrics] ❌ Configuration error: ${error.message}`\n        )\n        console.error(\n          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n      } else {\n        console.error(\n          `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n        )\n      }\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.collectQueueMetrics().catch(err => {\n        console.error(\n          `[queue-metrics] Failed to collect queue & Redis metrics:`,\n          err\n        )\n      })\n    })\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  /**\n   * Cleanup queues and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    for (const [queueName, queue] of this.queueCache) {\n      try {\n        await queue.close()\n      } catch (err) {\n        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n      }\n    }\n    process.exit(0)\n  }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsQueueRedisClient.js","names":["RedisMetricsClient","require","IOREDIS","REDIS_V3","REDIS_V4","QueueRedisMetricsClient","constructor","redisClient","metricsConfig","getConfiguredQueueNames","process","env","METRICS_APP_REDIS_BQ","Error","allQueues","split","map","q","trim","filter","Boolean","length","Set","startupValidation","queueNames","console","info","error","message","queueCache","Map","queueJobsGauge","createGauge","name","help","labelNames","withDefaultLabelsWithoutDynoId","_setCleanupHandlers","_send","args","Promise","reject","redisClientType","resolve","send_command","slice","err","result","sendCommand","call","_toNumber","v","n","parseInt","String","Number","isFinite","_getQueueType","queueName","forced","METRICS_QUEUE_TYPE","toLowerCase","bullPrefix","BULL_QUEUE_PREFIX","beePrefix","BEE_QUEUE_PREFIX","METRICS_BEE_QUEUE_PREFIX","bullWaitKey","beeWaitKey","bullExists","beeExists","all","_getBullHealth","prefix","base","waiting","active","succeeded","failed","delayed","_getBeeQueueHealth","collectSingleQueueMetrics","queueType","health","labels","defaultLabelsWithoutDynoId","queue_name","set","status","warn","collectQueueMetrics","collectRedisMetrics","allSettled","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","JSON","stringify","includes","startPush","intervalSec","_startPush","catch","on","cleanup","queue","close","exit","module","exports"],"sources":["../../src/metrics/metricsQueueRedisClient.js"],"sourcesContent":["const { RedisMetricsClient } = require('./metricsRedisClient')\nconst { IOREDIS, REDIS_V3, REDIS_V4 } = require('../redisUtils')\n\n/**\n * QueueRedisMetricsClient extends RedisMetricsClient to collect\n * Redis and Bee Queue metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends RedisMetricsClient\n */\nclass QueueRedisMetricsClient extends RedisMetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from BaseMetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from BaseMetricsClient)\n   * @param {string} [options.processType] - Process type (from BaseMetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from BaseMetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from BaseMetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from BaseMetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from BaseMetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from BaseMetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from BaseMetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from BaseMetricsClient)\n   * @param {boolean} [options.disablePushgateway] - Disable pushing to Pushgateway (use HTTP scraping instead)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const getConfiguredQueueNames = () => {\n      if (!process.env.METRICS_APP_REDIS_BQ) {\n        throw new Error(\n          'No queues configured for monitoring. Set METRICS_APP_REDIS_BQ with comma-separated queue names'\n        )\n      }\n\n      const allQueues = process.env.METRICS_APP_REDIS_BQ.split(',')\n        .map(q => q.trim())\n        .filter(Boolean)\n\n      if (allQueues.length === 0) {\n        throw new Error(\n          'METRICS_APP_REDIS_BQ is empty or contains only whitespace. ' +\n            'Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"'\n        )\n      }\n\n      return [...new Set(allQueues)]\n    }\n\n    const startupValidation = () => {\n      try {\n        const queueNames = getConfiguredQueueNames()\n        console.info(\n          `[queue-metrics] Queue & Redis metrics collection starting for ${queueNames.length} queues`\n        )\n        return true\n      } catch (error) {\n        console.error(`[queue-metrics] ❌ Cannot start: ${error.message}`)\n        console.error(\n          `[queue-metrics] 💡 Example: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n        console.error(\n          `[queue-metrics] 💡 Optional: METRICS_QUEUE_INTERVAL_SEC=\"10\"`\n        )\n        console.error(`[queue-metrics] Skipping queue metrics collection`)\n        return false\n      }\n    }\n\n    super({\n      ...metricsConfig,\n      redisClient,\n      startupValidation,\n    })\n\n    this.getConfiguredQueueNames = getConfiguredQueueNames\n    this.startupValidation = startupValidation\n\n    /** Cache for queue objects to avoid multiple connections */\n    // NOTE:\n    // Historically we used `bee-queue`'s `Queue#checkHealth()` here.\n    // But bee-queue depends on `redis@3`, which is not compatible with Node 22\n    // in some environments and can crash with errors like:\n    // - \"this._ready.then is not a function\"\n    // - \"TypeError: this.stream.once is not a function\"\n    //\n    // To avoid pulling in node-redis v3 at runtime, we read queue counters\n    // directly from Redis using the *provided* redis client (ioredis or node-redis).\n    //\n    // Keep this map reserved for possible future caching (e.g. key schema detection),\n    // but we no longer store Queue instances.\n    this.queueCache = new Map()\n\n    /** Gauge for queue jobs by status (no dyno_id). */\n    this.queueJobsGauge = this.createGauge({\n      name: 'app_queue_jobs_count',\n      help: 'Number of app jobs in the queue by status',\n      labelNames: this.withDefaultLabelsWithoutDynoId(['queue_name', 'status']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  /**\n   * Execute a Redis command in a client-type safe way.\n   *\n   * @param {string[]} args Command args array, e.g. ['LLEN', 'key']\n   * @returns {Promise<any>}\n   */\n  _send = args => {\n    if (!this.redisClient) {\n      return Promise.reject(new Error('Redis client not provided'))\n    }\n\n    // node-redis v3 (callback API)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command(args[0], args.slice(1), (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 (Promise API)\n    if (this.redisClientType === REDIS_V4) {\n      return this.redisClient.sendCommand(args)\n    }\n\n    // ioredis (Promise API)\n    if (this.redisClientType === IOREDIS) {\n      // ioredis supports `.call(command, ...args)`\n      return this.redisClient.call(args[0], ...args.slice(1))\n    }\n\n    return Promise.reject(new Error('Unsupported Redis client type'))\n  }\n\n  _toNumber = v => {\n    const n = typeof v === 'number' ? v : parseInt(String(v || '0'), 10)\n    return Number.isFinite(n) ? n : 0\n  }\n\n  _getQueueType = async queueName => {\n    const forced = (process.env.METRICS_QUEUE_TYPE || '').trim().toLowerCase()\n    if (forced === 'bull' || forced === 'bee') return forced\n\n    const bullPrefix =\n      (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n    const beePrefix =\n      (\n        process.env.BEE_QUEUE_PREFIX ||\n        process.env.METRICS_BEE_QUEUE_PREFIX ||\n        'bq'\n      ).trim() || 'bq'\n\n    // Detect by checking the canonical \"waiting\" key names.\n    const bullWaitKey = `${bullPrefix}:${queueName}:wait`\n    const beeWaitKey = `${beePrefix}:${queueName}:waiting`\n\n    try {\n      const [bullExists, beeExists] = await Promise.all([\n        this._send(['EXISTS', bullWaitKey]),\n        this._send(['EXISTS', beeWaitKey]),\n      ])\n      if (this._toNumber(bullExists) > 0) return 'bull'\n      if (this._toNumber(beeExists) > 0) return 'bee'\n    } catch {\n      // If EXISTS is blocked/unavailable, fall back to trying bull first.\n    }\n\n    return 'bull'\n  }\n\n  _getBullHealth = async queueName => {\n    const prefix = (process.env.BULL_QUEUE_PREFIX || 'bull').trim() || 'bull'\n    const base = `${prefix}:${queueName}:`\n\n    const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n      this._send(['LLEN', `${base}wait`]),\n      this._send(['LLEN', `${base}active`]),\n      this._send(['ZCARD', `${base}completed`]),\n      this._send(['ZCARD', `${base}failed`]),\n      this._send(['ZCARD', `${base}delayed`]),\n    ])\n\n    return {\n      waiting: this._toNumber(waiting),\n      active: this._toNumber(active),\n      succeeded: this._toNumber(succeeded),\n      failed: this._toNumber(failed),\n      delayed: this._toNumber(delayed),\n    }\n  }\n\n  _getBeeQueueHealth = async queueName => {\n    const prefix =\n      (\n        process.env.BEE_QUEUE_PREFIX ||\n        process.env.METRICS_BEE_QUEUE_PREFIX ||\n        'bq'\n      ).trim() || 'bq'\n    const base = `${prefix}:${queueName}:`\n\n    const [waiting, active, succeeded, failed, delayed] = await Promise.all([\n      this._send(['LLEN', `${base}waiting`]),\n      this._send(['LLEN', `${base}active`]),\n      this._send(['SCARD', `${base}succeeded`]),\n      this._send(['SCARD', `${base}failed`]),\n      this._send(['ZCARD', `${base}delayed`]),\n    ])\n\n    return {\n      waiting: this._toNumber(waiting),\n      active: this._toNumber(active),\n      succeeded: this._toNumber(succeeded),\n      failed: this._toNumber(failed),\n      delayed: this._toNumber(delayed),\n    }\n  }\n\n  /**\n   * Collect metrics for a single queue and set gauges.\n   *\n   * Supports:\n   * - Bull (default): keys like `bull:<queue>:wait`, `...:active`, `...:completed`, `...:failed`, `...:delayed`\n   * - Bee-Queue: keys like `bq:<queue>:waiting`, `...:active`, `...:succeeded`, `...:failed`, `...:delayed`\n   *\n   * Auto-detects queue type unless `METRICS_QUEUE_TYPE` is set to `bull` or `bee`.\n   *\n   * @param {string} queueName - Name of the queue\n   * @returns {Promise<void>}\n   */\n  collectSingleQueueMetrics = async queueName => {\n    try {\n      const queueType = await this._getQueueType(queueName)\n      const health =\n        queueType === 'bee'\n          ? await this._getBeeQueueHealth(queueName)\n          : await this._getBullHealth(queueName)\n\n      const labels = {\n        ...this.defaultLabelsWithoutDynoId,\n        queue_name: queueName,\n      }\n\n      this.queueJobsGauge.set(\n        { ...labels, status: 'waiting' },\n        health.waiting || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'active' },\n        health.active || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'succeeded' },\n        health.succeeded || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'failed' },\n        health.failed || 0\n      )\n      this.queueJobsGauge.set(\n        { ...labels, status: 'delayed' },\n        health.delayed || 0\n      )\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect metrics for queue ${queueName}:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all queues and Redis, then push to Pushgateway\n   * @returns {Promise<void>}\n   */\n  collectQueueMetrics = async () => {\n    try {\n      const queueNames = this.getConfiguredQueueNames()\n\n      await this.collectRedisMetrics()\n      await Promise.allSettled(\n        queueNames.map(queueName => this.collectSingleQueueMetrics(queueName))\n      )\n\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for ${queueNames.length} queues:`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      if (\n        error.message?.includes('No queues configured') ||\n        error.message?.includes('METRICS_APP_REDIS_BQ')\n      ) {\n        console.error(\n          `[queue-metrics] ❌ Configuration error: ${error.message}`\n        )\n        console.error(\n          `[queue-metrics] 💡 Example config: METRICS_APP_REDIS_BQ=\"adalo-compile,adalo-migrations\"`\n        )\n      } else {\n        console.error(\n          `[queue-metrics] Failed to collect queue metrics: ${error.message}`\n        )\n      }\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.collectQueueMetrics().catch(err => {\n        console.error(\n          `[queue-metrics] Failed to collect queue & Redis metrics:`,\n          err\n        )\n      })\n    })\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n\n  /**\n   * Cleanup queues and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    for (const [queueName, queue] of this.queueCache) {\n      try {\n        await queue.close()\n      } catch (err) {\n        console.error(`[queue-metrics] Error closing queue ${queueName}:`, err)\n      }\n    }\n    process.exit(0)\n  }\n}\n\nmodule.exports = { QueueRedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/health/healthCheckClient.js

@@ -28,7 +28,7 @@ const DEFAULT_HEALTH_CONFIG = {
   staleThresholdMs: 180_000,
   checkTimeoutMs: 15_000,
   maxDbConnectLatencyMs:
-    readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 1000,
+    readNumberEnv('HEALTH_DB_MAX_CONNECT_LATENCY_MS') ?? 30_000,
 }
 
 const SENSITIVE_PATTERNS = [

package/src/health/healthCheckWorker.js

@@ -10,6 +10,21 @@
 const { createHealthCheckWorkerClient } = require('./healthCheckUtils')
 const { DEFAULT_HEALTH_CONFIG } = require('./healthCheckClient')
 
+/** Latency above this (ms) triggers a warning log on the worker. 2000 = 2 seconds. */
+const LATENCY_WARNING_MS = 2000
+
+function logLatencyWarnings(prefixLogs, result) {
+  const resources = result?.resources || {}
+  for (const [env, r] of Object.entries(resources)) {
+    const connectMs = r?.connectMs
+    if (typeof connectMs === 'number' && connectMs > LATENCY_WARNING_MS) {
+      console.warn(
+        `${prefixLogs} DB connect latency high: ${env} connectMs=${connectMs}ms (threshold ${LATENCY_WARNING_MS}ms)`
+      )
+    }
+  }
+}
+
 export function createHealthCheckWorker(options) {
   const {
     refreshIntervalMs = DEFAULT_HEALTH_CONFIG.checkIntervalMs,
@@ -31,7 +46,8 @@ export function createHealthCheckWorker(options) {
     console.log(`${prefixLogs} Refresh interval: ${refreshIntervalMs}ms`)
 
     try {
-      await healthCheckClient.refreshCache()
+      const result = await healthCheckClient.refreshCache()
+      logLatencyWarnings(prefixLogs, result)
       if (logValues) {
         console.log(`${prefixLogs} Initial health check completed`)
       }
@@ -42,6 +58,7 @@ export function createHealthCheckWorker(options) {
     const interval = setInterval(async () => {
       try {
         const result = await healthCheckClient.refreshCache()
+        logLatencyWarnings(prefixLogs, result)
         if (logValues) {
           console.log(
             `${prefixLogs} Health check refreshed at ${result.lastCheckAt}, status: ${result.status}`

package/src/metrics/baseMetricsClient.js

@@ -60,6 +60,12 @@ class BaseMetricsClient {
       process_type: this.processType,
     }
 
+    /** Default labels without dyno_id (for HTTP metrics so dyno_id is not included). */
+    this.defaultLabelsWithoutDynoId = {
+      app: this.appName,
+      process_type: this.processType,
+    }
+
     // Always push to configured URL (VM-agent). No Pushgateway.
     this.gateway = null
     this.gauges = {}
@@ -114,14 +120,24 @@ class BaseMetricsClient {
    * @param {string} params.name - Metric name
    * @param {string} params.help - Metric description
    * @param {string[]} [params.labelNames] - Optional list of label names. Defaults to this.defaultLabels keys.
+   * @param {boolean} [params.useLabelsWithoutDynoId=false] - If true, counter uses app/process_type only (no dyno_id). Use for HTTP metrics.
    *
    * @returns {(labels?: Object, incrementValue?: number) => void}
    *          A function to increment the counter.
    *          Usage: (labels?, incrementValue?)
    */
-  createCounter({ name, help, labelNames = Object.keys(this.defaultLabels) }) {
+  createCounter({
+    name,
+    help,
+    labelNames = Object.keys(this.defaultLabels),
+    useLabelsWithoutDynoId = false,
+  }) {
     if (this.counters[name]) return this.countersFunctions[name]
 
+    const defaultSet = useLabelsWithoutDynoId
+      ? this.defaultLabelsWithoutDynoId
+      : this.defaultLabels
+
     const c = new client.Counter({
       name,
       help,
@@ -133,7 +149,7 @@ class BaseMetricsClient {
     this.countersFunctions = {
       ...this.countersFunctions,
       [name]: (data = {}, value = 1) => {
-        c.inc({ ...this.defaultLabels, ...data }, value)
+        c.inc({ ...defaultSet, ...data }, value)
       },
     }
 
@@ -450,6 +466,17 @@ class BaseMetricsClient {
     return [...Object.keys(this.defaultLabels), ...labels]
   }
 
+  /**
+   * Merge default labels without dyno_id (`app`, `process_type`) with custom label names.
+   * Use for HTTP metrics so dyno_id is not included.
+   *
+   * @param {string[]} labels Additional label names
+   * @returns {string[]} Combined label names
+   */
+  withDefaultLabelsWithoutDynoId = (labels = []) => {
+    return [...Object.keys(this.defaultLabelsWithoutDynoId), ...labels]
+  }
+
   getDefaultLabels = (labels = []) => {
     return this.defaultLabels
   }

package/src/metrics/metricsClient.js

@@ -82,25 +82,27 @@ class MetricsClient extends BaseMetricsClient {
       this.createCounter({
         name: 'app_requests_total',
         help: 'Total number of HTTP requests',
-        labelNames: this.withDefaultLabels([
+        labelNames: this.withDefaultLabelsWithoutDynoId([
           'method',
           'route',
           'appId',
           'databaseId',
           'status_code',
         ]),
+        useLabelsWithoutDynoId: true,
       })
 
       this.createCounter({
         name: 'app_requests_total_duration',
         help: 'Total duration of HTTP requests in milliseconds',
-        labelNames: this.withDefaultLabels([
+        labelNames: this.withDefaultLabelsWithoutDynoId([
           'method',
           'route',
           'appId',
           'databaseId',
           'status_code',
         ]),
+        useLabelsWithoutDynoId: true,
       })
     }
   }

package/src/metrics/metricsDatabaseClient.js

@@ -93,11 +93,11 @@ class DatabaseMetricsClient extends BaseMetricsClient {
       this._addPool(url, dbKey)
     }
 
-    /** Gauge for Database connections */
+    /** Gauge for Database connections (no dyno_id). */
     this.databaseConnectionsGauge = this.createGauge({
       name: 'app_database_connections',
       help: 'Postgres database connections',
-      labelNames: this.withDefaultLabels([
+      labelNames: this.withDefaultLabelsWithoutDynoId([
         'max_connections',
         'database_name',
         'db_key',
@@ -159,7 +159,7 @@ class DatabaseMetricsClient extends BaseMetricsClient {
 
         this.databaseConnectionsGauge.set(
           {
-            ...this.getDefaultLabels(),
+            ...this.defaultLabelsWithoutDynoId,
             database_name: pool.dbKey,
             max_connections: String(max),
             db_key: dbName,

package/src/metrics/metricsQueueRedisClient.js

@@ -89,11 +89,11 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
     // but we no longer store Queue instances.
     this.queueCache = new Map()
 
-    /** Gauge for queue jobs by status */
+    /** Gauge for queue jobs by status (no dyno_id). */
     this.queueJobsGauge = this.createGauge({
       name: 'app_queue_jobs_count',
       help: 'Number of app jobs in the queue by status',
-      labelNames: this.withDefaultLabels(['queue_name', 'status']),
+      labelNames: this.withDefaultLabelsWithoutDynoId(['queue_name', 'status']),
     })
 
     this._setCleanupHandlers()
@@ -238,7 +238,7 @@ class QueueRedisMetricsClient extends RedisMetricsClient {
           : await this._getBullHealth(queueName)
 
       const labels = {
-        ...this.getDefaultLabels(),
+        ...this.defaultLabelsWithoutDynoId,
         queue_name: queueName,
       }