@platformatic/basic 2.8.0-alpha.2 → 2.8.1

package/lib/base.js

@@ -38,7 +38,10 @@ export class BaseStackable {
     this.startHttpTimer = null
     this.endHttpTimer = null
     this.clientWs = null
-    this.runtimeConfig = deepmerge(options.context.runtimeConfig ?? {}, workerData?.config ?? {})
+    this.runtimeConfig = deepmerge(
+      options.context?.runtimeConfig ?? {},
+      workerData?.config ?? {}
+    )
 
     // Setup the logger
     const pinoOptions = {
@@ -64,7 +67,8 @@ export class BaseStackable {
       root: pathToFileURL(this.root).toString(),
       setOpenapiSchema: this.setOpenapiSchema.bind(this),
       setGraphqlSchema: this.setGraphqlSchema.bind(this),
-      setBasePath: this.setBasePath.bind(this)
+      setBasePath: this.setBasePath.bind(this),
+      runtimeBasePath: this.runtimeConfig?.basePath ?? null
     })
   }
 
@@ -356,7 +360,7 @@ export class BaseStackable {
       /* c8 ignore next 2 */
       port: (this.isEntrypoint ? this.serverConfig?.port || 0 : undefined) ?? true,
       host: (this.isEntrypoint ? this.serverConfig?.hostname : undefined) ?? true,
-      telemetry: this.telemetryConfig
+      telemetryConfig: this.telemetryConfig
     }
   }
 }

package/lib/worker/child-manager.js

@@ -3,14 +3,17 @@ import { createDirectory, ensureLoggableError } from '@platformatic/utils'
 import { once } from 'node:events'
 import { rm, writeFile } from 'node:fs/promises'
 import { createServer } from 'node:http'
+import { pathToFileURL } from 'node:url'
 import { register } from 'node:module'
 import { platform, tmpdir } from 'node:os'
-import { dirname, resolve } from 'node:path'
+import { dirname, resolve, join } from 'node:path'
 import { workerData } from 'node:worker_threads'
 import { request } from 'undici'
 import { WebSocketServer } from 'ws'
 import { exitCodes } from '../errors.js'
 import { ensureFileUrl } from '../utils.js'
+import { createRequire } from 'node:module'
+
 export const isWindows = platform() === 'win32'
 
 // In theory we could use the context.id to namespace even more, but due to
@@ -160,8 +163,19 @@ export class ChildManager extends ITC {
     )
 
     process.env.PLT_MANAGER_ID = this.#id
-    process.env.NODE_OPTIONS =
-      `--import="${new URL('./child-process.js', import.meta.url)}" ${process.env.NODE_OPTIONS ?? ''}`.trim()
+
+    const nodeOptions = process.env.NODE_OPTIONS ?? ''
+    const childProcessInclude = `--import="${new URL('./child-process.js', import.meta.url)}"`
+
+    let telemetryInclude = ''
+    if (this.#context.telemetryConfig) {
+      const require = createRequire(import.meta.url)
+      const telemetryPath = require.resolve('@platformatic/telemetry')
+      const openTelemetrySetupPath = join(telemetryPath, '..', 'lib', 'node-http-telemetry.js')
+      telemetryInclude = `--import="${pathToFileURL(openTelemetrySetupPath)}"`
+    }
+
+    process.env.NODE_OPTIONS = `${telemetryInclude} ${childProcessInclude} ${nodeOptions}`.trim()
   }
 
   async eject () {

package/lib/worker/child-process.js

@@ -1,6 +1,5 @@
 import { ITC } from '@platformatic/itc'
 import { collectMetrics } from '@platformatic/metrics'
-import { setupNodeHTTPTelemetry } from '@platformatic/telemetry'
 import { createPinoWritable, ensureLoggableError } from '@platformatic/utils'
 import diagnosticChannel, { tracingChannel } from 'node:diagnostics_channel'
 import { EventEmitter, once } from 'node:events'
@@ -109,7 +108,6 @@ export class ChildProcess extends ITC {
 
     this.listen()
     this.#setupLogger()
-    this.#setupTelemetry()
     this.#setupHandlers()
     this.#setupServer()
     this.#setupInterceptors()
@@ -215,13 +213,6 @@ export class ChildProcess extends ITC {
     }
   }
 
-  /* c8 ignore next 5 */
-  #setupTelemetry () {
-    if (globalThis.platformatic.telemetry) {
-      setupNodeHTTPTelemetry(globalThis.platformatic.telemetry, this.#logger)
-    }
-  }
-
   #setupServer () {
     const subscribers = {
       asyncStart ({ options }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.8.0-alpha.2",
+  "version": "2.8.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -23,11 +23,11 @@
     "split2": "^4.2.0",
     "undici": "^6.19.5",
     "ws": "^8.18.0",
-    "@platformatic/config": "2.8.0-alpha.2",
-    "@platformatic/itc": "2.8.0-alpha.2",
-    "@platformatic/telemetry": "2.8.0-alpha.2",
-    "@platformatic/metrics": "2.8.0-alpha.2",
-    "@platformatic/utils": "2.8.0-alpha.2"
+    "@platformatic/config": "2.8.1",
+    "@platformatic/itc": "2.8.1",
+    "@platformatic/metrics": "2.8.1",
+    "@platformatic/utils": "2.8.1",
+    "@platformatic/telemetry": "2.8.1"
   },
   "devDependencies": {
     "borp": "^0.18.0",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.8.0-alpha.2.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.8.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Stackable",
   "type": "object",