@platformatic/telemetry 3.53.0-alpha.0 → 3.54.0

package/lib/diag-logger.js

@@ -0,0 +1,67 @@
+import { diag, DiagLogLevel } from '@opentelemetry/api'
+import util from 'node:util'
+
+const pinoToDiagLogLevels = {
+  silent: DiagLogLevel.NONE,
+  fatal: DiagLogLevel.ERROR,
+  error: DiagLogLevel.ERROR,
+  warn: DiagLogLevel.WARN,
+  info: DiagLogLevel.INFO,
+  debug: DiagLogLevel.DEBUG,
+  trace: DiagLogLevel.VERBOSE
+}
+
+function getDiagLogLevel (logger) {
+  const logLevel = logger?.level
+
+  if (typeof logLevel === 'string') {
+    return pinoToDiagLogLevels[logLevel] ?? DiagLogLevel.INFO
+  }
+
+  return DiagLogLevel.INFO
+}
+
+function callLogger (logger, method, fallback, args) {
+  if (typeof logger?.[method] === 'function') {
+    if (typeof args[0] === 'string') {
+      logger[method](util.format(...args))
+    } else {
+      logger[method](...args)
+    }
+
+    return
+  }
+
+  fallback(...args)
+}
+
+export function createPlatformaticDiagLogger (logger = globalThis.platformatic?.logger) {
+  let target = logger
+
+  if (typeof target?.child === 'function') {
+    try {
+      target = target.child({ name: '@platformatic/telemetry/diag' })
+    } catch {
+      // Ignore child logger creation failures and use the parent logger.
+    }
+  }
+
+  return {
+    error: (...args) => callLogger(target, 'error', console.error.bind(console), args),
+    warn: (...args) => callLogger(target, 'warn', console.warn.bind(console), args),
+    info: (...args) => callLogger(target, 'info', console.info.bind(console), args),
+    debug: (...args) => callLogger(target, 'debug', console.debug.bind(console), args),
+    verbose: (...args) => callLogger(target, 'trace', console.debug.bind(console), args)
+  }
+}
+
+export function setupDiagLogger (opts, logger = globalThis.platformatic?.logger) {
+  if (opts?.diagLogger !== true) {
+    return false
+  }
+
+  return diag.setLogger(createPlatformaticDiagLogger(logger), {
+    logLevel: getDiagLogLevel(logger),
+    suppressOverrideMessage: true
+  })
+}

package/lib/node-telemetry.js

@@ -10,6 +10,7 @@ import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
 import { AsyncLocalStorage } from 'node:async_hooks'
 import { readFileSync, statSync } from 'node:fs'
 import { tmpdir } from 'node:os'
+import { setupDiagLogger } from './diag-logger.js'
 import { resolve } from 'node:path'
 import process from 'node:process'
 import util from 'node:util'
@@ -35,6 +36,8 @@ contextManager.enable()
 context.setGlobalContextManager(contextManager)
 
 const setupNodeHTTPTelemetry = async (opts, applicationDir) => {
+  setupDiagLogger(opts)
+
   const { applicationName, instrumentations = [] } = opts
   const additionalInstrumentations = await getInstrumentations(instrumentations, applicationDir)
 

package/lib/telemetry-config.js

@@ -4,6 +4,7 @@ import { resourceFromAttributes } from '@opentelemetry/resources'
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions'
 import fastUri from 'fast-uri'
 import { fastifyTextMapGetter, fastifyTextMapSetter } from './fastify-text-map.js'
+import { setupDiagLogger } from './diag-logger.js'
 import { PlatformaticContext } from './platformatic-context.js'
 import { PlatformaticTracerProvider } from './platformatic-trace-provider.js'
 import { getSpanProcessors } from './span-processors.js'
@@ -89,6 +90,8 @@ const initTelemetry = (opts, logger) => {
 }
 
 export function setupTelemetry (opts, logger) {
+  setupDiagLogger(opts, logger)
+
   const openTelemetryAPIs = initTelemetry(opts, logger)
   const { tracer, propagator, provider } = openTelemetryAPIs
   const skipOperations =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/telemetry",
-  "version": "3.53.0-alpha.0",
+  "version": "3.54.0",
   "description": "OpenTelemetry integration for Platformatic",
   "main": "index.js",
   "type": "module",
@@ -12,8 +12,8 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@databases/pg": "^5.5.0",
-    "@opentelemetry/instrumentation-express": "^0.52.0",
-    "@opentelemetry/instrumentation-pg": "^0.55.0",
+    "@opentelemetry/instrumentation-express": "0.65.0",
+    "@opentelemetry/instrumentation-pg": "0.69.0",
     "cleaner-spec-reporter": "^0.5.0",
     "express": "^5.1.0",
     "fastify": "^5.7.0",
@@ -23,20 +23,20 @@
   },
   "dependencies": {
     "@fastify/swagger": "^9.5.1",
-    "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^2.0.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "^0.203.0",
-    "@opentelemetry/exporter-zipkin": "^2.0.1",
-    "@opentelemetry/instrumentation": "^0.203.0",
-    "@opentelemetry/instrumentation-http": "^0.203.0",
-    "@opentelemetry/instrumentation-undici": "^0.14.0",
-    "@opentelemetry/resources": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.203.0",
-    "@opentelemetry/sdk-trace-base": "^2.0.1",
+    "@opentelemetry/api": "1.9.1",
+    "@opentelemetry/core": "2.7.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.217.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/resources": "2.7.1",
+    "@opentelemetry/sdk-node": "0.217.0",
+    "@opentelemetry/sdk-trace-base": "2.7.1",
     "@opentelemetry/semantic-conventions": "1.36.0",
     "fast-uri": "^3.0.6",
     "fastify-plugin": "^5.0.1",
-    "@platformatic/foundation": "3.53.0-alpha.0"
+    "@platformatic/foundation": "3.54.0"
   },
   "engines": {
     "node": ">=22.19.0"