@platformatic/telemetry 2.52.0 → 2.53.0

package/lib/telemetry-config.js

@@ -30,14 +30,11 @@ const { name: moduleName, version: moduleVersion } = require('../package.json')
 // - zipkin (https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-zipkin/README.md)
 // - memory: for testing
 
-const extractRoute = (request) => {
-  if (request.routeOptions?.url) {
-    return formatParamUrl(request.routeOptions.url)
+function formatSpanName (request, route) {
+  if (route) {
+    route = formatParamUrl(route)
   }
-  return null
-}
 
-function formatSpanName (request, route) {
   const { method, url } = request
   return `${method} ${route ?? url}`
 }
@@ -181,7 +178,7 @@ function setupTelemetry (opts, logger) {
       fastifyTextMapGetter
     )
 
-    const route = extractRoute(request)
+    const route = request.routeOptions?.url ?? null
     const span = tracer.startSpan(formatSpanName(request, route), {}, context)
     span.kind = SpanKind.SERVER
     // Next 2 lines are needed by W3CTraceContextPropagator
@@ -368,6 +365,5 @@ function setupTelemetry (opts, logger) {
 module.exports = {
   setupTelemetry,
   formatSpanName,
-  formatSpanAttributes,
-  extractRoute
+  formatSpanAttributes
 }

package/lib/thread-interceptor-hooks.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { SpanStatusCode, SpanKind } = require('@opentelemetry/api')
-const { formatSpanName, formatSpanAttributes, extractRoute } = require('./telemetry-config')
+const { formatSpanName, formatSpanAttributes } = require('./telemetry-config')
 const api = require('@opentelemetry/api')
 const fastUri = require('fast-uri')
 const packageJson = require('../package.json')
@@ -12,7 +12,7 @@ const createTelemetryThreadInterceptorHooks = () => {
   const onServerRequest = (req, cb) => {
     const activeContext = api.propagation.extract(api.context.active(), req.headers)
 
-    const route = extractRoute(req)
+    const route = req.routeOptions?.url ?? null
     const span = tracer.startSpan(formatSpanName(req, route), {
       attributes: formatSpanAttributes.request(req, route),
       kind: SpanKind.SERVER

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/telemetry",
-  "version": "2.52.0",
+  "version": "2.53.0",
   "description": "OpenTelemetry integration for Platformatic",
   "main": "index.js",
   "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",
@@ -36,7 +36,7 @@
     "abstract-logging": "^2.0.1",
     "fast-uri": "^3.0.0",
     "fastify-plugin": "^5.0.0",
-    "@platformatic/config": "2.52.0"
+    "@platformatic/config": "2.53.0"
   },
   "scripts": {
     "test": "npm run lint && borp --timeout=120000 --concurrency=1",