@dash0/sdk-web 0.14.1 → 0.16.0

package/src/utils/otel/trace-context_test.ts

@@ -0,0 +1,59 @@
+import { describe, it, expect } from "vitest";
+import { addXRayTraceContextHttpHeaders } from "./trace-context";
+import { InProgressSpan } from "./span";
+
+describe("X-Ray trace context", () => {
+  it("should generate X-Ray header with correct format", () => {
+    const span = {
+      traceId: "4efaaf4d1e8720b39541901950019ee5",
+      spanId: "53995c3f42cd8ad8",
+    } as InProgressSpan;
+
+    const headers: Record<string, string> = {};
+    const mockAppend = (name: string, value: string) => {
+      headers[name] = value;
+    };
+
+    addXRayTraceContextHttpHeaders(mockAppend, {}, span);
+
+    expect(headers["X-Amzn-Trace-Id"]).toBe(
+      "Root=1-4efaaf4d-1e8720b39541901950019ee5;Parent=53995c3f42cd8ad8;Sampled=1"
+    );
+  });
+
+  it("should convert W3C trace ID to X-Ray format correctly", () => {
+    const span = {
+      traceId: "5759e988bd862e3fe1be46a994272793",
+      spanId: "53995c3f42cd8ad8",
+    } as InProgressSpan;
+
+    const headers: Record<string, string> = {};
+    const mockAppend = (name: string, value: string) => {
+      headers[name] = value;
+    };
+
+    addXRayTraceContextHttpHeaders(mockAppend, {}, span);
+
+    expect(headers["X-Amzn-Trace-Id"]).toBe(
+      "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1"
+    );
+  });
+
+  it("should handle different span IDs", () => {
+    const span = {
+      traceId: "4efaaf4d1e8720b39541901950019ee5",
+      spanId: "1234567890abcdef",
+    } as InProgressSpan;
+
+    const headers: Record<string, string> = {};
+    const mockAppend = (name: string, value: string) => {
+      headers[name] = value;
+    };
+
+    addXRayTraceContextHttpHeaders(mockAppend, {}, span);
+
+    expect(headers["X-Amzn-Trace-Id"]).toBe(
+      "Root=1-4efaaf4d-1e8720b39541901950019ee5;Parent=1234567890abcdef;Sampled=1"
+    );
+  });
+});

package/src/utils/rate-limit.ts

@@ -1,15 +1,9 @@
 import { setInterval } from "./timers";
 
-export function createRateLimiter(opts: {
-  maxCalls?: number;
-  maxCallsPerTenMinutes: number;
-  maxCallsPerTenSeconds: number;
-}) {
-  const maxCalls = opts.maxCalls || 4096;
+export function createRateLimiter(opts: { maxCallsPerTenMinutes: number; maxCallsPerTenSeconds: number }) {
   const maxCallsPerTenMinutes = opts.maxCallsPerTenMinutes || 128;
   const maxCallsPerTenSeconds = opts.maxCallsPerTenSeconds || 32;
 
-  let totalCalls = 0;
   let totalCallsInLastTenMinutes = 0;
   let totalCallsInLastTenSeconds = 0;
 
@@ -25,10 +19,6 @@ export function createRateLimiter(opts: {
   }, 1000 * 10);
 
   return function isExcessiveUsage() {
-    return (
-      ++totalCalls > maxCalls ||
-      ++totalCallsInLastTenMinutes > maxCallsPerTenMinutes ||
-      ++totalCallsInLastTenSeconds > maxCallsPerTenSeconds
-    );
+    return ++totalCallsInLastTenMinutes > maxCallsPerTenMinutes || ++totalCallsInLastTenSeconds > maxCallsPerTenSeconds;
   };
 }

package/src/vars.ts

@@ -3,6 +3,13 @@ import { AnyValue, InstrumentationScope, KeyValue, Resource } from "./types/otlp
 import { UrlAttributeScrubber } from "./attributes";
 import { identity } from "./utils";
 
+export type PropagatorType = "traceparent" | "xray";
+
+export type PropagatorConfig = {
+  type: PropagatorType;
+  match: RegExp[];
+};
+
 export type Endpoint = {
   /**
    * OTLP HTTP URL excluding the /v1/* prefix
@@ -108,9 +115,16 @@ export type Vars = {
    */
   wrapTimers: boolean;
 
+  /**
+   * Configure trace context propagators for different URL patterns.
+   * Each propagator defines which header type to send for matching URLs.
+   */
+  propagators?: PropagatorConfig[];
+
   /**
    * An array of URL regular expressions
    * for which trace context headers should be sent across origins by http client instrumentations.
+   * @deprecated Use propagators instead
    */
   propagateTraceHeadersCorsURLs: RegExp[];