@dash0/sdk-web 0.17.0 → 0.18.0

package/src/api/events.ts

@@ -1,7 +1,7 @@
 import { EVENT_NAME, EVENT_NAMES, WEB_EVENT_TITLE, LOG_SEVERITIES, LOG_SEVERITY_TEXT } from "../semantic-conventions";
 import { sendLog } from "../transport";
 import { addCommonAttributes } from "../attributes";
-import { addAttribute, AttributeValueType, toAnyValue } from "../utils/otel";
+import { addAttribute, addAttributes, AttributeValueType, toAnyValue } from "../utils/otel";
 import { nowNanos, TimeInput, toNanosTs, warn } from "../utils";
 import { AnyValue, KeyValue } from "../types/otlp";
 
@@ -49,14 +49,18 @@ export function sendEvent(name: string, opts?: EventOptions) {
   }
 
   const attributes: KeyValue[] = [];
+
   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/src/instrumentations/errors/unhandled-error.ts

@@ -10,7 +10,7 @@ import {
   EXCEPTION_TYPE,
   LOG_SEVERITIES,
 } from "../../semantic-conventions";
-import { addAttribute } from "../../utils/otel";
+import { addAttribute, addAttributes } from "../../utils/otel";
 import { addCommonAttributes } from "../../attributes";
 import { KeyValue, LogRecord } from "../../types/otlp";
 import { ReportErrorOpts, ErrorLike } from "../../types/errors";
@@ -117,9 +117,13 @@ function onUnhandledError({ message, type, stack, opts }: UnhandledErrorArgs) {
   if (trackedError) {
     trackedError.seenCount++;
   } else {
-    const attributes: KeyValue[] = opts?.attributes ? [...opts.attributes] : [];
+    const attributes: KeyValue[] = [];
+
+    addCommonAttributes(attributes);
+
     addAttribute(attributes, EVENT_NAME, EVENT_NAMES.ERROR);
     addAttribute(attributes, EXCEPTION_MESSAGE, message);
+
     if (type) {
       addAttribute(attributes, EXCEPTION_TYPE, type);
     }
@@ -129,7 +133,9 @@ function onUnhandledError({ message, type, stack, opts }: UnhandledErrorArgs) {
     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,

package/src/types/errors.ts

@@ -1,4 +1,5 @@
-import { KeyValue } from "./otlp";
+import { AttributeValueType } from "../utils/otel";
+import { AnyValue } from "./otlp";
 
 export type ErrorLike = {
   message: string;
@@ -7,9 +8,9 @@ export type ErrorLike = {
 };
 
 export type ReportErrorOpts = {
-  componentStack: string | null | undefined;
+  componentStack?: string | null | undefined;
   /**
    * Additional attributes to add to the error span
    */
-  attributes?: KeyValue[];
+  attributes?: Record<string, AttributeValueType | AnyValue>;
 };

package/src/utils/otel/attributes.ts

@@ -55,12 +55,36 @@ export function toKeyValue(key: string, value: AttributeValueType | AnyValue): K
   };
 }
 
+/**
+ * Adds a single attribute to the provided attributes array
+ */
 export function addAttribute(attributes: KeyValue[], key: string, value: AttributeValueType | AnyValue) {
   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: KeyValue[],
+  /**
+   * Additional attributes to add
+   * If no attributes are provided, nothing is added
+   */
+  attrs: Record<string, AttributeValueType | AnyValue> | undefined
+) {
+  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: KeyValue[], key: string) {
   const index = attributes.findIndex((attr) => attr["key"] === key);
   if (index !== -1) {