@saidsef/tracing-node 3.12.0 → 3.12.2

package/libs/index.mjs

@@ -185,10 +185,17 @@ export function setupTracing(options = {}) {
           if (hostname) {
             const peerService = getPeerServiceName(hostname, url);
 
-            // Set attributes for service graph
+            // Set attributes for service graph - CRITICAL for Tempo
             span.setAttribute('peer.service', peerService);
             span.setAttribute('net.peer.name', hostname);
 
+            // Add db.system for database clients (elasticsearch, redis, etc.)
+            if (peerService === 'elasticsearch') {
+              span.setAttribute('db.system', 'elasticsearch');
+            } else if (peerService === 'redis') {
+              span.setAttribute('db.system', 'redis');
+            }
+
             // Add port if available
             const port = request?.port || request?.options?.port;
             if (port) {
@@ -309,32 +316,12 @@ export function setupTracing(options = {}) {
     }),
     new IORedisInstrumentation({
       requireParentSpan: false,
-      responseHook: (span, cmdName, cmdArgs, response) => {
-        // Set peer.service for service graph visualization
-        span.setAttribute('peer.service', 'redis');
-        span.setAttribute('db.system', 'redis');
-
-        // Add command details for better observability
-        if (cmdName) {
-          span.setAttribute('db.operation', cmdName.toUpperCase());
-        }
-
-        // Log response size if available
-        if (response !== undefined && response !== null) {
-          const responseType = typeof response;
-          span.setAttribute('db.response.type', responseType);
-
-          if (Array.isArray(response)) {
-            span.setAttribute('db.response.count', response.length);
-          }
-        }
-      },
       requestHook: (span, cmdName, cmdArgs) => {
         // Set peer.service for service graph visualization - CRITICAL for Tempo
         span.setAttribute('peer.service', 'redis');
         span.setAttribute('db.system', 'redis');
 
-        // Add command details
+        // Add command details for better observability
         if (cmdName) {
           span.setAttribute('db.operation', cmdName.toUpperCase());
           span.updateName(`redis.${cmdName.toUpperCase()}`);
@@ -350,6 +337,20 @@ export function setupTracing(options = {}) {
           }
         }
       },
+      responseHook: (span, cmdName, cmdArgs, response) => {
+        // Ensure peer.service persists through response
+        span.setAttribute('peer.service', 'redis');
+
+        // Log response size if available
+        if (response !== undefined && response !== null) {
+          const responseType = typeof response;
+          span.setAttribute('db.response.type', responseType);
+
+          if (Array.isArray(response)) {
+            span.setAttribute('db.response.count', response.length);
+          }
+        }
+      },
       dbStatementSerializer: (cmdName, cmdArgs) => {
         // Serialize command for better observability (limit arg length to avoid huge spans)
         const args = cmdArgs.map(arg => {
@@ -359,7 +360,46 @@ export function setupTracing(options = {}) {
         return `${cmdName} ${args.join(' ')}`;
       },
     }),
-    new ElasticsearchInstrumentation(),
+    new ElasticsearchInstrumentation({
+      suppressInternalInstrumentation: true,
+      requestHook: (span, request) => {
+        // Set peer.service for service graph visualization - CRITICAL for Tempo
+        // This ensures Elasticsearch spans are properly identified
+        span.setAttribute('peer.service', 'elasticsearch');
+        span.setAttribute('db.system', 'elasticsearch');
+
+        // Add operation details if available
+        if (request?.method) {
+          span.setAttribute('db.operation', request.method.toUpperCase());
+        }
+      },
+      responseHook: (span, response) => {
+        // Ensure peer.service persists through response
+        span.setAttribute('peer.service', 'elasticsearch');
+        span.setAttribute('db.system', 'elasticsearch');
+        
+        // Add response details for better observability
+        if (response) {
+          // Add status code if available
+          if (response.statusCode) {
+            span.setAttribute('db.response.status_code', response.statusCode);
+          }
+          
+          // Add response body size if available
+          if (response.body) {
+            const bodySize = typeof response.body === 'string' 
+              ? response.body.length 
+              : JSON.stringify(response.body).length;
+            span.setAttribute('db.response.body_size', bodySize);
+          }
+          
+          // Add took time if available (Elasticsearch response timing)
+          if (response.body?.took) {
+            span.setAttribute('db.elasticsearch.took_ms', response.body.took);
+          }
+        }
+      },
+    }),
   ];
 
   if (enableFsInstrumentation) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saidsef/tracing-node",
-  "version": "3.12.0",
+  "version": "3.12.2",
   "description": "tracing NodeJS - Wrapper for OpenTelemetry instrumentation packages",
   "main": "libs/index.mjs",
   "scripts": {