@platformatic/telemetry 2.30.0 → 2.30.1-alpha.0

package/lib/node-telemetry.js

@@ -1,5 +1,6 @@
 'use strict'
 const process = require('node:process')
+const { AsyncLocalStorage } = require('node:async_hooks')
 const opentelemetry = require('@opentelemetry/sdk-node')
 const { Resource } = require('@opentelemetry/resources')
 const FileSpanExporter = require('./file-span-exporter')
@@ -74,10 +75,21 @@ const setupNodeHTTPTelemetry = (opts) => {
     spanProcessors.push(spanProcessor)
   }
 
+  const clientSpansAls = new AsyncLocalStorage()
+  globalThis.platformatic = globalThis.platformatic || {}
+  globalThis.platformatic.clientSpansAls = clientSpansAls
+
   const sdk = new opentelemetry.NodeSDK({
     spanProcessors, // https://github.com/open-telemetry/opentelemetry-js/issues/4881#issuecomment-2358059714
     instrumentations: [
-      new UndiciInstrumentation(),
+      new UndiciInstrumentation({
+        responseHook: (span) => {
+          const store = clientSpansAls.getStore()
+          if (store) {
+            store.span = span
+          }
+        }
+      }),
       new HttpInstrumentation(),
       new PgInstrumentation(),
     ],

package/lib/telemetry-config.js

@@ -282,6 +282,12 @@ function setupTelemetry (opts, logger) {
       span.setAttributes({
         'http.response.status_code': response.statusCode,
       })
+
+      const httpCacheId = response.headers?.['x-plt-http-cache-id']
+      if (httpCacheId) {
+        span.setAttributes({ 'http.cache.id': httpCacheId })
+      }
+
       span.setStatus(spanStatus)
     } else {
       span.setStatus({

package/lib/thread-interceptor-hooks.js

@@ -80,7 +80,7 @@ const createTelemetryThreadInterceptorHooks = () => {
     ctx.span = span
   }
 
-  const onClientResponse = (_req, res, ctx) => {
+  const onClientResponseEnd = (_req, res, ctx) => {
     const span = ctx.span ?? null
     if (!span) {
       return
@@ -93,6 +93,12 @@ const createTelemetryThreadInterceptorHooks = () => {
       span.setAttributes({
         'http.response.status_code': res.statusCode,
       })
+
+      const httpCacheId = res.headers?.['x-plt-http-cache-id']
+      if (httpCacheId) {
+        span.setAttributes({ 'http.cache.id': httpCacheId })
+      }
+
       span.setStatus(spanStatus)
     } else {
       span.setStatus({
@@ -116,7 +122,7 @@ const createTelemetryThreadInterceptorHooks = () => {
     onServerResponse,
     onServerError,
     onClientRequest,
-    onClientResponse,
+    onClientResponseEnd,
     onClientError
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/telemetry",
-  "version": "2.30.0",
+  "version": "2.30.1-alpha.0",
   "description": "OpenTelemetry integration for Platformatic",
   "main": "index.js",
   "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",