sm-utility 2.4.1 → 2.4.3

package/package.json

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

package/tracing/opentelemetry-tracer.d.ts

@@ -2,13 +2,13 @@ export interface TracingConfig {
     serviceName: string;
     environment: string;
     otelEndpoint: string;
-    samplingRatio?: number;
     maxQueueSize?: number;
     scheduledDelayMillis?: number;
     ignoredPaths?: (string | RegExp | ((url: string) => boolean))[];
 }
 export declare class OpenTelemetryTracer {
     private sdk;
+    private handleIgnoreRequest;
     constructor(config: TracingConfig);
     start(): void;
     private setupGracefulShutdown;

package/tracing/opentelemetry-tracer.js

@@ -8,13 +8,30 @@ const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-h
 const resources_1 = require("@opentelemetry/resources");
 const id_generator_aws_xray_1 = require("@opentelemetry/id-generator-aws-xray");
 const propagator_aws_xray_1 = require("@opentelemetry/propagator-aws-xray");
+const http_1 = require("http");
 const logger_1 = require("../logger");
 const DEFAULT_CONFIG = {
-    samplingRatio: 0.1,
     maxQueueSize: 50,
     scheduledDelayMillis: 1000,
 };
 class OpenTelemetryTracer {
+    handleIgnoreRequest(url, finalConfig) {
+        var _a, _b;
+        if (!url)
+            return false;
+        return ((_b = (_a = finalConfig.ignoredPaths) === null || _a === void 0 ? void 0 : _a.some((path) => {
+            if (typeof path === "string") {
+                return url === path;
+            }
+            if (path instanceof RegExp) {
+                return path.test(url);
+            }
+            if (typeof path === "function") {
+                return path(url);
+            }
+            return false;
+        })) !== null && _b !== void 0 ? _b : false);
+    }
     constructor(config) {
         const finalConfig = { ...DEFAULT_CONFIG, ...config };
         const resource = resources_1.Resource.default().merge(new resources_1.Resource({
@@ -33,17 +50,35 @@ class OpenTelemetryTracer {
             spanProcessors: [spanProcessor],
             instrumentations: [
                 (0, auto_instrumentations_node_1.getNodeAutoInstrumentations)({
+                    "@opentelemetry/instrumentation-http": {
+                        enabled: true,
+                        ignoreIncomingRequestHook: (req) => this.handleIgnoreRequest(req.url, finalConfig),
+                        requestHook: (span, request) => {
+                            if (request instanceof http_1.IncomingMessage && "headers" in request) {
+                                const traceId = request.headers["x-amzn-trace-id"];
+                                if (traceId) {
+                                    span.setAttribute("aws.trace.id", traceId);
+                                    logger_1.logger.debug("X-Amzn-Trace-Id captured", { traceId });
+                                }
+                            }
+                        },
+                    },
                     "@opentelemetry/instrumentation-express": {
                         enabled: true,
-                        ...(finalConfig.ignoredPaths && {
-                            ignoreIncomingPaths: finalConfig.ignoredPaths,
-                        }),
+                        ignoreLayers: finalConfig.ignoredPaths,
+                        requestHook: (span, req) => {
+                            var _a;
+                            const traceId = (_a = req.headers) === null || _a === void 0 ? void 0 : _a["x-amzn-trace-id"];
+                            if (traceId) {
+                                span.setAttribute("aws.trace.id", traceId);
+                                logger_1.logger.debug("Express: X-Amzn-Trace-Id captured", { traceId });
+                            }
+                        },
                     },
                 }),
             ],
             textMapPropagator: new propagator_aws_xray_1.AWSXRayPropagator(),
             idGenerator: new id_generator_aws_xray_1.AWSXRayIdGenerator(),
-            sampler: new sdk_trace_base_1.TraceIdRatioBasedSampler(finalConfig.samplingRatio),
         });
     }
     start() {