@platformatic/service 1.47.0 → 1.48.0

package/config.d.ts

@@ -156,6 +156,9 @@ export interface PlatformaticService {
           username: string;
           password: string;
         };
+        labels?: {
+          [k: string]: string;
+        };
       };
   telemetry?: OpenTelemetry;
   watch?:

package/lib/plugins/metrics.js

@@ -7,22 +7,43 @@ const fastify = require('fastify')
 const fp = require('fastify-plugin')
 
 const metricsPlugin = fp(async function (app, opts = {}) {
+  const promClient = require('prom-client')
+
+  const register = new promClient.Registry()
+
   const defaultMetrics = opts.defaultMetrics ?? { enabled: true }
   const prefix = opts.prefix ?? ''
 
+  if (opts.labels) {
+    const labels = opts.labels ?? {}
+    register.setDefaultLabels(labels)
+  }
+
   app.register(require('fastify-metrics'), {
-    defaultMetrics: defaultMetrics || { enabled: true },
+    defaultMetrics: {
+      ...defaultMetrics,
+      register
+    },
     endpoint: null,
     name: 'metrics',
     clearRegisterOnInit: false,
+    promClient: {
+      ...promClient,
+      register
+    },
     routeMetrics: {
       enabled: true,
+      customLabels: {
+        telemetry_id: (req) => req.headers['x-telemetry-id'] ?? 'unknown'
+      },
       overrides: {
         histogram: {
-          name: prefix + 'http_request_duration_seconds'
+          name: prefix + 'http_request_duration_seconds',
+          registers: [register]
         },
         summary: {
-          name: prefix + 'http_request_summary_seconds'
+          name: prefix + 'http_request_summary_seconds',
+          registers: [register]
         }
       }
     }
@@ -34,8 +55,10 @@ const metricsPlugin = fp(async function (app, opts = {}) {
       help: 'request duration in seconds summary for all requests',
       collect: () => {
         process.nextTick(() => httpLatencyMetric.reset())
-      }
+      },
+      registers: [register]
     })
+
     const ignoredMethods = ['HEAD', 'OPTIONS', 'TRACE', 'CONNECT']
     const timers = new WeakMap()
     app.addHook('onRequest', async (req) => {
@@ -66,7 +89,8 @@ const metricsPlugin = fp(async function (app, opts = {}) {
           const result = eventLoopUtilization(endELU, startELU).utilization
           eluMetric.set(result)
           startELU = endELU
-        }
+        },
+        registers: [register]
       })
       app.metrics.client.register.registerMetric(eluMetric)
 
@@ -98,7 +122,8 @@ const metricsPlugin = fp(async function (app, opts = {}) {
 
           previousIdleTime = idleTime
           previousTotalTime = totalTime
-        }
+        },
+        registers: [register]
       })
       app.metrics.client.register.registerMetric(cpuMetric)
     })

package/lib/schema.js

@@ -583,6 +583,10 @@ const metrics = {
           },
           additionalProperties: false,
           required: ['username', 'password']
+        },
+        labels: {
+          type: 'object',
+          additionalProperties: { type: 'string' }
         }
       },
       additionalProperties: false

package/lib/start.js

@@ -2,6 +2,7 @@
 
 const { readFile } = require('fs/promises')
 const close = require('close-with-grace')
+const { Bus } = require('@platformatic/bus')
 const { loadConfig, ConfigManager, printConfigValidationErrors, printAndExitLoadConfigError } = require('@platformatic/config')
 const { addLoggerToTheConfig, isDocker } = require('./utils.js')
 const { restartable } = require('@fastify/restartable')
@@ -60,7 +61,7 @@ async function buildServer (options, app) {
     }
     fastifyOptions.genReqId = function (req) { return randomUUID() }
     const root = fastify(fastifyOptions)
-    root.decorate('platformatic', { configManager, config })
+    root.decorate('platformatic', { configManager, config, bus: new Bus(options.id) })
     await root.register(app)
     if (!root.hasRoute({ url: '/', method: 'GET' })) {
       await root.register(require('./root-endpoint'), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "1.47.0",
+  "version": "1.48.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -44,7 +44,7 @@
     "@fastify/cors": "^9.0.1",
     "@fastify/deepmerge": "^1.3.0",
     "@fastify/error": "^3.4.1",
-    "@fastify/restartable": "^2.2.0",
+    "@fastify/restartable": "^2.3.1",
     "@fastify/static": "^7.0.1",
     "@fastify/swagger": "^8.14.0",
     "@fastify/under-pressure": "^8.3.0",
@@ -62,7 +62,7 @@
     "env-schema": "^5.2.1",
     "es-main": "^1.3.0",
     "execa": "^8.0.1",
-    "fastify": "^4.26.2",
+    "fastify": "^4.28.1",
     "fastify-metrics": "^11.0.0",
     "fastify-openapi-glue": "^4.4.3",
     "fastify-plugin": "^4.5.1",
@@ -75,16 +75,18 @@
     "ora": "^6.3.1",
     "pino": "^8.19.0",
     "pino-pretty": "^11.0.0",
+    "prom-client": "^15.1.2",
     "rfdc": "^1.3.1",
     "semgrator": "^0.3.0",
     "undici": "^6.9.0",
-    "@platformatic/client": "1.47.0",
-    "@platformatic/authenticate": "1.47.0",
-    "@platformatic/config": "1.47.0",
-    "@platformatic/scalar-theme": "1.47.0",
-    "@platformatic/utils": "1.47.0",
-    "@platformatic/telemetry": "1.47.0",
-    "@platformatic/generators": "1.47.0"
+    "@platformatic/authenticate": "1.48.0",
+    "@platformatic/bus": "1.48.0",
+    "@platformatic/client": "1.48.0",
+    "@platformatic/generators": "1.48.0",
+    "@platformatic/scalar-theme": "1.48.0",
+    "@platformatic/config": "1.48.0",
+    "@platformatic/utils": "1.48.0",
+    "@platformatic/telemetry": "1.48.0"
   },
   "standard": {
     "ignore": [

package/schema.json

@@ -1,6 +1,6 @@
 {
-  "$id": "https://platformatic.dev/schemas/v1.47.0/service",
-  "version": "1.47.0",
+  "$id": "https://platformatic.dev/schemas/v1.48.0/service",
+  "version": "1.48.0",
   "title": "Platformatic Service",
   "type": "object",
   "properties": {
@@ -653,6 +653,12 @@
                 "username",
                 "password"
               ]
+            },
+            "labels": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
             }
           },
           "additionalProperties": false