@platformatic/telemetry 3.54.0 → 3.56.0

package/lib/diag-logger.js

@@ -1,4 +1,5 @@
 import { diag, DiagLogLevel } from '@opentelemetry/api'
+import { getLogger } from '@platformatic/globals'
 import util from 'node:util'
 
 const pinoToDiagLogLevels = {
@@ -35,7 +36,8 @@ function callLogger (logger, method, fallback, args) {
   fallback(...args)
 }
 
-export function createPlatformaticDiagLogger (logger = globalThis.platformatic?.logger) {
+export function createPlatformaticDiagLogger (logger) {
+  logger ??= getLogger({ throwOnMissing: false })
   let target = logger
 
   if (typeof target?.child === 'function') {
@@ -55,7 +57,8 @@ export function createPlatformaticDiagLogger (logger = globalThis.platformatic?.
   }
 }
 
-export function setupDiagLogger (opts, logger = globalThis.platformatic?.logger) {
+export function setupDiagLogger (opts, logger) {
+  logger ??= getLogger({ throwOnMissing: false })
   if (opts?.diagLogger !== true) {
     return false
   }

package/lib/node-telemetry.js

@@ -7,6 +7,7 @@ import { W3CTraceContextPropagator } from '@opentelemetry/core'
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 import { resourceFromAttributes } from '@opentelemetry/resources'
 import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
+import { updateGlobals } from '@platformatic/globals'
 import { AsyncLocalStorage } from 'node:async_hooks'
 import { readFileSync, statSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -44,8 +45,6 @@ const setupNodeHTTPTelemetry = async (opts, applicationDir) => {
   const { spanProcessors } = getSpanProcessors(opts)
 
   const clientSpansAls = new AsyncLocalStorage()
-  globalThis.platformatic = globalThis.platformatic || {}
-  globalThis.platformatic.clientSpansAls = clientSpansAls
 
   const tracerProvider = new NodeTracerProvider({
     spanProcessors, // https://github.com/open-telemetry/opentelemetry-js/issues/4881#issuecomment-2358059714
@@ -53,7 +52,7 @@ const setupNodeHTTPTelemetry = async (opts, applicationDir) => {
       [ATTR_SERVICE_NAME]: applicationName
     })
   })
-  globalThis.platformatic.tracerProvider = tracerProvider
+  updateGlobals({ clientSpansAls, tracerProvider })
 
   // Register instrumentations with our TracerProvider
   registerInstrumentations({
@@ -84,9 +83,8 @@ const setupNodeHTTPTelemetry = async (opts, applicationDir) => {
 
 // Create a promise that will be resolved when telemetry is initialized
 // This allows other parts of the system to wait for telemetry to be ready
-globalThis.platformatic = globalThis.platformatic || {}
 const { promise: telemetryReadyPromise, resolve: resolveTelemetryReady } = Promise.withResolvers()
-globalThis.platformatic.telemetryReady = telemetryReadyPromise
+updateGlobals({ telemetryReady: telemetryReadyPromise })
 
 async function main () {
   let data = null

package/lib/thread-interceptor-hooks.js

@@ -1,16 +1,18 @@
 import { context, propagation, SpanKind, SpanStatusCode, trace } from '@opentelemetry/api'
+import { getTracerProvider } from '@platformatic/globals'
 import fastUri from 'fast-uri'
 import { formatSpanAttributes, formatSpanName } from './telemetry-config.js'
 import { name as moduleName, version as moduleVersion } from './version.js'
 
-// Get tracer from our isolated TracerProvider stored in globalThis.platformatic
+// Get tracer from our isolated TracerProvider.
 function getTracer () {
-  const tracerProvider = globalThis.platformatic?.tracerProvider
-  if (tracerProvider) {
+  try {
+    const tracerProvider = getTracerProvider()
     return tracerProvider.getTracer(moduleName, moduleVersion)
+  } catch {
+    // Fallback to global tracer if our provider isn't set up yet
+    return trace.getTracer(moduleName, moduleVersion)
   }
-  // Fallback to global tracer if our provider isn't set up yet
-  return trace.getTracer(moduleName, moduleVersion)
 }
 
 export function createTelemetryThreadInterceptorHooks () {
@@ -18,7 +20,8 @@ export function createTelemetryThreadInterceptorHooks () {
     const activeContext = propagation.extract(context.active(), req.headers)
 
     const route = req.routeOptions?.url ?? null
-    const span = getTracer().startSpan(
+    const tracer = getTracer()
+    const span = tracer.startSpan(
       formatSpanName(req, route),
       {
         attributes: formatSpanAttributes.request(req, route),
@@ -60,7 +63,8 @@ export function createTelemetryThreadInterceptorHooks () {
     } else {
       name = `${method} ${urlObj.scheme}://${urlObj.host}${urlObj.path}`
     }
-    const span = getTracer().startSpan(
+    const tracer = getTracer()
+    const span = tracer.startSpan(
       name,
       {
         attributes: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/telemetry",
-  "version": "3.54.0",
+  "version": "3.56.0",
   "description": "OpenTelemetry integration for Platformatic",
   "main": "index.js",
   "type": "module",
@@ -12,31 +12,32 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@databases/pg": "^5.5.0",
-    "@opentelemetry/instrumentation-express": "0.65.0",
-    "@opentelemetry/instrumentation-pg": "0.69.0",
+    "@opentelemetry/instrumentation-express": "0.66.0",
+    "@opentelemetry/instrumentation-pg": "0.70.0",
     "cleaner-spec-reporter": "^0.5.0",
     "express": "^5.1.0",
     "fastify": "^5.7.0",
     "neostandard": "^0.12.2",
-    "protobufjs": "^7.5.3",
+    "protobufjs": "^8.0.0",
     "typescript": "^5.9.2"
   },
   "dependencies": {
     "@fastify/swagger": "^9.5.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.7.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.217.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.218.0",
     "@opentelemetry/exporter-zipkin": "2.7.1",
-    "@opentelemetry/instrumentation": "0.217.0",
-    "@opentelemetry/instrumentation-http": "0.217.0",
-    "@opentelemetry/instrumentation-undici": "0.27.0",
+    "@opentelemetry/instrumentation": "0.218.0",
+    "@opentelemetry/instrumentation-http": "0.218.0",
+    "@opentelemetry/instrumentation-undici": "0.28.0",
     "@opentelemetry/resources": "2.7.1",
-    "@opentelemetry/sdk-node": "0.217.0",
+    "@opentelemetry/sdk-node": "0.218.0",
     "@opentelemetry/sdk-trace-base": "2.7.1",
-    "@opentelemetry/semantic-conventions": "1.36.0",
+    "@opentelemetry/semantic-conventions": "1.41.1",
     "fast-uri": "^3.0.6",
     "fastify-plugin": "^5.0.1",
-    "@platformatic/foundation": "3.54.0"
+    "@platformatic/foundation": "3.56.0",
+    "@platformatic/globals": "3.56.0"
   },
   "engines": {
     "node": ">=22.19.0"