@dash0/sdk-web 0.13.3 → 0.13.5

package/dist/types/attributes/common.d.ts

@@ -1,5 +1,8 @@
-import { KeyValue } from "../../types/otlp";
+import { KeyValue } from "../types/otlp";
 type Options = {
+    /**
+     * Override url to be used instead of window.location.href
+     */
     url?: string | URL;
 };
 export declare function addCommonAttributes(attributes: KeyValue[], options?: Options): void;

package/dist/types/attributes/url.d.ts

@@ -1,2 +1,3 @@
-import { KeyValue } from "../../types/otlp";
-export declare function addUrlAttributes(attributes: KeyValue[], url: string | URL): void;
+import { AttrPrefix } from "../utils/otel";
+import { KeyValue } from "../types/otlp";
+export declare function addUrlAttributes(attributes: KeyValue[], url: string | URL, prefix?: AttrPrefix): void;

package/dist/types/instrumentations/errors/unhandled-error.d.ts

@@ -1,4 +1,4 @@
-import { ErrorLike, ReportErrorOpts } from "../../../types/errors";
+import { ReportErrorOpts, ErrorLike } from "../../types/errors";
 export declare function ignoreNextOnErrorEvent(): void;
 export declare function startOnErrorInstrumentation(): void;
 export declare function reportError(error: string | ErrorLike, opts?: ReportErrorOpts): void;

package/dist/types/semantic-conventions.d.ts

@@ -24,6 +24,7 @@ export declare const EXCEPTION_MESSAGE = "exception.message";
 export declare const EXCEPTION_TYPE = "exception.type";
 export declare const EXCEPTION_STACKTRACE = "exception.stacktrace";
 export declare const ERROR_TYPE = "error.type";
+export declare const PAGE_URL_ATTR_PREFIX = "page";
 export declare const URL_DOMAIN = "url.domain";
 export declare const URL_FRAGMENT = "url.fragment";
 export declare const URL_FULL = "url.full";

package/dist/types/transport/index.d.ts

@@ -1,3 +1,3 @@
-import { LogRecord, Span } from "../../types/otlp";
+import { LogRecord, Span } from "../types/otlp";
 export declare function sendLog(log: LogRecord): void;
 export declare function sendSpan(span: Span): void;

package/dist/types/types/errors.d.ts

@@ -0,0 +1,8 @@
+export type ErrorLike = {
+    message: string;
+    name?: string;
+    stack?: string;
+};
+export type ReportErrorOpts = {
+    componentStack: string | null | undefined;
+};

package/dist/types/types/globals.d.ts

@@ -0,0 +1,12 @@
+export {};
+declare global {
+    interface Window {
+        Zone?: any;
+    }
+    type ErrorLike = {
+        message: string;
+        stack?: string;
+        [key: string]: number | string | null | undefined;
+    };
+    let __sdkVersion: string;
+}

package/dist/types/types/otlp.d.ts

@@ -0,0 +1,104 @@
+import { LOG_SEVERITY_NUMBER, LOG_SEVERITY_TEXT } from "../semantic-conventions";
+export type AnyValue = {
+    ["stringValue"]?: string;
+    ["boolValue"]?: boolean;
+    /** Format: int64 */
+    ["intValue"]?: string;
+    /** Format: double */
+    ["doubleValue"]?: number;
+    ["arrayValue"]?: ArrayValue;
+    ["kvlistValue"]?: KeyValueList;
+    /** Format: byte */
+    ["bytesValue"]?: string;
+};
+export type ArrayValue = {
+    ["values"]: AnyValue[];
+};
+export type KeyValue = {
+    ["key"]: string;
+    ["value"]: AnyValue;
+};
+export type KeyValueList = {
+    ["values"]: KeyValue[];
+};
+export type Resource = {
+    ["attributes"]: KeyValue[];
+};
+export type InstrumentationScope = {
+    ["name"]?: string;
+    ["version"]?: string;
+    ["attributes"]: KeyValue[];
+};
+export type ExportLogsServiceRequest = {
+    resourceLogs: ResourceLogs[];
+};
+export type ResourceLogs = {
+    resource: Resource;
+    scopeLogs: ScopeLogs[];
+};
+export type ScopeLogs = {
+    scope?: InstrumentationScope;
+    logRecords: LogRecord[];
+    schemaUrl?: string;
+};
+export type LogRecord = {
+    /** Format: uint64 */
+    timeUnixNano: string;
+    severityNumber?: LOG_SEVERITY_NUMBER;
+    severityText?: LOG_SEVERITY_TEXT;
+    body?: AnyValue;
+    attributes: KeyValue[];
+    /** Format: byte */
+    traceId?: string;
+    /** Format: byte */
+    spanId?: string;
+};
+export type ExportTraceServiceRequest = {
+    resourceSpans: ResourceSpans[];
+};
+export type ResourceSpans = {
+    resource: Resource;
+    scopeSpans: ScopeSpans[];
+};
+export type ScopeSpans = {
+    scope?: InstrumentationScope;
+    spans: Span[];
+};
+export type SpanStatus = {
+    message?: string;
+    code: 0 | 1 | 2;
+};
+export type SpanEvent = {
+    timeUnixNano: string;
+    name: string;
+    attributes: KeyValue[];
+};
+export type SpanLink = {
+    /** Format: byte */
+    traceId: string;
+    /** Format: byte */
+    spanId: string;
+    traceState?: string;
+    attributes: KeyValue[];
+    droppedAttributesCount: number;
+    flags?: number;
+};
+export type Span = {
+    /** Format: byte */
+    traceId: string;
+    /** Format: byte */
+    spanId: string;
+    traceState?: string;
+    /** Format: byte */
+    parentSpanId?: string;
+    name: string;
+    kind: number;
+    startTimeUnixNano: string;
+    endTimeUnixNano: string;
+    attributes: KeyValue[];
+    events: SpanEvent[];
+    /** Format: int64 */
+    droppedEventsCount?: number;
+    links: SpanLink[];
+    status: SpanStatus;
+};

package/dist/types/utils/otel/attributes.d.ts

@@ -1,4 +1,4 @@
-import { AnyValue, KeyValue } from "../../../types/otlp";
+import { AnyValue, KeyValue } from "../../types/otlp";
 type PrimitiveAttributeValue = string | number | boolean;
 export type AttributeValueType = PrimitiveAttributeValue | Array<PrimitiveAttributeValue> | Record<string, PrimitiveAttributeValue>;
 export declare function toAnyValue(value: AttributeValueType | AnyValue): AnyValue;
@@ -6,4 +6,6 @@ export declare function toAnyValue(value?: AttributeValueType | AnyValue): AnyVa
 export declare function toKeyValue(key: string, value: AttributeValueType | AnyValue): KeyValue;
 export declare function addAttribute(attributes: KeyValue[], key: string, value: AttributeValueType | AnyValue): void;
 export declare function removeAttribute(attributes: KeyValue[], key: string): void;
+export type AttrPrefix = string | string[];
+export declare function withPrefix(prefix?: AttrPrefix): (attr: string) => string;
 export {};

package/dist/types/utils/otel/error.d.ts

@@ -1,5 +1,5 @@
 import { InProgressSpan } from "./span";
-import { SpanStatus } from "../../../types/otlp";
+import { SpanStatus } from "../../types/otlp";
 interface ExceptionWithCode {
     code: string | number;
     name?: string;

package/dist/types/utils/otel/span.d.ts

@@ -1,4 +1,4 @@
-import { KeyValue, Span, SpanStatus } from "../../../types/otlp";
+import { KeyValue, Span, SpanStatus } from "../../types/otlp";
 export type InProgressSpan = Omit<Span, "endTimeUnixNano">;
 export declare function startSpan(name: string): InProgressSpan;
 export declare function endSpan(span: InProgressSpan, status: SpanStatus | undefined, durationNano: number | undefined): Span;

package/dist/types/vars.d.ts

@@ -1,5 +1,5 @@
-import { AnyValue, InstrumentationScope, KeyValue, Resource } from "../types/otlp";
 import { AttributeValueType } from "./utils/otel";
+import { AnyValue, InstrumentationScope, KeyValue, Resource } from "./types/otlp";
 export type Endpoint = {
     /**
      * OTLP HTTP URL excluding the /v1/* prefix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dash0/sdk-web",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "description": "Dash0's Web SDK to collect telemetry from end-users' web browsers",
   "type": "module",
   "main": "dist/dash0.umd.cjs",

package/src/api/attributes.ts

@@ -1,6 +1,6 @@
-import { AnyValue } from "../../types/otlp";
 import { addAttribute, AttributeValueType, removeAttribute } from "../utils/otel";
 import { vars } from "../vars";
+import { AnyValue } from "../types/otlp";
 
 /**
  * Adds a signal attribute to be transmitted with every signal.

package/src/api/events.ts

@@ -1,9 +1,9 @@
-import { AnyValue, KeyValue } from "../../types/otlp";
 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 { nowNanos, TimeInput, toNanosTs, warn } from "../utils";
+import { AnyValue, KeyValue } from "../types/otlp";
 
 type EventOptions = {
   /**

package/src/api/init.ts

@@ -25,10 +25,10 @@ import { startWebVitalsInstrumentation } from "../instrumentations/web-vitals";
 import { startErrorInstrumentation } from "../instrumentations/errors";
 import { addAttribute, AttributeValueType } from "../utils/otel";
 import { instrumentFetch } from "../instrumentations/http/fetch";
-import { AnyValue } from "../../types/otlp";
 import { startNavigationInstrumentation } from "../instrumentations/navigation";
 import { merge } from "ts-deepmerge";
 import { initializeTabId } from "../utils/tab-id";
+import { AnyValue } from "../types/otlp";
 
 export type InitOptions = {
   serviceName: string;

package/src/api/report-error.ts

@@ -1,5 +1,5 @@
-import { ErrorLike, ReportErrorOpts } from "../../types/errors";
 import { reportError as reportErrorInternal } from "../instrumentations/errors/unhandled-error";
+import { ReportErrorOpts, ErrorLike } from "../types/errors";
 
 export function reportError(error: string | ErrorLike, opts?: ReportErrorOpts) {
   reportErrorInternal(error, opts);

package/src/attributes/common.ts

@@ -1,8 +1,8 @@
-import { KeyValue } from "../../types/otlp";
 import { generateUniqueId, nav, NO_VALUE_FALLBACK, WEB_EVENT_ID_BYTES, win } from "../utils";
 import {
   BROWSER_TAB_ID,
   NETWORK_CONNECTION_TYPE,
+  PAGE_URL_ATTR_PREFIX,
   SESSION_ID,
   WEB_EVENT_ID,
   WINDOW_HEIGHT,
@@ -13,8 +13,12 @@ import { vars } from "../vars";
 import { addAttribute } from "../utils/otel";
 import { addUrlAttributes } from "./url";
 import { tabId } from "../utils/tab-id";
+import { KeyValue } from "../types/otlp";
 
 type Options = {
+  /**
+   * Override url to be used instead of window.location.href
+   */
   url?: string | URL;
 };
 
@@ -27,7 +31,7 @@ export function addCommonAttributes(attributes: KeyValue[], options?: Options):
     attributes.push(vars.signalAttributes[i]!);
   }
 
-  addUrlAttributes(attributes, options?.url ?? win?.location.href ?? NO_VALUE_FALLBACK);
+  addUrlAttributes(attributes, options?.url ?? win?.location.href ?? NO_VALUE_FALLBACK, PAGE_URL_ATTR_PREFIX);
 
   if (sessionId) {
     addAttribute(attributes, SESSION_ID, sessionId);

package/src/attributes/common_test.ts

@@ -1,11 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { addCommonAttributes } from "./common";
-import { KeyValue } from "../../types/otlp";
 import * as utils from "../utils";
 import * as varsModule from "../vars";
 import * as urlModule from "./url";
 import * as sessionApi from "../api/session";
 import * as tabIdModule from "../utils/tab-id";
+import { KeyValue } from "../types/otlp";
 
 describe("addCommonAttributes", () => {
   beforeEach(() => {

package/src/attributes/url.ts

@@ -1,25 +1,27 @@
-import { KeyValue } from "../../types/otlp";
-import { addAttribute } from "../utils/otel";
+import { addAttribute, AttrPrefix, withPrefix } from "../utils/otel";
 import { URL_DOMAIN, URL_FRAGMENT, URL_FULL, URL_PATH, URL_QUERY, URL_SCHEME } from "../semantic-conventions";
-import { parseUrl } from "../utils/url";
+import { parseUrl } from "../utils";
+import { KeyValue } from "../types/otlp";
+
+export function addUrlAttributes(attributes: KeyValue[], url: string | URL, prefix?: AttrPrefix) {
+  const applyPrefix = withPrefix(prefix);
 
-export function addUrlAttributes(attributes: KeyValue[], url: string | URL) {
   try {
     const parsed = parseUrl(url);
     if (parsed.username) parsed.username = "REDACTED";
     if (parsed.password) parsed.password = "REDACTED";
 
-    addAttribute(attributes, URL_FULL, parsed.href);
-    addAttribute(attributes, URL_PATH, parsed.pathname);
-    addAttribute(attributes, URL_DOMAIN, parsed.hostname);
-    addAttribute(attributes, URL_SCHEME, parsed.protocol.replace(":", ""));
+    addAttribute(attributes, applyPrefix(URL_FULL), parsed.href);
+    addAttribute(attributes, applyPrefix(URL_PATH), parsed.pathname);
+    addAttribute(attributes, applyPrefix(URL_DOMAIN), parsed.hostname);
+    addAttribute(attributes, applyPrefix(URL_SCHEME), parsed.protocol.replace(":", ""));
     if (parsed.hash) {
-      addAttribute(attributes, URL_FRAGMENT, parsed.hash.replace("#", ""));
+      addAttribute(attributes, applyPrefix(URL_FRAGMENT), parsed.hash.replace("#", ""));
     }
     if (parsed.search) {
-      addAttribute(attributes, URL_QUERY, parsed.search.replace("?", ""));
+      addAttribute(attributes, applyPrefix(URL_QUERY), parsed.search.replace("?", ""));
     }
   } catch (_e) {
-    addAttribute(attributes, URL_FULL, String(url));
+    addAttribute(attributes, applyPrefix(URL_FULL), String(url));
   }
 }

package/src/instrumentations/errors/unhandled-error.ts

@@ -1,6 +1,4 @@
-import { KeyValue, LogRecord } from "../../../types/otlp";
 import { hasOwnProperty, nowNanos, win } from "../../utils";
-import { ErrorLike, ReportErrorOpts } from "../../../types/errors";
 import { isErrorMessageIgnored } from "../../utils/ignore-rules";
 import { sendLog } from "../../transport";
 import {
@@ -14,6 +12,8 @@ import {
 } from "../../semantic-conventions";
 import { addAttribute } from "../../utils/otel";
 import { addCommonAttributes } from "../../attributes";
+import { KeyValue, LogRecord } from "../../types/otlp";
+import { ReportErrorOpts, ErrorLike } from "../../types/errors";
 
 type TrackedError = {
   seenCount: number;

package/src/instrumentations/http/fetch.ts

@@ -24,7 +24,7 @@ import { vars } from "../../vars";
 import { httpRequestHeaderKey, httpResponseHeaderKey } from "../../utils/otel/http";
 import { sendSpan } from "../../transport";
 import { addResourceNetworkEvents, addResourceSize, HTTP_METHOD_OTHER, isWellKnownHttpMethod } from "./utils";
-import { addCommonAttributes } from "../../attributes";
+import { addCommonAttributes, addUrlAttributes } from "../../attributes";
 
 export function instrumentFetch() {
   if (!win || !win.fetch || !win.Request) {
@@ -64,8 +64,8 @@ function wrapFetch(original: typeof fetch) {
     const method = isWellKnownMethodMatchingLeniently ? originalMethod.toUpperCase() : HTTP_METHOD_OTHER;
 
     const span = startSpan(`HTTP ${method}`);
-    // The url namespace of a http span has a different meaning than for common rum signals.
-    addCommonAttributes(span.attributes, { url });
+    addCommonAttributes(span.attributes);
+    addUrlAttributes(span.attributes, url);
     addGraphQlProperties(input, init, span);
     addAttribute(span.attributes, HTTP_REQUEST_METHOD, method);
     if (!isWellKnownMethod) {

package/src/instrumentations/navigation/event.ts

@@ -1,4 +1,3 @@
-import { KeyValue, LogRecord } from "../../../types/otlp";
 import { addAttribute, getTraceContextForPageLoad } from "../../utils/otel";
 import {
   EVENT_NAME,
@@ -13,6 +12,7 @@ import { doc, NO_VALUE_FALLBACK } from "../../utils";
 import { addCommonAttributes } from "../../attributes";
 import { sendLog } from "../../transport";
 import { PageViewMeta, vars } from "../../vars";
+import { KeyValue, LogRecord } from "../../types/otlp";
 
 function getPageViewMeta(url?: URL): PageViewMeta {
   if (!url) return {};

package/src/instrumentations/navigation/page-load.ts

@@ -1,10 +1,10 @@
 import { addEventListener, debug, doc, win, roundToTwoDecimals, error, toNanosTs, getTimeOrigin } from "../../utils";
-import { KeyValue, LogRecord } from "../../../types/otlp";
 import { EVENT_NAME, EVENT_NAMES, LOG_SEVERITIES } from "../../semantic-conventions";
 import { sendLog } from "../../transport";
 import { getTraceContextForPageLoad, addAttribute } from "../../utils/otel";
 import { addCommonAttributes } from "../../attributes";
 import { transmitPageViewEvent } from "./event";
+import { KeyValue, LogRecord } from "../../types/otlp";
 
 /**
  * Tracks page loads as per this OTel spec:

package/src/instrumentations/web-vitals.ts

@@ -1,5 +1,5 @@
 import { onLCP, onINP, onCLS, Metric } from "web-vitals";
-import { KeyValue, LogRecord } from "../../types/otlp";
+import { KeyValue, LogRecord } from "../types/otlp";
 import { EVENT_NAME, EVENT_NAMES, LOG_SEVERITIES } from "../semantic-conventions";
 import { nowNanos, roundToTwoDecimals } from "../utils";
 import { sendLog } from "../transport";

package/src/semantic-conventions.ts

@@ -35,6 +35,7 @@ export const EXCEPTION_STACKTRACE = "exception.stacktrace";
 export const ERROR_TYPE = "error.type";
 
 // URL Attribute Keys
+export const PAGE_URL_ATTR_PREFIX = "page";
 export const URL_DOMAIN = "url.domain";
 export const URL_FRAGMENT = "url.fragment";
 export const URL_FULL = "url.full";

package/src/transport/index.ts

@@ -1,9 +1,9 @@
-import { ExportLogsServiceRequest, ExportTraceServiceRequest, LogRecord, Span } from "../../types/otlp";
 import { newBatcher } from "./batcher";
 import { send } from "./fetch";
 import { vars } from "../vars";
 import { createRateLimiter } from "../utils/rate-limit";
 import { debug, error } from "../utils";
+import { ExportLogsServiceRequest, ExportTraceServiceRequest, LogRecord, Span } from "../types/otlp";
 
 const logBatcher = newBatcher<LogRecord>(sendLogs);
 const spanBatcher = newBatcher<Span>(sendSpans);

package/src/types/errors.ts

@@ -0,0 +1,9 @@
+export type ErrorLike = {
+  message: string;
+  name?: string;
+  stack?: string;
+};
+
+export type ReportErrorOpts = {
+  componentStack: string | null | undefined;
+};

package/src/types/globals.ts

@@ -0,0 +1,19 @@
+// Ensure this is treated as a module.
+export {};
+
+declare global {
+  interface Window {
+    Zone?: any;
+  }
+
+  type ErrorLike = {
+    message: string;
+    stack?: string;
+
+    // to permit ['foo'] based access that doesn't break
+    // when pushed through the Closure compiler
+    [key: string]: number | string | null | undefined;
+  };
+
+  let __sdkVersion: string;
+}

package/src/types/otlp.ts

@@ -0,0 +1,121 @@
+import { LOG_SEVERITY_NUMBER, LOG_SEVERITY_TEXT } from "../semantic-conventions";
+
+export type AnyValue = {
+  ["stringValue"]?: string;
+  ["boolValue"]?: boolean;
+  /** Format: int64 */
+  ["intValue"]?: string;
+  /** Format: double */
+  ["doubleValue"]?: number;
+  ["arrayValue"]?: ArrayValue;
+  ["kvlistValue"]?: KeyValueList;
+  /** Format: byte */
+  ["bytesValue"]?: string;
+};
+
+export type ArrayValue = {
+  ["values"]: AnyValue[];
+};
+
+export type KeyValue = {
+  ["key"]: string;
+  ["value"]: AnyValue;
+};
+
+export type KeyValueList = {
+  ["values"]: KeyValue[];
+};
+
+export type Resource = {
+  ["attributes"]: KeyValue[];
+};
+
+export type InstrumentationScope = {
+  ["name"]?: string;
+  ["version"]?: string;
+  ["attributes"]: KeyValue[];
+};
+
+export type ExportLogsServiceRequest = {
+  resourceLogs: ResourceLogs[];
+};
+
+export type ResourceLogs = {
+  resource: Resource;
+  scopeLogs: ScopeLogs[];
+};
+
+export type ScopeLogs = {
+  scope?: InstrumentationScope;
+  logRecords: LogRecord[];
+  schemaUrl?: string;
+};
+
+export type LogRecord = {
+  /** Format: uint64 */
+  timeUnixNano: string;
+  severityNumber?: LOG_SEVERITY_NUMBER;
+  severityText?: LOG_SEVERITY_TEXT;
+  body?: AnyValue;
+  attributes: KeyValue[];
+  /** Format: byte */
+  traceId?: string;
+  /** Format: byte */
+  spanId?: string;
+};
+
+export type ExportTraceServiceRequest = {
+  resourceSpans: ResourceSpans[];
+};
+
+export type ResourceSpans = {
+  resource: Resource;
+  scopeSpans: ScopeSpans[];
+};
+
+export type ScopeSpans = {
+  scope?: InstrumentationScope;
+  spans: Span[];
+};
+
+export type SpanStatus = {
+  message?: string;
+  code: 0 | 1 | 2;
+};
+
+export type SpanEvent = {
+  timeUnixNano: string;
+  name: string;
+  attributes: KeyValue[];
+};
+
+export type SpanLink = {
+  /** Format: byte */
+  traceId: string;
+  /** Format: byte */
+  spanId: string;
+  traceState?: string;
+  attributes: KeyValue[];
+  droppedAttributesCount: number;
+  flags?: number;
+};
+
+export type Span = {
+  /** Format: byte */
+  traceId: string;
+  /** Format: byte */
+  spanId: string;
+  traceState?: string;
+  /** Format: byte */
+  parentSpanId?: string;
+  name: string;
+  kind: number;
+  startTimeUnixNano: string;
+  endTimeUnixNano: string;
+  attributes: KeyValue[];
+  events: SpanEvent[];
+  /** Format: int64 */
+  droppedEventsCount?: number;
+  links: SpanLink[];
+  status: SpanStatus;
+};

package/src/utils/otel/attributes.ts

@@ -1,4 +1,4 @@
-import { AnyValue, KeyValue } from "../../../types/otlp";
+import { AnyValue, KeyValue } from "../../types/otlp";
 
 type PrimitiveAttributeValue = string | number | boolean;
 export type AttributeValueType =
@@ -67,3 +67,14 @@ export function removeAttribute(attributes: KeyValue[], key: string) {
     attributes.splice(index, 1);
   }
 }
+
+export type AttrPrefix = string | string[];
+export function withPrefix(prefix?: AttrPrefix): (attr: string) => string {
+  if (!prefix) return (attr) => attr;
+
+  if (Array.isArray(prefix)) {
+    return (attr) => [...prefix, attr].join(".");
+  }
+
+  return (attr) => `${prefix}.${attr}`;
+}

package/src/utils/otel/attributes_test.ts

@@ -1,6 +1,6 @@
 import { expect, describe, it } from "vitest";
 import { addAttribute, toAnyValue } from "./attributes";
-import { AnyValue, KeyValue } from "../../../types/otlp";
+import { AnyValue, KeyValue } from "../../types/otlp";
 
 describe("toAnyValue", () => {
   describe("primitive values", () => {

package/src/utils/otel/error.ts

@@ -1,5 +1,4 @@
 import { addSpanEvent, InProgressSpan } from "./span";
-import { KeyValue, SpanStatus } from "../../../types/otlp";
 import { addAttribute } from "./attributes";
 import {
   SPAN_EVENT_NAME_EXCEPTION,
@@ -8,6 +7,7 @@ import {
   EXCEPTION_TYPE,
   SPAN_STATUS_ERROR,
 } from "../../semantic-conventions";
+import { KeyValue, SpanStatus } from "../../types/otlp";
 
 interface ExceptionWithCode {
   code: string | number;

package/src/utils/otel/span.ts

@@ -1,10 +1,10 @@
-import { KeyValue, Span, SpanStatus } from "../../../types/otlp";
 import { nowNanos } from "../time";
 import { SPAN_KIND_CLIENT, SPAN_STATUS_UNSET, WEB_EVENT_ID } from "../../semantic-conventions";
 import { sessionId } from "../../api/session";
 import { generateTraceId } from "../trace-id";
 import { generateSpanId } from "../span-id";
 import { addAttribute } from "./attributes";
+import { KeyValue, Span, SpanStatus } from "../../types/otlp";
 
 export type InProgressSpan = Omit<Span, "endTimeUnixNano">;
 

package/src/vars.ts

@@ -1,7 +1,5 @@
-// TODO use OTel types here?
-
-import { AnyValue, InstrumentationScope, KeyValue, Resource } from "../types/otlp";
 import { AttributeValueType } from "./utils/otel";
+import { AnyValue, InstrumentationScope, KeyValue, Resource } from "./types/otlp";
 
 export type Endpoint = {
   /**