@platformatic/runtime 2.0.0-alpha.6 → 2.0.0-alpha.8

package/config.d.ts

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

package/fixtures/management-api/platformatic.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/1.52.0.json",
+  "$schema": "https://schemas.platformatic.dev/@platformatic/runtime/2.0.0-alpha.5.json",
   "entrypoint": "service-1",
   "watch": false,
   "autoload": {
@@ -13,5 +13,10 @@
     "logs": {
       "maxSize": 6
     }
+  },
+  "metrics": {
+    "labels": {
+      "custom_label": "custom-value"
+    }
   }
 }

package/index.js

@@ -6,11 +6,12 @@ const errors = require('./lib/errors')
 const { platformaticRuntime, wrapConfigInRuntimeConfig } = require('./lib/config')
 const RuntimeGenerator = require('./lib/generator/runtime-generator')
 const { Runtime } = require('./lib/runtime')
-const { start, startCommand } = require('./lib/start')
+const { buildRuntime, start, startCommand } = require('./lib/start')
 const symbols = require('./lib/worker/symbols')
 const { loadConfig, getRuntimeLogsDir } = require('./lib/utils')
 
 module.exports.buildServer = buildServer
+module.exports.buildRuntime = buildRuntime
 module.exports.compile = compile
 module.exports.errors = errors
 module.exports.Generator = RuntimeGenerator

package/lib/build-server.js

@@ -9,7 +9,7 @@ const { platformaticRuntime } = require('./config')
 const { buildRuntime } = require('./start')
 const { loadConfig } = require('./utils')
 
-async function buildServerRuntime (options = {}) {
+async function buildServerRuntime (options = {}, args = undefined) {
   const { serviceMap } = options
 
   if (!options.configManager) {
@@ -18,7 +18,7 @@ async function buildServerRuntime (options = {}) {
     // Instantiate a new config manager from the current options.
     const cm = new ConfigManager({
       ...platformaticRuntime.configManagerConfig,
-      source: options,
+      source: options
     })
     await cm.parseAndValidate()
 
@@ -31,10 +31,14 @@ async function buildServerRuntime (options = {}) {
     }
   }
 
+  if (args) {
+    options.configManager.args = args
+  }
+
   return buildRuntime(options.configManager, options.env)
 }
 
-async function buildServer (options) {
+async function buildServer (options, args) {
   if (typeof options === 'string') {
     const config = await loadConfig({}, ['-c', options])
     options = config.configManager.current
@@ -47,7 +51,7 @@ async function buildServer (options) {
   delete options.app
 
   if (app === platformaticRuntime || !app) {
-    return buildServerRuntime(options)
+    return buildServerRuntime(options, args)
   }
 
   if (app.buildServer) {

package/lib/errors.js

@@ -14,6 +14,7 @@ module.exports = {
   FailedToRetrieveOpenAPISchemaError: createError(`${ERROR_PREFIX}_FAILED_TO_RETRIEVE_OPENAPI_SCHEMA`, 'Failed to retrieve OpenAPI schema for service with id "%s": %s'),
   FailedToRetrieveGraphQLSchemaError: createError(`${ERROR_PREFIX}_FAILED_TO_RETRIEVE_GRAPHQL_SCHEMA`, 'Failed to retrieve GraphQL schema for service with id "%s": %s'),
   FailedToRetrieveMetaError: createError(`${ERROR_PREFIX}_FAILED_TO_RETRIEVE_META`, 'Failed to retrieve metadata for service with id "%s": %s'),
+  FailedToRetrieveMetricsError: createError(`${ERROR_PREFIX}_FAILED_TO_RETRIEVE_METRICS`, 'Failed to retrieve metrics for service with id "%s": %s'),
   ApplicationAlreadyStartedError: createError(`${ERROR_PREFIX}_APPLICATION_ALREADY_STARTED`, 'Application is already started'),
   ApplicationNotStartedError: createError(`${ERROR_PREFIX}_APPLICATION_NOT_STARTED`, 'Application has not been started'),
   ConfigPathMustBeStringError: createError(`${ERROR_PREFIX}_CONFIG_PATH_MUST_BE_STRING`, 'Config path must be a string'),

package/lib/runtime.js

@@ -9,7 +9,10 @@ const { setTimeout: sleep } = require('node:timers/promises')
 const { Worker } = require('node:worker_threads')
 
 const { ITC } = require('@platformatic/itc')
-const { Unpromise } = require('@watchable/unpromise')
+const {
+  errors: { ensureLoggableError },
+  executeWithTimeout
+} = require('@platformatic/utils')
 const ts = require('tail-file-stream')
 const { createThreadInterceptor } = require('undici-thread-interceptor')
 
@@ -64,7 +67,7 @@ class Runtime extends EventEmitter {
     this.#servicesIds = []
     this.#url = undefined
     // Note: nothing hits the main thread so there is no reason to set the globalDispatcher here
-    this.#interceptor = createThreadInterceptor({ domain: '.plt.local' })
+    this.#interceptor = createThreadInterceptor({ domain: '.plt.local', timeout: true })
     this.#status = undefined
     this.#startedServices = new Map()
     this.#restartPromises = new Map()
@@ -148,10 +151,11 @@ class Runtime extends EventEmitter {
       this.startCollectingMetrics()
     }
 
+    this.logger.info(`Platformatic is now listening at ${this.#url}`)
     return this.#url
   }
 
-  async stop () {
+  async stop (silent = false) {
     if (this.#status === 'starting') {
       await once(this, 'started')
     }
@@ -159,7 +163,7 @@ class Runtime extends EventEmitter {
     this.#updateStatus('stopping')
     this.#startedServices.clear()
 
-    await Promise.all(this.#servicesIds.map(service => this._stopService(service)))
+    await Promise.all(this.#servicesIds.map(service => this._stopService(service, silent)))
 
     this.#updateStatus('stopped')
   }
@@ -172,15 +176,16 @@ class Runtime extends EventEmitter {
 
     this.emit('restarted')
 
+    this.logger.info(`Platformatic is now listening at ${this.#url}`)
     return this.#url
   }
 
-  async close (fromManagementApi) {
+  async close (fromManagementApi = false, silent = false) {
     this.#updateStatus('closing')
 
     clearInterval(this.#metricsTimeout)
 
-    await this.stop()
+    await this.stop(silent)
 
     if (this.#managementApi) {
       if (fromManagementApi) {
@@ -236,7 +241,7 @@ class Runtime extends EventEmitter {
       // TODO: handle port allocation error here
       if (error.code === 'EADDRINUSE') throw error
 
-      this.logger.error({ error }, `Failed to start service "${id}".`)
+      this.logger.error({ error: ensureLoggableError(error) }, `Failed to start service "${id}".`)
 
       const config = this.#configManager.current
       const restartOnError = config.restartOnError
@@ -263,7 +268,7 @@ class Runtime extends EventEmitter {
   }
 
   // Do not rename to #stopService as this is used in tests
-  async _stopService (id) {
+  async _stopService (id, silent) {
     const service = await this.#getServiceById(id, false, false)
 
     if (!service) {
@@ -272,17 +277,24 @@ class Runtime extends EventEmitter {
 
     this.#startedServices.set(id, false)
 
-    this.logger?.info(`Stopping service "${id}"...`)
+    if (!silent) {
+      this.logger?.info(`Stopping service "${id}"...`)
+    }
 
     // Always send the stop message, it will shut down workers that only had ITC and interceptors setup
     try {
-      await Unpromise.race([sendViaITC(service, 'stop'), sleep(10000, 'timeout', { ref: false })])
+      await executeWithTimeout(sendViaITC(service, 'stop'), 10000)
     } catch (error) {
-      this.logger?.info(`Failed to stop service "${id}". Killing a worker thread.`, error)
+      this.logger?.info(
+        { error: ensureLoggableError(error) },
+        `Failed to stop service "${id}". Killing a worker thread.`
+      )
+    } finally {
+      service[kITC].close()
     }
 
     // Wait for the worker thread to finish, we're going to create a new one if the service is ever restarted
-    const res = await Unpromise.race([once(service, 'exit'), sleep(10000, 'timeout', { ref: false })])
+    const res = await executeWithTimeout(once(service, 'exit'), 10000)
 
     // If the worker didn't exit in time, kill it
     if (res === 'timeout') {
@@ -290,6 +302,25 @@ class Runtime extends EventEmitter {
     }
   }
 
+  async buildService (id) {
+    const service = this.#services.get(id)
+
+    if (!service) {
+      throw new errors.ServiceNotFoundError(id, Array.from(this.#services.keys()).join(', '))
+    }
+
+    try {
+      return await sendViaITC(service, 'build')
+    } catch (e) {
+      // The service exports no meta, return an empty object
+      if (e.code === 'PLT_ITC_HANDLER_NOT_FOUND') {
+        return {}
+      }
+
+      throw e
+    }
+  }
+
   async inject (id, injectParams) {
     const service = await this.#getServiceById(id, true)
     return sendViaITC(service, 'inject', injectParams)
@@ -524,7 +555,6 @@ class Runtime extends EventEmitter {
         }
 
         const serviceMetrics = await sendViaITC(service, 'getMetrics', format)
-
         if (serviceMetrics) {
           if (metrics === null) {
             metrics = format === 'json' ? [] : ''
@@ -576,17 +606,24 @@ class Runtime extends EventEmitter {
       let p99Value = 0
 
       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 httpLatencyMetrics = metrics.filter(metric => metric.name === metricName)
+
+      if (httpLatencyMetrics) {
+        const entrypointMetrics = httpLatencyMetrics.find(
+          metric => metric.values?.[0]?.labels?.serviceId === this.#entrypointId
+        )
+        if (entrypointMetrics) {
+          p50Value = entrypointMetrics.values.find(value => value.labels.quantile === 0.5)?.value || 0
+          p90Value = entrypointMetrics.values.find(value => value.labels.quantile === 0.9)?.value || 0
+          p95Value = entrypointMetrics.values.find(value => value.labels.quantile === 0.95)?.value || 0
+          p99Value = entrypointMetrics.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
@@ -625,6 +662,25 @@ class Runtime extends EventEmitter {
     }
   }
 
+  async getServiceMeta (id) {
+    const service = this.#services.get(id)
+
+    if (!service) {
+      throw new errors.ServiceNotFoundError(id, Array.from(this.#services.keys()).join(', '))
+    }
+
+    try {
+      return await sendViaITC(service, 'getServiceMeta')
+    } catch (e) {
+      // The service exports no meta, return an empty object
+      if (e.code === 'PLT_ITC_HANDLER_NOT_FOUND') {
+        return {}
+      }
+
+      throw e
+    }
+  }
+
   async getLogIds (runtimePID) {
     runtimePID = runtimePID ?? process.pid
 
@@ -685,7 +741,10 @@ class Runtime extends EventEmitter {
     const service = new Worker(kWorkerFile, {
       workerData: {
         config,
-        serviceConfig,
+        serviceConfig: {
+          ...serviceConfig,
+          isProduction: this.#configManager.args?.production ?? false
+        },
         dirname: this.#configManager.dirname,
         runtimeLogsDir: this.#runtimeLogsDir,
         loggingPort
@@ -712,6 +771,7 @@ class Runtime extends EventEmitter {
       const started = this.#startedServices.get(id)
       this.#services.delete(id)
       loggerDestination.close()
+      service[kITC].close()
       loggingPort.close()
 
       if (this.#status === 'stopping') return
@@ -725,7 +785,7 @@ class Runtime extends EventEmitter {
           if (restartOnError > 0) {
             this.logger.warn(`Restarting a service "${id}" in ${restartOnError}ms...`)
             this.#restartCrashedService(id).catch(err => {
-              this.logger.error({ err }, `Failed to restart service "${id}".`)
+              this.logger.error({ err: ensureLoggableError(err) }, `Failed to restart service "${id}".`)
             })
           } else {
             this.logger.warn(`The "${id}" service is no longer available.`)
@@ -739,6 +799,7 @@ class Runtime extends EventEmitter {
 
     // Setup ITC
     service[kITC] = new ITC({
+      name: id + '-runtime',
       port: service,
       handlers: {
         getServiceMeta: this.getServiceMeta.bind(this)
@@ -846,25 +907,6 @@ class Runtime extends EventEmitter {
     return service
   }
 
-  async getServiceMeta (id) {
-    const service = this.#services.get(id)
-
-    if (!service) {
-      throw new errors.ServiceNotFoundError(id, Array.from(this.#services.keys()).join(', '))
-    }
-
-    try {
-      return await service[kITC].send('getServiceMeta')
-    } catch (e) {
-      // The service exports no meta, return an empty object
-      if (e.code === 'PLT_ITC_HANDLER_NOT_FOUND') {
-        return {}
-      }
-
-      throw e
-    }
-  }
-
   async #getRuntimePackageJson () {
     const runtimeDir = this.#configManager.dirname
     const packageJsonPath = join(runtimeDir, 'package.json')
@@ -893,7 +935,7 @@ class Runtime extends EventEmitter {
     try {
       await access(this.#runtimeTmpDir)
     } catch (err) {
-      this.logger.error({ err }, 'Cannot access temporary folder.')
+      this.logger.error({ err: ensureLoggableError(err) }, 'Cannot access temporary folder.')
       return []
     }
 

package/lib/schema.js

@@ -2,7 +2,9 @@
 'use strict'
 
 const telemetry = require('@platformatic/telemetry').schema
-const { schemas: { server } } = require('@platformatic/utils')
+const {
+  schemaComponents: { server }
+} = require('@platformatic/utils')
 
 const pkg = require('../package.json')
 const platformaticRuntimeSchema = {
@@ -11,11 +13,11 @@ const platformaticRuntimeSchema = {
   type: 'object',
   properties: {
     $schema: {
-      type: 'string',
+      type: 'string'
     },
     preload: {
       type: 'string',
-      resolvePath: true,
+      resolvePath: true
     },
     autoload: {
       type: 'object',
@@ -24,14 +26,14 @@ const platformaticRuntimeSchema = {
       properties: {
         path: {
           type: 'string',
-          resolvePath: true,
+          resolvePath: true
         },
         exclude: {
           type: 'array',
           default: [],
           items: {
-            type: 'string',
-          },
+            type: 'string'
+          }
         },
         mappings: {
           type: 'object',
@@ -41,89 +43,92 @@ const platformaticRuntimeSchema = {
             required: ['id'],
             properties: {
               id: {
-                type: 'string',
+                type: 'string'
               },
               config: {
-                type: 'string',
+                type: 'string'
               },
               useHttp: {
-                type: 'boolean',
-              },
-            },
-          },
-        },
-      },
+                type: 'boolean'
+              }
+            }
+          }
+        }
+      }
     },
     telemetry,
     server,
     entrypoint: {
-      type: 'string',
+      type: 'string'
     },
     watch: {
       anyOf: [
         {
-          type: 'boolean',
+          type: 'boolean'
         },
         {
-          type: 'string',
-        },
-      ],
+          type: 'string'
+        }
+      ]
     },
     inspectorOptions: {
       type: 'object',
       properties: {
         host: {
-          type: 'string',
+          type: 'string'
         },
         port: {
-          type: 'number',
+          type: 'number'
         },
         breakFirstLine: {
-          type: 'boolean',
+          type: 'boolean'
         },
         watchDisabled: {
-          type: 'boolean',
-        },
-      },
+          type: 'boolean'
+        }
+      }
     },
     undici: {
       type: 'object',
       properties: {
         agentOptions: {
           type: 'object',
-          additionalProperties: true,
+          additionalProperties: true
         },
         interceptors: {
-          anyOf: [{
-            type: 'array',
-            items: {
-              $ref: '#/$defs/undiciInterceptor',
+          anyOf: [
+            {
+              type: 'array',
+              items: {
+                $ref: '#/$defs/undiciInterceptor'
+              }
             },
-          }, {
-            type: 'object',
-            properties: {
-              Client: {
-                type: 'array',
-                items: {
-                  $ref: '#/$defs/undiciInterceptor',
-                },
-              },
-              Pool: {
-                type: 'array',
-                items: {
-                  $ref: '#/$defs/undiciInterceptor',
+            {
+              type: 'object',
+              properties: {
+                Client: {
+                  type: 'array',
+                  items: {
+                    $ref: '#/$defs/undiciInterceptor'
+                  }
                 },
-              },
-              Agent: {
-                type: 'array',
-                items: {
-                  $ref: '#/$defs/undiciInterceptor',
+                Pool: {
+                  type: 'array',
+                  items: {
+                    $ref: '#/$defs/undiciInterceptor'
+                  }
                 },
-              },
-            },
-          }],
-        },
-      },
+                Agent: {
+                  type: 'array',
+                  items: {
+                    $ref: '#/$defs/undiciInterceptor'
+                  }
+                }
+              }
+            }
+          ]
+        }
+      }
     },
     managementApi: {
       anyOf: [
@@ -136,14 +141,14 @@ const platformaticRuntimeSchema = {
               maxSize: {
                 type: 'number',
                 minimum: 5,
-                default: 200,
-              },
-            },
+                default: 200
+              }
+            }
           },
-          additionalProperties: false,
-        },
+          additionalProperties: false
+        }
       ],
-      default: true,
+      default: true
     },
     metrics: {
       anyOf: [
@@ -152,10 +157,7 @@ const platformaticRuntimeSchema = {
           type: 'object',
           properties: {
             port: {
-              anyOf: [
-                { type: 'integer' },
-                { type: 'string' },
-              ],
+              anyOf: [{ type: 'integer' }, { type: 'string' }]
             },
             hostname: { type: 'string' },
             endpoint: { type: 'string' },
@@ -163,19 +165,19 @@ const platformaticRuntimeSchema = {
               type: 'object',
               properties: {
                 username: { type: 'string' },
-                password: { type: 'string' },
+                password: { type: 'string' }
               },
               additionalProperties: false,
-              required: ['username', 'password'],
+              required: ['username', 'password']
             },
             labels: {
               type: 'object',
-              additionalProperties: { type: 'string' },
-            },
+              additionalProperties: { type: 'string' }
+            }
           },
-          additionalProperties: false,
-        },
-      ],
+          additionalProperties: false
+        }
+      ]
     },
     restartOnError: {
       default: true,
@@ -183,59 +185,53 @@ const platformaticRuntimeSchema = {
         { type: 'boolean' },
         {
           type: 'number',
-          minimum: 100,
-        },
-      ],
+          minimum: 100
+        }
+      ]
     },
     services: {
       type: 'array',
       items: {
         type: 'object',
-        anyOf: [
-          { required: ['id', 'path'] },
-          { required: ['id', 'url'] },
-        ],
+        anyOf: [{ required: ['id', 'path'] }, { required: ['id', 'url'] }],
         properties: {
           id: {
-            type: 'string',
+            type: 'string'
           },
           path: {
             type: 'string',
-            resolvePath: true,
+            resolvePath: true
           },
           config: {
-            type: 'string',
+            type: 'string'
           },
           url: {
-            type: 'string',
+            type: 'string'
           },
           useHttp: {
-            type: 'boolean',
-          },
-        },
-      },
-    },
+            type: 'boolean'
+          }
+        }
+      }
+    }
   },
-  anyOf: [
-    { required: ['autoload', 'entrypoint'] },
-    { required: ['services', 'entrypoint'] },
-  ],
+  anyOf: [{ required: ['autoload', 'entrypoint'] }, { required: ['services', 'entrypoint'] }],
   additionalProperties: false,
   $defs: {
     undiciInterceptor: {
       type: 'object',
       properties: {
         module: {
-          type: 'string',
+          type: 'string'
         },
         options: {
           type: 'object',
-          additionalProperties: true,
-        },
+          additionalProperties: true
+        }
       },
-      required: ['module', 'options'],
-    },
-  },
+      required: ['module', 'options']
+    }
+  }
 }
 
 module.exports.schema = platformaticRuntimeSchema

package/lib/start.js

@@ -5,6 +5,9 @@ const { writeFile } = require('node:fs/promises')
 const { join, resolve, dirname } = require('node:path')
 
 const { printConfigValidationErrors } = require('@platformatic/config')
+const {
+  errors: { ensureLoggableError }
+} = require('@platformatic/utils')
 const closeWithGrace = require('close-with-grace')
 const pino = require('pino')
 const pretty = require('pino-pretty')
@@ -38,7 +41,7 @@ async function buildRuntime (configManager, env) {
     try {
       await runtime.restart()
     } catch (err) {
-      runtime.logger.error({ err }, 'Failed to restart services.')
+      runtime.logger.error({ err: ensureLoggableError(err) }, 'Failed to restart services.')
     }
   })
 
@@ -96,7 +99,7 @@ async function setupAndStartRuntime (config) {
     const logger = pino(
       pretty({
         translateTime: 'SYS:HH:MM:ss',
-        ignore: 'hostname,pid',
+        ignore: 'hostname,pid'
       })
     )
     logger.warn(`Port: ${originalPort} is already in use!`)
@@ -107,7 +110,15 @@ async function setupAndStartRuntime (config) {
 
 async function startCommand (args) {
   try {
-    const config = await loadConfig({}, args)
+    const config = await loadConfig(
+      {
+        alias: {
+          p: 'production'
+        },
+        boolean: ['p', 'production']
+      },
+      args
+    )
 
     const startResult = await setupAndStartRuntime(config)
 
@@ -130,16 +141,16 @@ async function startCommand (args) {
           hostname: '127.0.0.1',
           port: 3042,
           logger: {
-            level: 'info',
-          },
+            level: 'info'
+          }
         },
         plugins: {
-          paths: [args[0]],
+          paths: [args[0]]
         },
         service: {
-          openapi: true,
+          openapi: true
         },
-        watch: true,
+        watch: true
       }
       const toWrite = join(dirname(resolve(args[0])), 'platformatic.service.json')
       console.log(`No config file found, creating ${join(dirname(args[0]), 'platformatic.service.json')}`)

package/lib/worker/app.js

@@ -7,6 +7,7 @@ const debounce = require('debounce')
 
 const errors = require('../errors')
 const defaultStackable = require('./default-stackable')
+const { collectMetrics } = require('./metrics')
 const { getServiceUrl, loadConfig, loadEmptyConfig } = require('../utils')
 
 class PlatformaticApp extends EventEmitter {
@@ -15,6 +16,7 @@ class PlatformaticApp extends EventEmitter {
   #listening
   #watch
   #fileWatcher
+  #metricsRegistry
   #debouncedRestart
   #context
 
@@ -27,17 +29,18 @@ class PlatformaticApp extends EventEmitter {
     this.#listening = false
     this.stackable = null
     this.#fileWatcher = null
+    this.#metricsRegistry = null
 
     this.#context = {
       serviceId: this.appConfig.id,
       directory: this.appConfig.path,
       isEntrypoint: this.appConfig.entrypoint,
-      isProduction: false,
+      isProduction: this.appConfig.isProduction,
       telemetryConfig,
       metricsConfig,
       serverConfig,
       hasManagementApi: !!hasManagementApi,
-      localServiceEnvVars: this.appConfig.localServiceEnvVars,
+      localServiceEnvVars: this.appConfig.localServiceEnvVars
     }
   }
 
@@ -68,7 +71,7 @@ class PlatformaticApp extends EventEmitter {
           appConfig.path,
           {
             onMissingEnv: this.#fetchServiceUrl,
-            context: appConfig,
+            context: appConfig
           },
           true
         )
@@ -78,7 +81,7 @@ class PlatformaticApp extends EventEmitter {
           ['-c', appConfig.config],
           {
             onMissingEnv: this.#fetchServiceUrl,
-            context: appConfig,
+            context: appConfig
           },
           true
         )
@@ -86,13 +89,26 @@ class PlatformaticApp extends EventEmitter {
 
       const app = loadedConfig.app
 
+      if (appConfig.isProduction && !process.env.NODE_ENV) {
+        process.env.NODE_ENV = 'production'
+      }
+
       const stackable = await app.buildStackable({
         onMissingEnv: this.#fetchServiceUrl,
         config: this.appConfig.config,
-        context: this.#context,
+        context: this.#context
       })
       this.stackable = this.#wrapStackable(stackable)
 
+      const metricsConfig = this.#context.metricsConfig
+      if (metricsConfig !== false) {
+        this.#metricsRegistry = await collectMetrics(
+          this.stackable,
+          this.appConfig.id,
+          metricsConfig
+        )
+      }
+
       this.#updateDispatcher()
     } catch (err) {
       this.#logAndExit(err)
@@ -164,6 +180,14 @@ class PlatformaticApp extends EventEmitter {
     await this.stackable.start({ listen: true })
   }
 
+  async getMetrics ({ format }) {
+    if (!this.#metricsRegistry) return null
+
+    return format === 'json'
+      ? this.#metricsRegistry.getMetricsAsJSON()
+      : this.#metricsRegistry.metrics()
+  }
+
   #fetchServiceUrl (key, { parent, context: service }) {
     if (service.localServiceEnvVars.has(key)) {
       return service.localServiceEnvVars.get(key)
@@ -183,7 +207,7 @@ class PlatformaticApp extends EventEmitter {
       path: watch.path,
       /* c8 ignore next 2 */
       allowToWatch: watch?.allow,
-      watchIgnore: watch?.ignore || [],
+      watchIgnore: watch?.ignore || []
     })
 
     fileWatcher.on('update', this.#debouncedRestart)
@@ -226,7 +250,7 @@ class PlatformaticApp extends EventEmitter {
         if (telemetryId) {
           opts.headers = {
             ...opts.headers,
-            'x-plt-telemetry-id': telemetryId,
+            'x-plt-telemetry-id': telemetryId
           }
         }
         return dispatch(opts, handler)

package/lib/worker/default-stackable.js

@@ -6,6 +6,7 @@ const defaultStackable = {
     throw new Error('Stackable start not implemented')
   },
   stop: () => {},
+  build: () => {},
   getUrl: () => null,
   updateContext: () => {},
   getConfig: () => null,
@@ -14,7 +15,10 @@ const defaultStackable = {
   getOpenapiSchema: () => null,
   getGraphqlSchema: () => null,
   getMeta: () => ({}),
-  getMetrics: () => null,
+  collectMetrics: () => ({
+    defaultMetrics: true,
+    httpMetrics: true,
+  }),
   inject: () => {
     throw new Error('Stackable inject not implemented')
   },

package/lib/worker/itc.js

@@ -44,6 +44,7 @@ async function sendViaITC (worker, name, message) {
 
 function setupITC (app, service, dispatcher) {
   const itc = new ITC({
+    name: app.appConfig.id + '-worker',
     port: parentPort,
     handlers: {
       async start () {
@@ -82,6 +83,10 @@ function setupITC (app, service, dispatcher) {
         itc.close()
       },
 
+      async build () {
+        return app.stackable.build()
+      },
+
       getStatus () {
         return app.getStatus()
       },
@@ -120,8 +125,12 @@ function setupITC (app, service, dispatcher) {
         }
       },
 
-      getMetrics (format) {
-        return app.stackable.getMetrics({ format })
+      async getMetrics (format) {
+        try {
+          return await app.getMetrics({ format })
+        } catch (err) {
+          throw new errors.FailedToRetrieveMetricsError(service.id, err.message)
+        }
       },
 
       inject (injectParams) {

package/lib/worker/main.js

@@ -2,11 +2,9 @@
 
 const { createRequire } = require('node:module')
 const { join } = require('node:path')
-const { setTimeout: sleep } = require('node:timers/promises')
 const { parentPort, workerData, threadId } = require('node:worker_threads')
 const { pathToFileURL } = require('node:url')
 
-const { Unpromise } = require('@watchable/unpromise')
 const pino = require('pino')
 const { fetch, setGlobalDispatcher, Agent } = require('undici')
 const { wire } = require('undici-thread-interceptor')
@@ -14,7 +12,7 @@ const { wire } = require('undici-thread-interceptor')
 const { PlatformaticApp } = require('./app')
 const { setupITC } = require('./itc')
 const loadInterceptors = require('./interceptors')
-const { MessagePortWritable, createPinoWritable } = require('@platformatic/utils')
+const { MessagePortWritable, createPinoWritable, executeWithTimeout, errors } = require('@platformatic/utils')
 const { kId, kITC } = require('./symbols')
 
 process.on('uncaughtException', handleUnhandled.bind(null, 'uncaught exception'))
@@ -25,12 +23,15 @@ globalThis[kId] = threadId
 
 let app
 const config = workerData.config
-const logger = createLogger()
+globalThis.platformatic = Object.assign(globalThis.platformatic ?? {}, { logger: createLogger() })
 
 function handleUnhandled (type, err) {
-  logger.error({ err }, `application ${type}`)
+  globalThis.platformatic.logger.error(
+    { err: errors.ensureLoggableError(err) },
+    `Service ${workerData.serviceConfig.id} threw an ${type}.`
+  )
 
-  Unpromise.race([app?.stop(), sleep(1000, 'timeout', { ref: false })])
+  executeWithTimeout(app?.stop(), 1000)
     .catch()
     .finally(() => {
       process.exit(1)
@@ -73,13 +74,13 @@ async function main () {
 
   const globalDispatcher = new Agent({
     ...config.undici,
-    interceptors,
+    interceptors
   }).compose(composedInterceptors)
 
   setGlobalDispatcher(globalDispatcher)
 
   // Setup mesh networker
-  const threadDispatcher = wire({ port: parentPort, useNetwork: service.useHttp })
+  const threadDispatcher = wire({ port: parentPort, useNetwork: service.useHttp, timeout: true })
 
   // If the service is an entrypoint and runtime server config is defined, use it.
   let serverConfig = null
@@ -89,7 +90,7 @@ async function main () {
     serverConfig = {
       port: 0,
       hostname: '127.0.0.1',
-      keepAliveTimeout: 5000,
+      keepAliveTimeout: 5000
     }
   }
 
@@ -97,7 +98,7 @@ async function main () {
   if (telemetryConfig) {
     telemetryConfig = {
       ...telemetryConfig,
-      serviceName: `${telemetryConfig.serviceName}-${service.id}`,
+      serviceName: `${telemetryConfig.serviceName}-${service.id}`
     }
   }
 

package/lib/worker/metrics.js

@@ -0,0 +1,106 @@
+'use strict'
+
+const os = require('node:os')
+const { eventLoopUtilization } = require('node:perf_hooks').performance
+const { Registry, Gauge, collectDefaultMetrics } = require('prom-client')
+const collectHttpMetrics = require('@platformatic/http-metrics')
+
+async function collectMetrics (stackable, serviceId, opts = {}) {
+  const registry = new Registry()
+  const metricsConfig = await stackable.collectMetrics({ registry })
+
+  const labels = opts.labels ?? {}
+  registry.setDefaultLabels({ ...labels, serviceId })
+
+  if (metricsConfig.defaultMetrics) {
+    collectDefaultMetrics({ register: registry })
+    collectEluMetric(registry)
+  }
+
+  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())
+        },
+      },
+      summary: {
+        name: 'http_request_all_summary_seconds',
+        help: 'request duration in seconds histogram for all requests',
+        collect: function () {
+          process.nextTick(() => this.reset())
+        },
+      },
+    })
+  }
+
+  return registry
+}
+
+function collectEluMetric (register) {
+  let startELU = eventLoopUtilization()
+  const eluMetric = new Gauge({
+    name: 'nodejs_eventloop_utilization',
+    help: 'The event loop utilization as a fraction of the loop time. 1 is fully utilized, 0 is fully idle.',
+    collect: () => {
+      const endELU = eventLoopUtilization()
+      const result = eventLoopUtilization(endELU, startELU).utilization
+      eluMetric.set(result)
+      startELU = endELU
+    },
+    registers: [register],
+  })
+  register.registerMetric(eluMetric)
+
+  let previousIdleTime = 0
+  let previousTotalTime = 0
+  const cpuMetric = new Gauge({
+    name: 'process_cpu_percent_usage',
+    help: 'The process CPU percent usage.',
+    collect: () => {
+      const cpus = os.cpus()
+      let idleTime = 0
+      let totalTime = 0
+
+      cpus.forEach(cpu => {
+        for (const type in cpu.times) {
+          totalTime += cpu.times[type]
+          if (type === 'idle') {
+            idleTime += cpu.times[type]
+          }
+        }
+      })
+
+      const idleDiff = idleTime - previousIdleTime
+      const totalDiff = totalTime - previousTotalTime
+
+      const usagePercent = 100 - ((100 * idleDiff) / totalDiff)
+      const roundedUsage = Math.round(usagePercent * 100) / 100
+      cpuMetric.set(roundedUsage)
+
+      previousIdleTime = idleTime
+      previousTotalTime = totalTime
+    },
+    registers: [register],
+  })
+  register.registerMetric(cpuMetric)
+}
+
+module.exports = { collectMetrics }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.8",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -34,16 +34,17 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.0.0-alpha.6",
-    "@platformatic/service": "2.0.0-alpha.6",
-    "@platformatic/sql-graphql": "2.0.0-alpha.6",
-    "@platformatic/sql-mapper": "2.0.0-alpha.6",
-    "@platformatic/db": "2.0.0-alpha.6"
+    "@platformatic/composer": "2.0.0-alpha.8",
+    "@platformatic/service": "2.0.0-alpha.8",
+    "@platformatic/sql-graphql": "2.0.0-alpha.8",
+    "@platformatic/sql-mapper": "2.0.0-alpha.8",
+    "@platformatic/db": "2.0.0-alpha.8"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
     "@fastify/websocket": "^10.0.0",
     "@hapi/topo": "^6.0.2",
+    "@platformatic/http-metrics": "^0.1.0",
     "@watchable/unpromise": "^1.0.2",
     "boring-name-generator": "^1.0.3",
     "change-case-all": "^2.1.0",
@@ -62,18 +63,19 @@
     "pino": "^8.19.0",
     "pino-pretty": "^11.0.0",
     "pino-roll": "^1.0.0",
+    "prom-client": "^15.1.2",
     "semgrator": "^0.3.0",
     "tail-file-stream": "^0.2.0",
     "undici": "^6.9.0",
-    "undici-thread-interceptor": "^0.5.1",
+    "undici-thread-interceptor": "^0.6.1",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.0.0-alpha.6",
-    "@platformatic/generators": "2.0.0-alpha.6",
-    "@platformatic/config": "2.0.0-alpha.6",
-    "@platformatic/utils": "2.0.0-alpha.6",
-    "@platformatic/itc": "2.0.0-alpha.6",
-    "@platformatic/ts-compiler": "2.0.0-alpha.6",
-    "@platformatic/telemetry": "2.0.0-alpha.6"
+    "@platformatic/basic": "2.0.0-alpha.8",
+    "@platformatic/config": "2.0.0-alpha.8",
+    "@platformatic/generators": "2.0.0-alpha.8",
+    "@platformatic/itc": "2.0.0-alpha.8",
+    "@platformatic/telemetry": "2.0.0-alpha.8",
+    "@platformatic/ts-compiler": "2.0.0-alpha.8",
+    "@platformatic/utils": "2.0.0-alpha.8"
   },
   "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.0.0-alpha.6.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/runtime/2.0.0-alpha.8.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {