@dash0/sdk-web 0.18.0 → 0.18.2

package/src/api/init.ts

@@ -19,6 +19,7 @@ import {
   win,
   NO_VALUE_FALLBACK,
   pick,
+  loc,
 } from "../utils";
 import { trackSessions } from "./session";
 import { startWebVitalsInstrumentation } from "../instrumentations/web-vitals";
@@ -44,10 +45,15 @@ export function init(opts: InitOptions) {
   }
 
   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/src/api/init_test.ts

@@ -1,6 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { InitOptions, InstrumentationName } from "../types/options";
 import { PropagatorConfig, Vars } from "../vars";
+import { SERVICE_NAME } from "../semantic-conventions";
 import { init as initFun } from "./init";
 
 // Mock all the instrumentation modules
@@ -20,6 +21,15 @@ 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";
@@ -226,4 +236,71 @@ 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");
+    });
+  });
 });