@platformatic/runtime 1.51.8 → 1.52.1

package/fixtures/configs/monorepo-with-metrics.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "https://platformatic.dev/schemas/v0.20.0/runtime",
+  "entrypoint": "serviceApp",
+  "allowCycles": true,
+  "hotReload": false,
+  "managementApi": false,
+  "autoload": {
+    "path": "../monorepo",
+    "exclude": [
+      "docs",
+      "composerApp"
+    ],
+    "mappings": {
+      "serviceAppWithLogger": {
+        "id": "with-logger",
+        "config": "platformatic.service.json"
+      },
+      "serviceAppWithMultiplePlugins": {
+        "id": "multi-plugin-service",
+        "config": "platformatic.service.json"
+      },
+      "dbApp": {
+        "id": "db-app",
+        "config": "platformatic.db.json"
+      }
+    }
+  },
+  "metrics": {
+    "labels": {
+      "app": "serviceApp"
+    }
+  }
+}

package/lib/api-client.js

@@ -170,10 +170,6 @@ class RuntimeApiClient extends EventEmitter {
 
     if (metrics === null) return null
 
-    const entrypointDetails = await this.getEntrypointDetails()
-    const entrypointConfig = await this.getServiceConfig(entrypointDetails.id)
-    const entrypointMetricsPrefix = entrypointConfig.metrics?.prefix
-
     const cpuMetric = metrics.find(
       (metric) => metric.name === 'process_cpu_percent_usage'
     )
@@ -204,28 +200,27 @@ class RuntimeApiClient extends EventEmitter {
     let p95Value = 0
     let p99Value = 0
 
-    if (entrypointMetricsPrefix) {
-      const metricName = entrypointMetricsPrefix + 'http_request_all_summary_seconds'
-      const httpLatencyMetrics = metrics.find((metric) => metric.name === metricName)
-
-      p50Value = httpLatencyMetrics.values.find(
-        (value) => value.labels.quantile === 0.5
-      ).value || 0
-      p90Value = httpLatencyMetrics.values.find(
-        (value) => value.labels.quantile === 0.9
-      ).value || 0
-      p95Value = httpLatencyMetrics.values.find(
-        (value) => value.labels.quantile === 0.95
-      ).value || 0
-      p99Value = httpLatencyMetrics.values.find(
-        (value) => value.labels.quantile === 0.99
-      ).value || 0
-
-      p50Value = Math.round(p50Value * 1000)
-      p90Value = Math.round(p90Value * 1000)
-      p95Value = Math.round(p95Value * 1000)
-      p99Value = Math.round(p99Value * 1000)
-    }
+    const metricName = 'http_request_all_summary_seconds'
+    const httpLatencyMetrics =
+        metrics.find((metric) => metric.name === metricName)
+
+    p50Value = httpLatencyMetrics.values.find(
+      (value) => value.labels.quantile === 0.5
+    ).value || 0
+    p90Value = httpLatencyMetrics.values.find(
+      (value) => value.labels.quantile === 0.9
+    ).value || 0
+    p95Value = httpLatencyMetrics.values.find(
+      (value) => value.labels.quantile === 0.95
+    ).value || 0
+    p99Value = httpLatencyMetrics.values.find(
+      (value) => value.labels.quantile === 0.99
+    ).value || 0
+
+    p50Value = Math.round(p50Value * 1000)
+    p90Value = Math.round(p90Value * 1000)
+    p95Value = Math.round(p95Value * 1000)
+    p99Value = Math.round(p99Value * 1000)
 
     const cpu = cpuMetric.values[0].value
     const rss = rssMetric.values[0].value

package/lib/app.js

@@ -4,7 +4,6 @@ const { dirname } = require('node:path')
 const { EventEmitter, once } = require('node:events')
 const { FileWatcher } = require('@platformatic/utils')
 const debounce = require('debounce')
-const { snakeCase } = require('change-case-all')
 const { buildServer } = require('./build-server')
 const { loadConfig } = require('./load-config')
 const errors = require('./errors')
@@ -275,13 +274,18 @@ class PlatformaticApp extends EventEmitter {
       (this.#hasManagementApi && configManager.current.metrics === undefined) ||
       configManager.current.metrics
     ) {
+      const labels = configManager.current.metrics?.labels || {}
+      const serviceId = this.appConfig.id
       configManager.update({
         ...configManager.current,
         metrics: {
           server: 'hide',
           defaultMetrics: { enabled: this.appConfig.entrypoint },
-          prefix: snakeCase(this.appConfig.id) + '_',
-          ...configManager.current.metrics
+          ...configManager.current.metrics,
+          labels: {
+            serviceId,
+            ...labels
+          }
         }
       })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.51.8",
+  "version": "1.52.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,8 +34,8 @@
     "typescript": "^5.4.2",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/sql-graphql": "1.51.8",
-    "@platformatic/sql-mapper": "1.51.8"
+    "@platformatic/sql-graphql": "1.52.1",
+    "@platformatic/sql-mapper": "1.52.1"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
@@ -63,14 +63,14 @@
     "undici": "^6.9.0",
     "why-is-node-running": "^2.2.2",
     "ws": "^8.16.0",
-    "@platformatic/bus": "1.51.8",
-    "@platformatic/composer": "1.51.8",
-    "@platformatic/config": "1.51.8",
-    "@platformatic/db": "1.51.8",
-    "@platformatic/generators": "1.51.8",
-    "@platformatic/service": "1.51.8",
-    "@platformatic/telemetry": "1.51.8",
-    "@platformatic/utils": "1.51.8"
+    "@platformatic/bus": "1.52.1",
+    "@platformatic/config": "1.52.1",
+    "@platformatic/composer": "1.52.1",
+    "@platformatic/generators": "1.52.1",
+    "@platformatic/service": "1.52.1",
+    "@platformatic/telemetry": "1.52.1",
+    "@platformatic/db": "1.52.1",
+    "@platformatic/utils": "1.52.1"
   },
   "standard": {
     "ignore": [