@platformatic/telemetry 3.38.0 → 3.39.0

package/index.js

@@ -1,3 +1,4 @@
+export { addPinoInstrumentation } from './lib/logger.js'
 export * as schema from './lib/schema.js'
 export * as telemetry from './lib/telemetry.js'
 export { createTelemetryThreadInterceptorHooks } from './lib/thread-interceptor-hooks.js'

package/lib/logger.js

@@ -0,0 +1,42 @@
+import { context, isSpanContextValid, trace } from '@opentelemetry/api'
+
+const defaultLogKeys = {
+  traceId: 'trace_id',
+  spanId: 'span_id',
+  traceFlags: 'trace_flags'
+}
+
+function pinoInstrumentationCombinedMixin (logKeys, original, ...args) {
+  const result = original(...args)
+  const spanContext = trace.getSpan(context.active())?.spanContext()
+
+  if (spanContext && isSpanContextValid(spanContext)) {
+    result[logKeys.traceId] = spanContext.traceId
+    result[logKeys.spanId] = spanContext.spanId
+    result[logKeys.traceFlags] = `0${spanContext.traceFlags.toString(16)}`
+  }
+
+  return result
+}
+
+function pinoInstrumentationStandaloneMixin (logKeys) {
+  const spanContext = trace.getSpan(context.active())?.spanContext()
+
+  if (!spanContext || !isSpanContextValid(spanContext)) {
+    return {}
+  }
+
+  return {
+    [logKeys.traceId]: spanContext.traceId,
+    [logKeys.spanId]: spanContext.spanId,
+    [logKeys.traceFlags]: `0${spanContext.traceFlags.toString(16)}`
+  }
+}
+
+export function addPinoInstrumentation (options, overrides = {}) {
+  const logKeys = Object.assign({}, defaultLogKeys, overrides)
+
+  options.mixin = options.mixin
+    ? pinoInstrumentationCombinedMixin.bind(null, logKeys, options.mixin)
+    : pinoInstrumentationStandaloneMixin.bind(null, logKeys)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/telemetry",
-  "version": "3.38.0",
+  "version": "3.39.0",
   "description": "OpenTelemetry integration for Platformatic",
   "main": "index.js",
   "type": "module",
@@ -36,7 +36,7 @@
     "@opentelemetry/semantic-conventions": "1.36.0",
     "fast-uri": "^3.0.6",
     "fastify-plugin": "^5.0.1",
-    "@platformatic/foundation": "3.38.0"
+    "@platformatic/foundation": "3.39.0"
   },
   "engines": {
     "node": ">=22.19.0"