sasai-common-utils 1.0.43 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasai-common-utils",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "Reusable utility library for common logging and other shared features.",
   "main": "src/index.js",
   "scripts": {
@@ -16,9 +16,12 @@
     "@opentelemetry/exporter-logs-otlp-http": "^0.211.0",
     "@opentelemetry/resources": "^2.5.0",
     "@opentelemetry/sdk-logs": "^0.211.0",
+    "@opentelemetry/semantic-conventions": "^1.39.0",
     "jsonwebtoken": "^9.0.2",
+    "klona": "^2.0.6",
     "pino": "^9.6.0",
     "pino-pretty": "^13.0.0",
+    "traverse": "^0.6.11",
     "winston": "^3.17.0"
   },
   "devDependencies": {

package/src/features/logger/index.js

@@ -5,7 +5,8 @@ const pino = require("pino");
 const { trace, context } = require("@opentelemetry/api");
 const { LoggerProvider, BatchLogRecordProcessor } = require("@opentelemetry/sdk-logs");
 const { OTLPLogExporter } = require("@opentelemetry/exporter-logs-otlp-http");
-const { Resource } = require("@opentelemetry/resources");
+const { resourceFromAttributes } = require("@opentelemetry/resources");
+const { ATTR_SERVICE_NAME, ATTR_DEPLOYMENT_ENVIRONMENT } = require("@opentelemetry/semantic-conventions");
 const { SeverityNumber } = require("@opentelemetry/api-logs");
 
 let contextProvider = () => ({});
@@ -48,9 +49,10 @@ function initOTEL() {
   }
 
   try {
-    const resource = new Resource({
-      "service.name": globalConfig.SERVICE_NAME || "unknown-service",
-      "deployment.environment": globalConfig.NODE_ENV || "unknown",
+    // Create resource with proper attributes
+    const resource = resourceFromAttributes({
+      [ATTR_SERVICE_NAME]: globalConfig.SERVICE_NAME,
+      [ATTR_DEPLOYMENT_ENVIRONMENT]: globalConfig.NODE_ENV,
     });
 
     const logExporter = new OTLPLogExporter({
@@ -105,23 +107,36 @@ function sendLog(level, data) {
       const activeSpan = trace.getSpan(context.active());
       const spanContext = activeSpan?.spanContext();
 
+      // Use trace/span from data if available, otherwise try to get from active span
+      let traceId = data.trace || spanContext?.traceId || "";
+      let spanId = data.span || spanContext?.spanId || "";
+      
       const logRecord = {
         severityNumber: getSeverityNumber(level),
         severityText: level.toUpperCase(),
         body: typeof data === "string" ? data : JSON.stringify(data),
         attributes: {
           "log.level": level,
-          ...(data.trace && { "trace.id": data.trace }),
-          ...(data.span && { "span.id": data.span }),
+          "service.name": globalConfig.SERVICE_NAME,
+          ...(traceId && { "trace.id": traceId }),
+          ...(spanId && { "span.id": spanId }),
           ...data,
         },
-        ...(spanContext?.traceId && { traceId: spanContext.traceId }),
-        ...(spanContext?.spanId && { spanId: spanContext.spanId }),
-        ...(spanContext?.traceFlags !== undefined && {
-          traceFlags: spanContext.traceFlags,
-        }),
       };
 
+      // Add trace context to log record if available
+      if (traceId) {
+        logRecord.traceId = traceId;
+      }
+      if (spanId) {
+        logRecord.spanId = spanId;
+      }
+      if (spanContext?.traceFlags !== undefined) {
+        logRecord.traceFlags = spanContext.traceFlags;
+      } else if (traceId) {
+        logRecord.traceFlags = 1; // Default to SAMPLED if we have a traceId
+      }
+
       otelLogger.emit(logRecord);
     } catch (error) {
       console.error("[Logger] Failed to send OTLP log:", error);