@platformatic/runtime 2.3.1 → 3.4.1

package/config.d.ts

@@ -5,7 +5,7 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 
-export type HttpsSchemasPlatformaticDevPlatformaticRuntime231Json = {
+export type HttpsSchemasPlatformaticDevPlatformaticRuntime341Json = {
   [k: string]: unknown;
 } & {
   $schema?: string;

package/lib/runtime.js

@@ -236,7 +236,7 @@ class Runtime extends EventEmitter {
       // TODO: handle port allocation error here
       if (error.code === 'EADDRINUSE') throw error
 
-      this.logger.error({ error: ensureLoggableError(error) }, `Failed to start service "${id}".`)
+      this.logger.error({ err: ensureLoggableError(error) }, `Failed to start service "${id}".`)
 
       const config = this.#configManager.current
       const restartOnError = config.restartOnError

package/lib/worker/metrics.js

@@ -7,7 +7,15 @@ const collectHttpMetrics = require('@platformatic/http-metrics')
 
 async function collectMetrics (stackable, serviceId, opts = {}) {
   const registry = new Registry()
-  const metricsConfig = await stackable.collectMetrics({ registry })
+
+  const httpRequestCallbacks = []
+  const httpResponseCallbacks = []
+
+  const metricsConfig = await stackable.collectMetrics({
+    registry,
+    startHttpTimer: options => httpRequestCallbacks.forEach(cb => cb(options)),
+    endHttpTimer: options => httpResponseCallbacks.forEach(cb => cb(options))
+  })
 
   const labels = opts.labels ?? {}
   registry.setDefaultLabels({ ...labels, serviceId })
@@ -18,37 +26,45 @@ async function collectMetrics (stackable, serviceId, opts = {}) {
   }
 
   if (metricsConfig.httpMetrics) {
-    collectHttpMetrics(registry, {
-      customLabels: ['telemetry_id'],
-      getCustomLabels: (req) => {
-        const telemetryId = req.headers['x-plt-telemetry-id'] ?? 'unknown'
-        return { telemetry_id: telemetryId }
-      }
-    })
-
-    // TODO: check if it's a nodejs environment
-    // Needed for the Meraki metrics
-    collectHttpMetrics(registry, {
-      customLabels: ['telemetry_id'],
-      getCustomLabels: (req) => {
-        const telemetryId = req.headers['x-plt-telemetry-id'] ?? 'unknown'
-        return { telemetry_id: telemetryId }
-      },
-      histogram: {
-        name: 'http_request_all_duration_seconds',
-        help: 'request duration in seconds summary for all requests',
-        collect: function () {
-          process.nextTick(() => this.reset())
+    {
+      const { startTimer, endTimer } = collectHttpMetrics(registry, {
+        customLabels: ['telemetry_id'],
+        getCustomLabels: (req) => {
+          const telemetryId = req.headers?.['x-plt-telemetry-id'] ?? 'unknown'
+          return { telemetry_id: telemetryId }
+        }
+      })
+      httpRequestCallbacks.push(startTimer)
+      httpResponseCallbacks.push(endTimer)
+    }
+
+    {
+      // TODO: check if it's a nodejs environment
+      // Needed for the Meraki metrics
+      const { startTimer, endTimer } = collectHttpMetrics(registry, {
+        customLabels: ['telemetry_id'],
+        getCustomLabels: (req) => {
+          const telemetryId = req.headers?.['x-plt-telemetry-id'] ?? 'unknown'
+          return { telemetry_id: telemetryId }
         },
-      },
-      summary: {
-        name: 'http_request_all_summary_seconds',
-        help: 'request duration in seconds histogram for all requests',
-        collect: function () {
-          process.nextTick(() => this.reset())
+        histogram: {
+          name: 'http_request_all_duration_seconds',
+          help: 'request duration in seconds summary for all requests',
+          collect: function () {
+            process.nextTick(() => this.reset())
+          },
         },
-      },
-    })
+        summary: {
+          name: 'http_request_all_summary_seconds',
+          help: 'request duration in seconds histogram for all requests',
+          collect: function () {
+            process.nextTick(() => this.reset())
+          },
+        },
+      })
+      httpRequestCallbacks.push(startTimer)
+      httpResponseCallbacks.push(endTimer)
+    }
   }
 
   return registry

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.3.1",
+  "version": "3.4.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,17 +34,17 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.3.1",
-    "@platformatic/db": "2.3.1",
-    "@platformatic/service": "2.3.1",
-    "@platformatic/sql-graphql": "2.3.1",
-    "@platformatic/sql-mapper": "2.3.1"
+    "@platformatic/composer": "3.4.1",
+    "@platformatic/db": "3.4.1",
+    "@platformatic/service": "3.4.1",
+    "@platformatic/sql-graphql": "3.4.1",
+    "@platformatic/sql-mapper": "3.4.1"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
     "@fastify/websocket": "^11.0.0",
     "@hapi/topo": "^6.0.2",
-    "@platformatic/http-metrics": "^0.1.0",
+    "@platformatic/http-metrics": "^0.2.0",
     "@watchable/unpromise": "^1.0.2",
     "boring-name-generator": "^1.0.3",
     "change-case-all": "^2.1.0",
@@ -66,15 +66,15 @@
     "semgrator": "^0.3.0",
     "tail-file-stream": "^0.2.0",
     "undici": "^6.9.0",
-    "undici-thread-interceptor": "^0.6.1",
+    "undici-thread-interceptor": "^0.7.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.3.1",
-    "@platformatic/config": "2.3.1",
-    "@platformatic/generators": "2.3.1",
-    "@platformatic/itc": "2.3.1",
-    "@platformatic/telemetry": "2.3.1",
-    "@platformatic/utils": "2.3.1",
-    "@platformatic/ts-compiler": "2.3.1"
+    "@platformatic/generators": "3.4.1",
+    "@platformatic/basic": "3.4.1",
+    "@platformatic/config": "3.4.1",
+    "@platformatic/itc": "3.4.1",
+    "@platformatic/ts-compiler": "3.4.1",
+    "@platformatic/telemetry": "3.4.1",
+    "@platformatic/utils": "3.4.1"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=180000 && tsd",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.3.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/3.4.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {