sm-utility 2.4.23 → 2.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sm-utility",
-  "version": "2.4.23",
+  "version": "2.4.25",
   "description": "reusable utility codes for sm projects",
   "main": "index.js",
   "types": "./index.d.ts",

package/request/loggers/error.logger.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logError = void 0;
 const logger_1 = require("../../logger");
+const tracing_1 = require("../../tracing");
 function logError(id, method, url, data, status, message) {
     const err = {
         ["context-id"]: id,
@@ -11,6 +12,14 @@ function logError(id, method, url, data, status, message) {
         status,
         message,
     };
+    const traceId = tracing_1.TracingContextProvider.getTraceId();
+    if (traceId) {
+        err['trace.id'] = traceId;
+    }
+    const spanId = tracing_1.TracingContextProvider.getSpanId();
+    if (spanId) {
+        err['span.id'] = spanId;
+    }
     logger_1.logger.error("sm-utility/api-error", { err });
 }
 exports.logError = logError;

package/request/loggers/request.logger.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logRequest = void 0;
 const logger_1 = require("../../logger");
+const tracing_1 = require("../../tracing");
 function logRequest(id, method, url, body, params) {
     const request = {
         ["context-id"]: id,
@@ -10,6 +11,14 @@ function logRequest(id, method, url, body, params) {
         params,
         body,
     };
+    const traceId = tracing_1.TracingContextProvider.getTraceId();
+    if (traceId) {
+        request['trace.id'] = traceId;
+    }
+    const spanId = tracing_1.TracingContextProvider.getSpanId();
+    if (spanId) {
+        request['span.id'] = spanId;
+    }
     logger_1.logger.info("sm-utility/api-request", { request });
 }
 exports.logRequest = logRequest;

package/request/loggers/response.logger.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logResponse = void 0;
 const logger_1 = require("../../logger");
+const tracing_1 = require("../../tracing");
 function logResponse(id, method, url, body, status, responseTime) {
     const response = {
         ["context-id"]: id,
@@ -11,6 +12,14 @@ function logResponse(id, method, url, body, status, responseTime) {
         status,
         responseTime,
     };
+    const traceId = tracing_1.TracingContextProvider.getTraceId();
+    if (traceId) {
+        response['trace.id'] = traceId;
+    }
+    const spanId = tracing_1.TracingContextProvider.getSpanId();
+    if (spanId) {
+        response['span.id'] = spanId;
+    }
     logger_1.logger.info("sm-utility/api-response", { response });
 }
 exports.logResponse = logResponse;

package/tracing/index.d.ts

@@ -1,2 +1,3 @@
 export { OpenTelemetryTracer } from "./opentelemetry-tracer";
 export type { TracingConfig } from "./opentelemetry-tracer";
+export { TracingContextProvider } from "./tracingContextProvider";

package/tracing/index.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenTelemetryTracer = void 0;
+exports.TracingContextProvider = exports.OpenTelemetryTracer = void 0;
 var opentelemetry_tracer_1 = require("./opentelemetry-tracer");
 Object.defineProperty(exports, "OpenTelemetryTracer", { enumerable: true, get: function () { return opentelemetry_tracer_1.OpenTelemetryTracer; } });
+var tracingContextProvider_1 = require("./tracingContextProvider");
+Object.defineProperty(exports, "TracingContextProvider", { enumerable: true, get: function () { return tracingContextProvider_1.TracingContextProvider; } });

package/tracing/tracingContextProvider.d.ts

@@ -0,0 +1,10 @@
+export declare class TracingContextProvider {
+    /**
+     * Returns the canonical OpenTelemetry trace id (32 hex chars)
+     */
+    static getTraceId(): string | undefined;
+    /**
+     * Returns the current span id (16 hex chars)
+     */
+    static getSpanId(): string | undefined;
+}

package/tracing/tracingContextProvider.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TracingContextProvider = void 0;
+const api_1 = require("@opentelemetry/api");
+class TracingContextProvider {
+    /**
+     * Returns the canonical OpenTelemetry trace id (32 hex chars)
+     */
+    static getTraceId() {
+        var _a;
+        const span = api_1.trace.getSpan(api_1.context.active());
+        return (_a = span === null || span === void 0 ? void 0 : span.spanContext()) === null || _a === void 0 ? void 0 : _a.traceId;
+    }
+    /**
+     * Returns the current span id (16 hex chars)
+     */
+    static getSpanId() {
+        var _a;
+        const span = api_1.trace.getSpan(api_1.context.active());
+        return (_a = span === null || span === void 0 ? void 0 : span.spanContext()) === null || _a === void 0 ? void 0 : _a.spanId;
+    }
+}
+exports.TracingContextProvider = TracingContextProvider;