@dash0/sdk-web 0.11.1 → 0.12.0

package/src/utils/otel/attributes.ts

@@ -56,6 +56,8 @@ export function toKeyValue(key: string, value: AttributeValueType | AnyValue): K
 }
 
 export function addAttribute(attributes: KeyValue[], key: string, value: AttributeValueType | AnyValue) {
+  if (!key) return;
+
   attributes.push(toKeyValue(key, value));
 }
 

package/src/utils/otel/attributes_test.ts

@@ -1,6 +1,6 @@
 import { expect, describe, it } from "vitest";
-import { toAnyValue } from "./attributes";
-import { AnyValue } from "../../../types/otlp";
+import { addAttribute, toAnyValue } from "./attributes";
+import { AnyValue, KeyValue } from "../../../types/otlp";
 
 describe("toAnyValue", () => {
   describe("primitive values", () => {
@@ -178,4 +178,22 @@ describe("toAnyValue", () => {
       expect(result).toBeUndefined();
     });
   });
+
+  describe("addAttribute", () => {
+    it("adds attributes to attribute set", () => {
+      const attributes: KeyValue[] = [];
+
+      addAttribute(attributes, "some.attribute", { stringValue: "a value" });
+
+      expect(attributes).toEqual(expect.arrayContaining([expect.objectContaining({ key: "some.attribute" })]));
+    });
+
+    it("ignores attributes without key", () => {
+      const attributes: KeyValue[] = [];
+
+      addAttribute(attributes, "", { stringValue: "a value" });
+
+      expect(attributes).toHaveLength(0);
+    });
+  });
 });

package/src/utils/otel/span.ts

@@ -1,16 +1,17 @@
 import { KeyValue, Span, SpanStatus } from "../../../types/otlp";
 import { nowNanos } from "../time";
-import { generateUniqueId, SPAN_ID_BYTES } from "../id";
 import { SPAN_KIND_CLIENT, SPAN_STATUS_UNSET } from "../../semantic-conventions";
 import { sessionId } from "../../api/session";
 import { generateTraceId } from "../trace-id";
+import { generateSpanId } from "../span-id";
 
 export type InProgressSpan = Omit<Span, "endTimeUnixNano">;
 
 export function startSpan(name: string): InProgressSpan {
+  const traceId = generateTraceId(sessionId);
   return {
-    traceId: generateTraceId(sessionId),
-    spanId: generateUniqueId(SPAN_ID_BYTES),
+    traceId,
+    spanId: generateSpanId(traceId),
     name,
     // Always CLIENT for now https://github.com/open-telemetry/opentelemetry-proto/blob/ac3242b03157295e4ee9e616af53b81517b06559/opentelemetry/proto/trace/v1/trace.proto#L143-L169
     // Note: we directly define otlp here, this differs from the values used by oteljs internally.

package/src/utils/session-id_test.ts

@@ -12,7 +12,6 @@ describe("generateSessionId", () => {
     vi.spyOn(localStorage, "isSupported", "get").mockReturnValue(true);
 
     const sessionId = generateSessionId();
-    console.log(sessionId);
     expect(sessionId.startsWith("00")).toBe(true);
   });
 
@@ -20,7 +19,6 @@ describe("generateSessionId", () => {
     vi.spyOn(localStorage, "isSupported", "get").mockReturnValue(false);
 
     const sessionId = generateSessionId();
-    console.log(sessionId);
     expect(sessionId.startsWith("01")).toBe(true);
   });
 

package/src/utils/span-id.ts

@@ -0,0 +1,9 @@
+import { generateUniqueId, SPAN_ID_BYTES } from "./id";
+import { crc32 } from "./crc32";
+
+export function generateSpanId(traceId: string): string {
+  const checksum = crc32(traceId);
+  const prefix = checksum.toString(16).padStart(8, "0");
+
+  return `${prefix}${generateUniqueId(SPAN_ID_BYTES - 4)}`;
+}

package/src/utils/span-id_test.ts

@@ -0,0 +1,30 @@
+import { describe, expect } from "vitest";
+import { generateSpanId } from "./span-id";
+
+describe("generateSpanId", () => {
+  it("returns a span ID of the expected length", () => {
+    expect(generateSpanId("abcdef1234567890abcdef1234567890")).toHaveLength(16);
+  });
+
+  it("returns the same prefix for the same trace ID", () => {
+    const traceId = "abcdef1234567890abcdef1234567890";
+    const spanId1 = generateSpanId(traceId);
+    const spanId2 = generateSpanId(traceId);
+
+    expect(spanId1.substring(0, 8)).toBe(spanId2.substring(0, 8));
+    expect(spanId1).not.equals(spanId2);
+  });
+
+  it("returns different prefix for span ID for different trace IDs", () => {
+    const spanId1 = generateSpanId("abcdef1234567890abcdef1234567890");
+    const spanId2 = generateSpanId("1234567890abcdef1234567890abcdef");
+
+    expect(spanId1.substring(0, 8)).not.equals(spanId2.substring(0, 8));
+    expect(spanId1).not.equals(spanId2);
+  });
+
+  it("return a span id with the correct prefix", () => {
+    expect(generateSpanId("abcdef1234567890abcdef1234567890").substring(0, 8)).toEqual("3d5a507a");
+    expect(generateSpanId("1234567890abcdef1234567890abcdef").substring(0, 8)).toEqual("c24261eb");
+  });
+});