@dash0/sdk-web 0.17.0 → 0.18.1

package/dist/modules/api/events.js

@@ -1,7 +1,7 @@
 import { EVENT_NAME, EVENT_NAMES, WEB_EVENT_TITLE, LOG_SEVERITIES } from "../semantic-conventions";
 import { sendLog } from "../transport";
 import { addCommonAttributes } from "../attributes";
-import { addAttribute, toAnyValue } from "../utils/otel";
+import { addAttribute, addAttributes, toAnyValue } from "../utils/otel";
 import { nowNanos, toNanosTs, warn } from "../utils";
 /**
  * Sends a custom event.
@@ -15,11 +15,12 @@ export function sendEvent(name, opts) {
     }
     const attributes = [];
     addCommonAttributes(attributes);
-    Object.entries(opts?.attributes ?? {}).forEach(([key, value]) => addAttribute(attributes, key, value));
     addAttribute(attributes, EVENT_NAME, name);
     if (opts?.title) {
         addAttribute(attributes, WEB_EVENT_TITLE, opts.title);
     }
+    // Add custom attributes last to allow overrides
+    addAttributes(attributes, opts?.attributes);
     sendLog({
         timeUnixNano: opts?.timestamp != null ? toNanosTs(opts.timestamp) : nowNanos(),
         attributes,

package/dist/modules/api/init.js

@@ -1,6 +1,6 @@
 import { vars } from "../vars";
 import { DEPLOYMENT_ENVIRONMENT_NAME, DEPLOYMENT_ID, DEPLOYMENT_NAME, PAGE_LOAD_ID, SERVICE_NAME, SERVICE_VERSION, USER_AGENT, } from "../semantic-conventions";
-import { fetch, generateUniqueId, PAGE_LOAD_ID_BYTES, warn, debug, perf, nav, win, NO_VALUE_FALLBACK, pick, } from "../utils";
+import { fetch, generateUniqueId, PAGE_LOAD_ID_BYTES, warn, debug, perf, nav, win, NO_VALUE_FALLBACK, pick, loc, } from "../utils";
 import { trackSessions } from "./session";
 import { startWebVitalsInstrumentation } from "../instrumentations/web-vitals";
 import { startErrorInstrumentation } from "../instrumentations/errors";
@@ -20,9 +20,13 @@ export function init(opts) {
         return;
     }
     if (!isSupported()) {
-        debug("Stopping Dash0 Web SDK initialization. This browser does not support the necessary APIs");
+        debug("Stopping Dash0 Web SDK initialization. This browser does not support the necessary APIs.");
         return;
     }
+    if (!opts.serviceName.trim()) {
+        debug("Missing or empty serviceName value. Falling back to location.hostname.");
+        opts.serviceName = loc?.hostname ?? "unknown";
+    }
     vars.endpoints = opts.endpoint instanceof Array ? opts.endpoint : [opts.endpoint];
     if (vars.endpoints.length === 0) {
         warn("No telemetry endpoint configured. Aborting Dash0 Web SDK initialization process.");

package/dist/modules/api/init_test.js

@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { SERVICE_NAME } from "../semantic-conventions";
 // Mock all the instrumentation modules
 vi.mock("../instrumentations/web-vitals", () => ({
     startWebVitalsInstrumentation: vi.fn(),
@@ -12,6 +13,14 @@ vi.mock("../instrumentations/http/fetch", () => ({
 vi.mock("../instrumentations/navigation", () => ({
     startNavigationInstrumentation: vi.fn(),
 }));
+// Mock the utils module to control loc.hostname
+vi.mock("../utils", async () => {
+    const actual = await vi.importActual("../utils");
+    return {
+        ...actual,
+        loc: { hostname: "test-hostname.example.com" },
+    };
+});
 import { startErrorInstrumentation } from "../instrumentations/errors";
 import { instrumentFetch } from "../instrumentations/http/fetch";
 import { startNavigationInstrumentation } from "../instrumentations/navigation";
@@ -179,4 +188,58 @@ describe("init", () => {
             expect(spyOnWarn).not.toHaveBeenCalled();
         });
     });
+    describe("serviceName fallback", () => {
+        it("should use provided serviceName when it is valid", async () => {
+            init({
+                ...baseOptions,
+                serviceName: "my-service",
+            });
+            const serviceNameAttr = vars.resource.attributes.find((attr) => attr.key === SERVICE_NAME);
+            expect(serviceNameAttr?.value.stringValue).toBe("my-service");
+        });
+        it("should fallback to location.hostname when serviceName is empty string", async () => {
+            init({
+                ...baseOptions,
+                serviceName: "",
+            });
+            const serviceNameAttr = vars.resource.attributes.find((attr) => attr.key === SERVICE_NAME);
+            expect(serviceNameAttr?.value.stringValue).toBe("test-hostname.example.com");
+        });
+        it("should fallback to location.hostname when serviceName is only whitespace", async () => {
+            init({
+                ...baseOptions,
+                serviceName: "   ",
+            });
+            const serviceNameAttr = vars.resource.attributes.find((attr) => attr.key === SERVICE_NAME);
+            expect(serviceNameAttr?.value.stringValue).toBe("test-hostname.example.com");
+        });
+        it("should fallback to location.hostname when serviceName is tabs and spaces", async () => {
+            init({
+                ...baseOptions,
+                serviceName: " \t  \n ",
+            });
+            const serviceNameAttr = vars.resource.attributes.find((attr) => attr.key === SERVICE_NAME);
+            expect(serviceNameAttr?.value.stringValue).toBe("test-hostname.example.com");
+        });
+        it("should fallback to 'unknown' when serviceName is empty and location.hostname is not available", async () => {
+            vi.resetModules();
+            // Mock utils module with loc as undefined
+            vi.doMock("../utils", async () => {
+                const actual = await vi.importActual("../utils");
+                return {
+                    ...actual,
+                    loc: undefined,
+                };
+            });
+            const { vars: importedVars } = await import("../vars");
+            const { init: importedInit } = await import("./init");
+            const { SERVICE_NAME: importedServiceName } = await import("../semantic-conventions");
+            importedInit({
+                ...baseOptions,
+                serviceName: "",
+            });
+            const serviceNameAttr = importedVars.resource.attributes.find((attr) => attr.key === importedServiceName);
+            expect(serviceNameAttr?.value.stringValue).toBe("unknown");
+        });
+    });
 });

package/dist/modules/instrumentations/errors/unhandled-error.js

@@ -2,7 +2,7 @@ import { hasOwnProperty, nowNanos, win } from "../../utils";
 import { isErrorMessageIgnored } from "../../utils/ignore-rules";
 import { sendLog } from "../../transport";
 import { EVENT_NAME, EVENT_NAMES, EXCEPTION_COMPONENT_STACK, EXCEPTION_MESSAGE, EXCEPTION_STACKTRACE, EXCEPTION_TYPE, LOG_SEVERITIES, } from "../../semantic-conventions";
-import { addAttribute } from "../../utils/otel";
+import { addAttribute, addAttributes } from "../../utils/otel";
 import { addCommonAttributes } from "../../attributes";
 const MAX_ERRORS_TO_REPORT = 100;
 const MAX_STACK_SIZE = 30;
@@ -75,7 +75,8 @@ function onUnhandledError({ message, type, stack, opts }) {
         trackedError.seenCount++;
     }
     else {
-        const attributes = opts?.attributes ? [...opts.attributes] : [];
+        const attributes = [];
+        addCommonAttributes(attributes);
         addAttribute(attributes, EVENT_NAME, EVENT_NAMES.ERROR);
         addAttribute(attributes, EXCEPTION_MESSAGE, message);
         if (type) {
@@ -87,7 +88,8 @@ function onUnhandledError({ message, type, stack, opts }) {
         if (opts?.componentStack) {
             addAttribute(attributes, EXCEPTION_COMPONENT_STACK, opts?.componentStack.substring(0, 2048));
         }
-        addCommonAttributes(attributes);
+        // Add custom attributes last to allow overrides
+        addAttributes(attributes, opts?.attributes);
         trackedError = {
             seenCount: 1,
             transmittedCount: 0,

package/dist/modules/utils/otel/attributes.js

@@ -44,11 +44,34 @@ export function toKeyValue(key, value) {
         value: toAnyValue(value),
     };
 }
+/**
+ * Adds a single attribute to the provided attributes array
+ */
 export function addAttribute(attributes, key, value) {
     if (!key)
         return;
     attributes.push(toKeyValue(key, value));
 }
+/**
+ * Adds multiple attributes to the provided attributes array
+ */
+export function addAttributes(
+/**
+ * The attributes array to add to
+ */
+attributes, 
+/**
+ * Additional attributes to add
+ * If no attributes are provided, nothing is added
+ */
+attrs) {
+    if (!attrs)
+        return;
+    Object.entries(attrs).forEach(([key, value]) => addAttribute(attributes, key, value));
+}
+/**
+ * Removes an attribute from the provided attributes array by its key
+ */
 export function removeAttribute(attributes, key) {
     const index = attributes.findIndex((attr) => attr["key"] === key);
     if (index !== -1) {