@saidsef/tracing-node 3.22.0 → 3.22.2

package/libs/index.mjs

@@ -1,5 +1,3 @@
-'use strict';
-
 /*
  * Copyright Said Sef
  *
@@ -36,6 +34,15 @@ import {ATTR_CONTAINER_NAME} from '@opentelemetry/semantic-conventions/incubatin
 
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 
+// Set a non-negative integer span attribute from a header value; ignore invalid input.
+const setIntAttribute = (span, name, value) => {
+  if (!value) return;
+  const parsed = parseInt(value, 10);
+  if (!Number.isNaN(parsed) && parsed >= 0) {
+    span.setAttribute(name, parsed);
+  }
+};
+
 /**
 * Sets up tracing for the application using OpenTelemetry.
 *
@@ -120,11 +127,6 @@ export function setupTracing(options = {}) {
   // explicit config, with the recommended context manager.
   tracerProvider.register();
 
-  // Ignore spans from static assets.
-  const ignoreIncomingRequestHook = (req) => {
-    return req.url.startsWith('/metrics') || req.url.startsWith('/healthz');
-  };
-
   // Hook to set peer service name for outgoing requests
   const applyCustomAttributesOnSpan = (span, request) => {
     const url = request?.url || request?.uri || '';
@@ -149,7 +151,8 @@ export function setupTracing(options = {}) {
   const instrumentations = [
     new HttpInstrumentation({
       serverName: serviceName,
-      ignoreIncomingRequestHook,
+      // Ignore spans from static assets (metrics/health probes).
+      ignoreIncomingRequestHook: (req) => req.url.startsWith('/metrics') || req.url.startsWith('/healthz'),
       applyCustomAttributesOnSpan,
       requestHook: (span, request) => {
         // Enrich spans with additional HTTP request attributes
@@ -168,13 +171,7 @@ export function setupTracing(options = {}) {
         if (userAgent) span.setAttribute('http.user_agent', userAgent);
         if (contentType) span.setAttribute('http.request.content_type', contentType);
 
-        // Safe integer parsing with validation
-        if (contentLength) {
-          const length = parseInt(contentLength, 10);
-          if (!Number.isNaN(length) && length >= 0) {
-            span.setAttribute('http.request.content_length', length);
-          }
-        }
+        setIntAttribute(span, 'http.request.content_length', contentLength);
 
         // Correlation headers for distributed tracing
         if (requestId) span.setAttribute('http.request_id', requestId);
@@ -191,12 +188,7 @@ export function setupTracing(options = {}) {
 
         if (contentType) span.setAttribute('http.response.content_type', contentType);
 
-        if (contentLength) {
-          const length = parseInt(contentLength, 10);
-          if (!Number.isNaN(length) && length >= 0) {
-            span.setAttribute('http.response.content_length', length);
-          }
-        }
+        setIntAttribute(span, 'http.response.content_length', contentLength);
 
         if (requestId) span.setAttribute('http.request_id', requestId);
       },
@@ -282,20 +274,11 @@ export function setupTracing(options = {}) {
         }
       },
       responseHook: (span, cmdName, cmdArgs, response) => {
-        // Ensure peer.service persists through response
-        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
+        // peer.service, db.system and db.operation are already set on this span
+        // by requestHook and persist for the span's lifetime, so they are not
+        // re-set here. Record only the response shape for observability.
         if (response !== undefined && response !== null) {
-          const responseType = typeof response;
-          span.setAttribute('db.response.type', responseType);
-
+          span.setAttribute('db.response.type', typeof response);
           if (Array.isArray(response)) {
             span.setAttribute('db.response.count', response.length);
           }

package/package.json

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

package/.eslintrc.yml

@@ -1,26 +0,0 @@
-env:
-  node: true
-  commonjs: false
-  es2021: true
-extends: eslint:recommended
-parserOptions:
-  ecmaVersion: latest
-  sourceType: module
-rules:
-  "prefer-const": ["error", { "ignoreReadBeforeAssign": true }]
-  arrow-spacing: ["error", { "before": true, "after": true }]
-  computed-property-spacing: ["error", "never"]
-  eol-last: ["error", "always"]
-  no-compare-neg-zero: "error"
-  no-tabs: ["error", { allowIndentationTabs: true }]
-  no-trailing-spaces: "error"
-  no-unused-vars: "error"
-  no-whitespace-before-property: "error"
-  object-curly-spacing: ["error", "never"]
-  quotes: ["warn", "single"]
-  rest-spread-spacing: ["error", "always"]
-  semi: ["warn", "always"]
-  space-before-blocks: "error"
-  template-curly-spacing: "error"
-overrides:
-  - files: [ "libs/index.mjs"]