@platformatic/runtime 2.8.0 → 2.8.1

package/config.d.ts

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

package/lib/config.js

@@ -1,9 +1,10 @@
 'use strict'
 
 const { readdir } = require('node:fs/promises')
-const { join, resolve: pathResolve } = require('node:path')
+const { join, resolve: pathResolve, isAbsolute } = require('node:path')
 
 const ConfigManager = require('@platformatic/config')
+const { Store } = require('@platformatic/config')
 
 const errors = require('./errors')
 const { schema } = require('./schema')
@@ -86,9 +87,40 @@ async function _transformConfig (configManager, args) {
   for (let i = 0; i < services.length; ++i) {
     const service = services[i]
 
+    // We need to have absolut paths here, ot the `loadConfig` will fail
+    if (!isAbsolute(service.path)) {
+      service.path = pathResolve(configManager.dirname, service.path)
+    }
+
     if (configManager._fixPaths && service.config) {
       service.config = pathResolve(service.path, service.config)
     }
+
+    if (service.config) {
+      try {
+        const store = new Store({ cwd: service.path })
+        const serviceConfig = await store.loadConfig(service)
+        service.isPLTService = !!serviceConfig.app.isPLTService
+        service.type = serviceConfig.app.configType
+      } catch (err) {
+        // Fallback if for any reason a dependency is not found
+        try {
+          const manager = new ConfigManager({ source: pathResolve(service.path, service.config) })
+          await manager.parse()
+          const config = manager.current
+          const type = config.$schema ? ConfigManager.matchKnownSchema(config.$schema) : undefined
+          service.type = type
+          service.isPLTService = !!config.isPLTService
+        } catch (err) {
+          // This should not happen, it happens on running some unit tests if we prepare the runtime
+          // when not all the services configs are available. Given that we are running this only
+          // to ddetermine the type of the service, it's safe to ignore this error and default to unknown
+          service.type = 'unknown'
+          service.isPLTService = false
+        }
+      }
+    }
+
     service.entrypoint = service.id === config.entrypoint
     service.dependencies = []
     service.localServiceEnvVars = new Map()
@@ -121,12 +153,7 @@ async function _transformConfig (configManager, args) {
           continue
         }
 
-        const manager = new ConfigManager({ source: pathResolve(service.path, service.config) })
-        await manager.parse()
-        const config = manager.current
-        const type = config.$schema ? ConfigManager.matchKnownSchema(config.$schema) : undefined
-
-        if (type === 'composer') {
+        if (service.type === 'composer') {
           composers.push(service.id)
         }
       }

package/lib/runtime.js

@@ -43,6 +43,9 @@ const COLLECT_METRICS_TIMEOUT = 1000
 
 const MAX_BOOTSTRAP_ATTEMPTS = 5
 
+const telemetryPath = require.resolve('@platformatic/telemetry')
+const openTelemetrySetupPath = join(telemetryPath, '..', 'lib', 'node-http-telemetry.js')
+
 class Runtime extends EventEmitter {
   #configManager
   #isProduction
@@ -753,6 +756,13 @@ class Runtime extends EventEmitter {
       inspectorOptions.port = inspectorOptions.port + this.#workers.size + 1
     }
 
+    if (config.telemetry) {
+      serviceConfig.telemetry = {
+        ...config.telemetry,
+        serviceName: `${config.telemetry.serviceName}-${serviceConfig.id}`
+      }
+    }
+
     const worker = new Worker(kWorkerFile, {
       workerData: {
         config,
@@ -770,7 +780,7 @@ class Runtime extends EventEmitter {
         runtimeLogsDir: this.#runtimeLogsDir,
         loggingPort
       },
-      execArgv: [], // Avoid side effects
+      execArgv: serviceConfig.isPLTService ? [] : ['--require', openTelemetrySetupPath],
       env: this.#env,
       transferList: [loggingPort],
       /*

package/lib/worker/main.js

@@ -114,14 +114,6 @@ async function main () {
     }
   }
 
-  let telemetryConfig = config.telemetry
-  if (telemetryConfig) {
-    telemetryConfig = {
-      ...telemetryConfig,
-      serviceName: `${telemetryConfig.serviceName}-${service.id}`
-    }
-  }
-
   const inspectorOptions = workerData.inspectorOptions
 
   if (inspectorOptions) {
@@ -144,7 +136,7 @@ async function main () {
   app = new PlatformaticApp(
     service,
     workerData.worker.count > 1 ? workerData.worker.index : undefined,
-    telemetryConfig,
+    service.telemetry,
     config.logger,
     serverConfig,
     config.metrics,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -35,12 +35,12 @@
     "typescript": "^5.5.4",
     "undici-oidc-interceptor": "^0.5.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "2.8.0",
-    "@platformatic/db": "2.8.0",
-    "@platformatic/node": "2.8.0",
-    "@platformatic/service": "2.8.0",
-    "@platformatic/sql-graphql": "2.8.0",
-    "@platformatic/sql-mapper": "2.8.0"
+    "@platformatic/composer": "2.8.1",
+    "@platformatic/db": "2.8.1",
+    "@platformatic/node": "2.8.1",
+    "@platformatic/sql-graphql": "2.8.1",
+    "@platformatic/service": "2.8.1",
+    "@platformatic/sql-mapper": "2.8.1"
   },
   "dependencies": {
     "@fastify/error": "^4.0.0",
@@ -71,13 +71,13 @@
     "undici": "^6.9.0",
     "undici-thread-interceptor": "^0.7.0",
     "ws": "^8.16.0",
-    "@platformatic/basic": "2.8.0",
-    "@platformatic/generators": "2.8.0",
-    "@platformatic/config": "2.8.0",
-    "@platformatic/itc": "2.8.0",
-    "@platformatic/telemetry": "2.8.0",
-    "@platformatic/ts-compiler": "2.8.0",
-    "@platformatic/utils": "2.8.0"
+    "@platformatic/basic": "2.8.1",
+    "@platformatic/config": "2.8.1",
+    "@platformatic/generators": "2.8.1",
+    "@platformatic/telemetry": "2.8.1",
+    "@platformatic/itc": "2.8.1",
+    "@platformatic/utils": "2.8.1",
+    "@platformatic/ts-compiler": "2.8.1"
   },
   "scripts": {
     "test": "npm run lint && borp --concurrency=1 --timeout=300000 && tsd",

package/schema.json

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