@orion-js/logger 3.11.1 → 3.11.6-alpha.0

package/lib/formats.js

@@ -5,9 +5,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonConsoleTransport = exports.jsonConsoleFormat = exports.textConsoleTransport = exports.textConsoleFormat = exports.sentryFormat = void 0;
 const winston_1 = require("winston");
-const util_1 = __importDefault(require("util"));
+const node_util_1 = __importDefault(require("node:util"));
 const lodash_1 = require("lodash");
+const api_1 = __importDefault(require("@opentelemetry/api"));
 const { metadata, timestamp, json, colorize, combine, printf } = winston_1.format;
+const opentelemetryContext = (0, winston_1.format)(info => {
+    const activeSpan = api_1.default.trace.getActiveSpan();
+    if (activeSpan) {
+        const spanContex = activeSpan.spanContext();
+        if (activeSpan.name && !info.context) {
+            info.context = activeSpan.name;
+        }
+        const fields = {
+            trace_id: spanContex.traceId,
+            span_id: spanContex.spanId,
+            trace_flags: `0${spanContex.traceFlags.toString(16)}`,
+        };
+        Object.assign(info, fields);
+    }
+    return info;
+});
 const metaError = (0, winston_1.format)(info => {
     if (info?.metadata?.value?.error instanceof Error) {
         info.stack = info?.metadata?.value?.error.stack;
@@ -27,8 +44,8 @@ exports.sentryFormat = (0, winston_1.format)(info => {
         ...extra,
         tags: {
             path: path || '',
-            request_id: label
-        }
+            request_id: label,
+        },
     };
 });
 function getMetadataText(metadata) {
@@ -36,25 +53,29 @@ function getMetadataText(metadata) {
     if ((0, lodash_1.isEmpty)(rest)) {
         if (typeof value === 'undefined')
             return '';
-        return util_1.default.inspect(value);
+        return node_util_1.default.inspect(value);
     }
-    return `${util_1.default.inspect(value)} ${util_1.default.inspect(rest)}`;
+    return `${node_util_1.default.inspect(value)} ${node_util_1.default.inspect(rest)}`;
 }
-exports.textConsoleFormat = combine(colorize(), metadata({ fillExcept: ['fileName', 'level', 'message', 'stack'] }), metaError(), timestamp(), printf(info => {
+exports.textConsoleFormat = combine(colorize(), metadata({ fillExcept: ['fileName', 'level', 'message', 'stack'] }), opentelemetryContext(), metaError(), timestamp(), printf(info => {
     // console.log(info)
     const date = new Date(info.timestamp);
     const timeLabel = `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`;
     const fileNameLabel = info.fileName ? `[${info.fileName}]` : '';
     const stack = info.stack ? `\n${info.stack}` : '';
     const value = getMetadataText(info.metadata);
-    return `[${info.level}] [${timeLabel}] ${fileNameLabel} ${info.message} ${value} ${stack}`;
+    const traceId = info.trace_id
+        ? `${String(info.trace_id).substring(0, 8)}@${String(info.span_id).substring(0, 8)}`
+        : '';
+    const context = `${info.context || ''} ${traceId}`.trim();
+    return `[${info.level}] [${timeLabel}] [${context}] ${fileNameLabel} ${info.message} ${value} ${stack}`;
 }));
 exports.textConsoleTransport = new winston_1.transports.Console({
     handleExceptions: true,
-    format: exports.textConsoleFormat
+    format: exports.textConsoleFormat,
 });
-exports.jsonConsoleFormat = combine(metadata({ fillExcept: ['fileName', 'level', 'message'] }), metaError(), timestamp(), json());
+exports.jsonConsoleFormat = combine(metadata({ fillExcept: ['fileName', 'level', 'message'] }), opentelemetryContext(), metaError(), timestamp(), json());
 exports.jsonConsoleTransport = new winston_1.transports.Console({
     handleExceptions: true,
-    format: exports.jsonConsoleFormat
+    format: exports.jsonConsoleFormat,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/logger",
-  "version": "3.11.1",
+  "version": "3.11.6-alpha.0",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -13,6 +13,7 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
+    "@opentelemetry/api": "^1.9.0",
     "color": "^4.2.3",
     "lodash": "^4.17.21",
     "object-hash": "^2.2.0",
@@ -29,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6d60b64d2b61ff2a74884cf4eb4eea806c2231c2"
+  "gitHead": "cdcf47aed25cb864126e624cd808c08d7959b8a4"
 }