@opentelemetry/browser-instrumentation 0.6.0 → 0.8.0

package/dist/xhr/instrumentation.js

@@ -0,0 +1,187 @@
+import { version } from "../package.js";
+import { getNetworkContextRegistry } from "../utils/NetworkContextRegistry.js";
+import { getXHRBodyLength, normalizeHttpRequestMethod } from "../utils/request.js";
+import { matchesUrl, parseUrl, serverPortFromUrl } from "../utils/url.js";
+import { ATTR_HTTP_REQUEST_BODY_SIZE } from "./semconv.js";
+import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
+import { InstrumentationBase, safeExecuteInTheMiddle } from "@opentelemetry/instrumentation";
+import { ATTR_ERROR_TYPE, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_REQUEST_METHOD_ORIGINAL, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
+//#region src/xhr/instrumentation.ts
+var XhrInstrumentation = class extends InstrumentationBase {
+	_xhrSpanMap = /* @__PURE__ */ new WeakMap();
+	constructor(config = {}) {
+		super("@opentelemetry/browser-instrumentation/xhr", version, config);
+	}
+	init() {
+		return [];
+	}
+	enable() {
+		if (this._isEnabled) return;
+		if (this._isXhrPatched) {
+			this._diag.debug("XMLHttpRequest prototype already patched");
+			this._isEnabled = true;
+			return;
+		}
+		try {
+			this._wrap(XMLHttpRequest.prototype, "open", this._patchOpen());
+		} catch (err) {
+			this._diag.warn("Failed to patch XMLHttpRequest.prototype.open; instrumentation will not be enabled. Another script may have locked XMLHttpRequest.prototype.open via Object.defineProperty.", err);
+			return;
+		}
+		try {
+			this._wrap(XMLHttpRequest.prototype, "send", this._patchSend());
+			this._isXhrPatched = true;
+			this._isEnabled = true;
+		} catch (err) {
+			this._unwrap(XMLHttpRequest.prototype, "open");
+			this._diag.warn("Failed to patch XMLHttpRequest.prototype.send; instrumentation will not be enabled. Another script may have locked XMLHttpRequest.prototype.send via Object.defineProperty.", err);
+		}
+	}
+	disable() {
+		if (!this._isEnabled) return;
+		this._isEnabled = false;
+	}
+	/**
+	* Patches the "open" method of XmlHttpRequest
+	*/
+	_patchOpen() {
+		return (original) => {
+			const instrumentation = this;
+			return function patchedOpen(...args) {
+				if (!instrumentation._isEnabled) return original.apply(this, args);
+				try {
+					const method = args[0];
+					const urlArgument = typeof args[1] === "string" ? args[1] : args[1].toString();
+					const url = parseUrl(urlArgument);
+					if (matchesUrl(url.href, instrumentation.getConfig().ignoreUrls)) return original.apply(this, args);
+					instrumentation._xhrSpanMap.set(this, {
+						method,
+						url
+					});
+				} catch (e) {
+					instrumentation._diag.error("Failed to instrument XmlHttpRequest.open", e);
+				}
+				return original.apply(this, args);
+			};
+		};
+	}
+	/**
+	* Patches the "open" method of XmlHttpRequest
+	*/
+	_patchSend() {
+		return (original) => {
+			const instrumentation = this;
+			return function patchedSend(...args) {
+				if (!instrumentation._isEnabled) return original.apply(this, args);
+				const xhrRecord = instrumentation._xhrSpanMap.get(this);
+				if (xhrRecord) try {
+					const { method, url } = xhrRecord;
+					const span = instrumentation._createSpan(url, method);
+					xhrRecord.span = span;
+					xhrRecord.start = performance.now();
+					if (instrumentation.getConfig().measureRequestSize && args?.[0]) {
+						const bodyLength = getXHRBodyLength(args[0]);
+						if (bodyLength) span.setAttribute(ATTR_HTTP_REQUEST_BODY_SIZE, bodyLength);
+					}
+					const onAbort = () => instrumentation._endSpan(this, "abort");
+					const onError = () => instrumentation._endSpan(this, "error");
+					const onTimeout = () => instrumentation._endSpan(this, "timeout");
+					const onLoad = () => instrumentation._endSpan(this, "load");
+					xhrRecord.listeners = {
+						abort: onAbort,
+						error: onError,
+						timeout: onTimeout,
+						load: onLoad
+					};
+					const xhrContext = trace.setSpan(context.active(), span);
+					context.with(xhrContext, () => {
+						this.addEventListener("abort", onAbort);
+						this.addEventListener("error", onError);
+						this.addEventListener("timeout", onTimeout);
+						this.addEventListener("load", onLoad);
+						instrumentation._addHeaders(this, url, xhrContext);
+					});
+				} catch (e) {
+					instrumentation._diag.error("Failed to instrument fetch request", e);
+					instrumentation._xhrSpanMap.delete(this);
+				}
+				return original.apply(this, args);
+			};
+		};
+	}
+	/**
+	* Creates a new span when method "send" is called
+	*/
+	_createSpan(url, method) {
+		const origMethod = method;
+		const normMethod = normalizeHttpRequestMethod(method);
+		const attributes = {};
+		const { sanitizeUrl } = this.getConfig();
+		attributes[ATTR_HTTP_REQUEST_METHOD] = normMethod;
+		if (normMethod !== origMethod) attributes[ATTR_HTTP_REQUEST_METHOD_ORIGINAL] = origMethod;
+		attributes[ATTR_URL_FULL] = sanitizeUrl ? sanitizeUrl(url.href) : url.href;
+		attributes[ATTR_SERVER_ADDRESS] = url.hostname;
+		const serverPort = serverPortFromUrl(url);
+		if (serverPort) attributes[ATTR_SERVER_PORT] = serverPort;
+		return this.tracer.startSpan(normMethod, {
+			kind: SpanKind.CLIENT,
+			attributes
+		});
+	}
+	/**
+	* Finish span, add attributes, network events etc.
+	*/
+	_endSpan(xhr, eventName) {
+		const xhrRecord = this._xhrSpanMap.get(xhr);
+		if (xhrRecord?.listeners) for (const k of Object.keys(xhrRecord.listeners)) xhr.removeEventListener(k, xhrRecord.listeners[k]);
+		if (xhrRecord?.span) {
+			const { span, url, start } = xhrRecord;
+			if (eventName === "load") span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, xhr.status);
+			if (eventName !== "abort") {
+				if (xhr.status >= 400 || eventName === "error" || eventName === "timeout") {
+					span.setStatus({ code: SpanStatusCode.ERROR });
+					const errorType = xhr.status >= 400 ? String(xhr.status) : eventName === "error" ? "Error" : "TimeoutError";
+					span.setAttribute(ATTR_ERROR_TYPE, errorType);
+				}
+			}
+			this._xhrSpanMap.delete(xhr);
+			this._applyAttributesAfterSend(span, xhr);
+			span.end();
+			getNetworkContextRegistry().register(span, {
+				key: url.href,
+				startPerfNow: Number(start),
+				endPerfNow: performance.now()
+			});
+		}
+	}
+	/**
+	* Runs the user provided `applyCustomAttributesOnSpan` function
+	*/
+	_applyAttributesAfterSend(span, xhr) {
+		const applyCustomAttributesOnSpan = this.getConfig().applyCustomAttributesOnSpan;
+		if (applyCustomAttributesOnSpan) safeExecuteInTheMiddle(() => applyCustomAttributesOnSpan(span, xhr), (error) => {
+			if (!error) return;
+			this._diag.error("applyCustomAttributesOnSpan", error);
+		}, true);
+	}
+	/**
+	* Adds custom headers to XMLHttpRequest
+	*/
+	_addHeaders(xhr, url, ctx) {
+		const urlsToPropagate = this.getConfig().propagateTraceHeaderCorsUrls;
+		if (location.origin === url.origin || matchesUrl(url.href, urlsToPropagate)) propagation.inject(ctx, xhr, { set: (x, k, v) => {
+			x.setRequestHeader(k, typeof v === "string" ? v : String(v));
+		} });
+		else {
+			const headers = {};
+			propagation.inject(ctx, headers, { set: (h, k, v) => {
+				h[k] = v;
+			} });
+			if (Object.keys(headers).length > 0) this._diag.debug("headers inject skipped due to CORS policy");
+		}
+	}
+};
+//#endregion
+export { XhrInstrumentation };
+
+//# sourceMappingURL=instrumentation.js.map

package/dist/xhr/instrumentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentation.js","names":[],"sources":["../../src/xhr/instrumentation.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { Attributes, Context, Span } from '@opentelemetry/api';\nimport {\n  context,\n  propagation,\n  SpanKind,\n  SpanStatusCode,\n  trace,\n} from '@opentelemetry/api';\nimport {\n  InstrumentationBase,\n  safeExecuteInTheMiddle,\n} from '@opentelemetry/instrumentation';\nimport {\n  ATTR_ERROR_TYPE,\n  ATTR_HTTP_REQUEST_METHOD,\n  ATTR_HTTP_REQUEST_METHOD_ORIGINAL,\n  ATTR_HTTP_RESPONSE_STATUS_CODE,\n  ATTR_SERVER_ADDRESS,\n  ATTR_SERVER_PORT,\n  ATTR_URL_FULL,\n} from '@opentelemetry/semantic-conventions';\nimport { version } from '../../package.json' with { type: 'json' };\nimport { getNetworkContextRegistry } from '../utils/NetworkContextRegistry.ts';\nimport {\n  getXHRBodyLength,\n  normalizeHttpRequestMethod,\n} from '../utils/request.ts';\nimport { matchesUrl, parseUrl, serverPortFromUrl } from '../utils/url.ts';\nimport { ATTR_HTTP_REQUEST_BODY_SIZE } from './semconv.ts';\nimport type { XhrInstrumentationConfig } from './types.ts';\n\ntype XhrOpenFunction = typeof XMLHttpRequest.prototype.open;\ntype XhrSendFunction = typeof XMLHttpRequest.prototype.send;\ntype XhrEventName = 'abort' | 'timeout' | 'error' | 'load';\ntype XhrRecord = {\n  method: string;\n  url: URL;\n  start?: number;\n  span?: Span;\n  listeners?: Record<XhrEventName, (...args: unknown[]) => unknown>;\n};\n\nexport class XhrInstrumentation extends InstrumentationBase<XhrInstrumentationConfig> {\n  // Note: Intentionally *not* using `_enabled` as the field name to avoid\n  // any possible confusion with the `_enabled` field used on the *Node.js*\n  // InstrumentationBase class.\n  // Also not initializing the fields to `false` because the base class\n  // constructor already call `enable` modifying their values and it will\n  // set the instrumentaitons in a base state (enabled, patched but with flags set to false)\n  private declare _isEnabled: boolean;\n  private declare _isXhrPatched: boolean;\n\n  // To keep references to span/xhr tuples across XHR events and stores\n  // init data like URL and method\n  private _xhrSpanMap: WeakMap<XMLHttpRequest, XhrRecord> = new WeakMap();\n\n  constructor(config: XhrInstrumentationConfig = {}) {\n    super('@opentelemetry/browser-instrumentation/xhr', version, config);\n  }\n\n  protected override init() {\n    return [];\n  }\n\n  override enable(): void {\n    if (this._isEnabled) {\n      return;\n    }\n\n    if (this._isXhrPatched) {\n      this._diag.debug('XMLHttpRequest prototype already patched');\n      this._isEnabled = true;\n      return;\n    }\n\n    // `_wrap` throws if a third-party script has locked the target methods via\n    // Object.defineProperty(XMLHttpRequest.prototype, 'open', { writable: false, ... }).\n    try {\n      this._wrap(XMLHttpRequest.prototype, 'open', this._patchOpen());\n    } catch (err) {\n      this._diag.warn(\n        'Failed to patch XMLHttpRequest.prototype.open; instrumentation will not be enabled. ' +\n          'Another script may have locked XMLHttpRequest.prototype.open via Object.defineProperty.',\n        err,\n      );\n      return;\n    }\n\n    // If 1st patch has succeded try the second. Unpatch `open` if error\n    // here to avoid having multiple patches of `open`\n    try {\n      this._wrap(XMLHttpRequest.prototype, 'send', this._patchSend());\n      this._isXhrPatched = true;\n      this._isEnabled = true;\n    } catch (err) {\n      this._unwrap(XMLHttpRequest.prototype, 'open');\n      this._diag.warn(\n        'Failed to patch XMLHttpRequest.prototype.send; instrumentation will not be enabled. ' +\n          'Another script may have locked XMLHttpRequest.prototype.send via Object.defineProperty.',\n        err,\n      );\n    }\n  }\n\n  override disable(): void {\n    if (!this._isEnabled) {\n      return;\n    }\n    this._isEnabled = false;\n  }\n\n  /**\n   * Patches the \"open\" method of XmlHttpRequest\n   */\n  private _patchOpen(): (original: XhrOpenFunction) => XhrOpenFunction {\n    return (original) => {\n      const instrumentation = this;\n\n      return function patchedOpen(\n        this: XMLHttpRequest,\n        ...args: Parameters<XhrOpenFunction>\n      ): ReturnType<XhrOpenFunction> {\n        if (!instrumentation._isEnabled) {\n          return original.apply(this, args);\n        }\n        try {\n          const method = args[0];\n          const urlArgument =\n            typeof args[1] === 'string' ? args[1] : args[1].toString();\n          const url = parseUrl(urlArgument);\n          const shouldIgnoreUrl = matchesUrl(\n            url.href,\n            instrumentation.getConfig().ignoreUrls,\n          );\n          if (shouldIgnoreUrl) {\n            return original.apply(this, args);\n          }\n          instrumentation._xhrSpanMap.set(this, { method, url });\n        } catch (e: unknown) {\n          instrumentation._diag.error(\n            'Failed to instrument XmlHttpRequest.open',\n            e,\n          );\n        }\n        return original.apply(this, args);\n      } as XhrOpenFunction;\n    };\n  }\n\n  /**\n   * Patches the \"open\" method of XmlHttpRequest\n   */\n  private _patchSend(): (original: XhrSendFunction) => XhrSendFunction {\n    return (original) => {\n      const instrumentation = this;\n\n      return function patchedSend(\n        this: XMLHttpRequest,\n        ...args: Parameters<XhrSendFunction>\n      ): ReturnType<XhrSendFunction> {\n        if (!instrumentation._isEnabled) {\n          return original.apply(this, args);\n        }\n\n        // Instrument the method if the XHR was previously picked in `open`\n        const xhrRecord = instrumentation._xhrSpanMap.get(this);\n        if (xhrRecord) {\n          try {\n            const { method, url } = xhrRecord;\n            const span = instrumentation._createSpan(url, method);\n            xhrRecord.span = span;\n            xhrRecord.start = performance.now();\n\n            if (instrumentation.getConfig().measureRequestSize && args?.[0]) {\n              const bodyLength = getXHRBodyLength(args[0]);\n              if (bodyLength) {\n                span.setAttribute(ATTR_HTTP_REQUEST_BODY_SIZE, bodyLength);\n              }\n            }\n\n            const onAbort = () => instrumentation._endSpan(this, 'abort');\n            const onError = () => instrumentation._endSpan(this, 'error');\n            const onTimeout = () => instrumentation._endSpan(this, 'timeout');\n            const onLoad = () => instrumentation._endSpan(this, 'load');\n            xhrRecord.listeners = {\n              abort: onAbort,\n              error: onError,\n              timeout: onTimeout,\n              load: onLoad,\n            };\n\n            const xhrContext = trace.setSpan(context.active(), span);\n            context.with(xhrContext, () => {\n              this.addEventListener('abort', onAbort);\n              this.addEventListener('error', onError);\n              this.addEventListener('timeout', onTimeout);\n              this.addEventListener('load', onLoad);\n              instrumentation._addHeaders(this, url, xhrContext);\n            });\n          } catch (e: unknown) {\n            // failed to instrument request, remove span\n            instrumentation._diag.error(\n              'Failed to instrument fetch request',\n              e,\n            );\n            instrumentation._xhrSpanMap.delete(this);\n          }\n        }\n        return original.apply(this, args);\n      } as XhrSendFunction;\n    };\n  }\n\n  /**\n   * Creates a new span when method \"send\" is called\n   */\n  private _createSpan(url: URL, method: string): Span {\n    const origMethod = method;\n    const normMethod = normalizeHttpRequestMethod(method);\n    const attributes = {} as Attributes;\n    const { sanitizeUrl } = this.getConfig();\n\n    attributes[ATTR_HTTP_REQUEST_METHOD] = normMethod;\n    if (normMethod !== origMethod) {\n      attributes[ATTR_HTTP_REQUEST_METHOD_ORIGINAL] = origMethod;\n    }\n    attributes[ATTR_URL_FULL] = sanitizeUrl ? sanitizeUrl(url.href) : url.href;\n    attributes[ATTR_SERVER_ADDRESS] = url.hostname;\n    const serverPort = serverPortFromUrl(url);\n    if (serverPort) {\n      attributes[ATTR_SERVER_PORT] = serverPort;\n    }\n\n    return this.tracer.startSpan(normMethod, {\n      kind: SpanKind.CLIENT,\n      attributes,\n    });\n  }\n\n  /**\n   * Finish span, add attributes, network events etc.\n   */\n  private _endSpan(xhr: XMLHttpRequest, eventName: XhrEventName) {\n    const xhrRecord = this._xhrSpanMap.get(xhr);\n\n    if (xhrRecord?.listeners) {\n      for (const k of Object.keys(xhrRecord.listeners)) {\n        xhr.removeEventListener(\n          k as XhrEventName,\n          xhrRecord.listeners[k as XhrEventName],\n        );\n      }\n    }\n\n    if (xhrRecord?.span) {\n      const { span, url, start } = xhrRecord;\n\n      // Status code only has a meaningful value if request got a response\n      if (eventName === 'load') {\n        span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, xhr.status);\n      }\n\n      if (eventName !== 'abort') {\n        // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-spans.md#status\n        // 1xx/2xx/3xx MUST be left unset UNLESS there was another error (e.g. a\n        // network error receiving the response body)\n        const isErrorStatus =\n          xhr.status >= 400 || eventName === 'error' || eventName === 'timeout';\n\n        if (isErrorStatus) {\n          span.setStatus({ code: SpanStatusCode.ERROR });\n          const errorType =\n            xhr.status >= 400\n              ? String(xhr.status)\n              : eventName === 'error'\n                ? 'Error'\n                : 'TimeoutError';\n          span.setAttribute(ATTR_ERROR_TYPE, errorType);\n        }\n      }\n\n      this._xhrSpanMap.delete(xhr);\n      this._applyAttributesAfterSend(span, xhr);\n      span.end();\n\n      getNetworkContextRegistry().register(span, {\n        key: url.href,\n        startPerfNow: Number(start),\n        endPerfNow: performance.now(),\n      });\n    }\n  }\n\n  /**\n   * Runs the user provided `applyCustomAttributesOnSpan` function\n   */\n  private _applyAttributesAfterSend(span: Span, xhr: XMLHttpRequest) {\n    const applyCustomAttributesOnSpan =\n      this.getConfig().applyCustomAttributesOnSpan;\n    if (applyCustomAttributesOnSpan) {\n      safeExecuteInTheMiddle(\n        () => applyCustomAttributesOnSpan(span, xhr),\n        (error) => {\n          if (!error) {\n            return;\n          }\n          this._diag.error('applyCustomAttributesOnSpan', error);\n        },\n        true,\n      );\n    }\n  }\n\n  /**\n   * Adds custom headers to XMLHttpRequest\n   */\n  private _addHeaders(xhr: XMLHttpRequest, url: URL, ctx: Context) {\n    // Propagate only if in request goes to same origin or is in the allow list\n    const urlsToPropagate = this.getConfig().propagateTraceHeaderCorsUrls;\n    const sameOrigin = location.origin === url.origin;\n    const shouldPropagate = sameOrigin || matchesUrl(url.href, urlsToPropagate);\n\n    if (shouldPropagate) {\n      propagation.inject(ctx, xhr, {\n        set: (x, k, v) => {\n          x.setRequestHeader(k, typeof v === 'string' ? v : String(v));\n        },\n      });\n    } else {\n      const headers: Partial<Record<string, unknown>> = {};\n      propagation.inject(ctx, headers, {\n        set: (h, k, v) => {\n          h[k] = v;\n        },\n      });\n      if (Object.keys(headers).length > 0) {\n        this._diag.debug('headers inject skipped due to CORS policy');\n      }\n    }\n  }\n}\n"],"mappings":";;;;;;;;;AA+CA,IAAa,qBAAb,cAAwC,oBAA8C;CAYpF,8BAA0D,IAAI,QAAQ;CAEtE,YAAY,SAAmC,CAAC,GAAG;EACjD,MAAM,8CAA8C,SAAS,MAAM;CACrE;CAEA,OAA0B;EACxB,OAAO,CAAC;CACV;CAEA,SAAwB;EACtB,IAAI,KAAK,YACP;EAGF,IAAI,KAAK,eAAe;GACtB,KAAK,MAAM,MAAM,0CAA0C;GAC3D,KAAK,aAAa;GAClB;EACF;EAIA,IAAI;GACF,KAAK,MAAM,eAAe,WAAW,QAAQ,KAAK,WAAW,CAAC;EAChE,SAAS,KAAK;GACZ,KAAK,MAAM,KACT,+KAEA,GACF;GACA;EACF;EAIA,IAAI;GACF,KAAK,MAAM,eAAe,WAAW,QAAQ,KAAK,WAAW,CAAC;GAC9D,KAAK,gBAAgB;GACrB,KAAK,aAAa;EACpB,SAAS,KAAK;GACZ,KAAK,QAAQ,eAAe,WAAW,MAAM;GAC7C,KAAK,MAAM,KACT,+KAEA,GACF;EACF;CACF;CAEA,UAAyB;EACvB,IAAI,CAAC,KAAK,YACR;EAEF,KAAK,aAAa;CACpB;;;;CAKA,aAAqE;EACnE,QAAQ,aAAa;GACnB,MAAM,kBAAkB;GAExB,OAAO,SAAS,YAEd,GAAG,MAC0B;IAC7B,IAAI,CAAC,gBAAgB,YACnB,OAAO,SAAS,MAAM,MAAM,IAAI;IAElC,IAAI;KACF,MAAM,SAAS,KAAK;KACpB,MAAM,cACJ,OAAO,KAAK,OAAO,WAAW,KAAK,KAAK,KAAK,EAAE,CAAC,SAAS;KAC3D,MAAM,MAAM,SAAS,WAAW;KAKhC,IAJwB,WACtB,IAAI,MACJ,gBAAgB,UAAU,CAAC,CAAC,UAEZ,GAChB,OAAO,SAAS,MAAM,MAAM,IAAI;KAElC,gBAAgB,YAAY,IAAI,MAAM;MAAE;MAAQ;KAAI,CAAC;IACvD,SAAS,GAAY;KACnB,gBAAgB,MAAM,MACpB,4CACA,CACF;IACF;IACA,OAAO,SAAS,MAAM,MAAM,IAAI;GAClC;EACF;CACF;;;;CAKA,aAAqE;EACnE,QAAQ,aAAa;GACnB,MAAM,kBAAkB;GAExB,OAAO,SAAS,YAEd,GAAG,MAC0B;IAC7B,IAAI,CAAC,gBAAgB,YACnB,OAAO,SAAS,MAAM,MAAM,IAAI;IAIlC,MAAM,YAAY,gBAAgB,YAAY,IAAI,IAAI;IACtD,IAAI,WACF,IAAI;KACF,MAAM,EAAE,QAAQ,QAAQ;KACxB,MAAM,OAAO,gBAAgB,YAAY,KAAK,MAAM;KACpD,UAAU,OAAO;KACjB,UAAU,QAAQ,YAAY,IAAI;KAElC,IAAI,gBAAgB,UAAU,CAAC,CAAC,sBAAsB,OAAO,IAAI;MAC/D,MAAM,aAAa,iBAAiB,KAAK,EAAE;MAC3C,IAAI,YACF,KAAK,aAAa,6BAA6B,UAAU;KAE7D;KAEA,MAAM,gBAAgB,gBAAgB,SAAS,MAAM,OAAO;KAC5D,MAAM,gBAAgB,gBAAgB,SAAS,MAAM,OAAO;KAC5D,MAAM,kBAAkB,gBAAgB,SAAS,MAAM,SAAS;KAChE,MAAM,eAAe,gBAAgB,SAAS,MAAM,MAAM;KAC1D,UAAU,YAAY;MACpB,OAAO;MACP,OAAO;MACP,SAAS;MACT,MAAM;KACR;KAEA,MAAM,aAAa,MAAM,QAAQ,QAAQ,OAAO,GAAG,IAAI;KACvD,QAAQ,KAAK,kBAAkB;MAC7B,KAAK,iBAAiB,SAAS,OAAO;MACtC,KAAK,iBAAiB,SAAS,OAAO;MACtC,KAAK,iBAAiB,WAAW,SAAS;MAC1C,KAAK,iBAAiB,QAAQ,MAAM;MACpC,gBAAgB,YAAY,MAAM,KAAK,UAAU;KACnD,CAAC;IACH,SAAS,GAAY;KAEnB,gBAAgB,MAAM,MACpB,sCACA,CACF;KACA,gBAAgB,YAAY,OAAO,IAAI;IACzC;IAEF,OAAO,SAAS,MAAM,MAAM,IAAI;GAClC;EACF;CACF;;;;CAKA,YAAoB,KAAU,QAAsB;EAClD,MAAM,aAAa;EACnB,MAAM,aAAa,2BAA2B,MAAM;EACpD,MAAM,aAAa,CAAC;EACpB,MAAM,EAAE,gBAAgB,KAAK,UAAU;EAEvC,WAAW,4BAA4B;EACvC,IAAI,eAAe,YACjB,WAAW,qCAAqC;EAElD,WAAW,iBAAiB,cAAc,YAAY,IAAI,IAAI,IAAI,IAAI;EACtE,WAAW,uBAAuB,IAAI;EACtC,MAAM,aAAa,kBAAkB,GAAG;EACxC,IAAI,YACF,WAAW,oBAAoB;EAGjC,OAAO,KAAK,OAAO,UAAU,YAAY;GACvC,MAAM,SAAS;GACf;EACF,CAAC;CACH;;;;CAKA,SAAiB,KAAqB,WAAyB;EAC7D,MAAM,YAAY,KAAK,YAAY,IAAI,GAAG;EAE1C,IAAI,WAAW,WACb,KAAK,MAAM,KAAK,OAAO,KAAK,UAAU,SAAS,GAC7C,IAAI,oBACF,GACA,UAAU,UAAU,EACtB;EAIJ,IAAI,WAAW,MAAM;GACnB,MAAM,EAAE,MAAM,KAAK,UAAU;GAG7B,IAAI,cAAc,QAChB,KAAK,aAAa,gCAAgC,IAAI,MAAM;GAG9D,IAAI,cAAc,SAKd;QAAA,IAAI,UAAU,OAAO,cAAc,WAAW,cAAc,WAE3C;KACjB,KAAK,UAAU,EAAE,MAAM,eAAe,MAAM,CAAC;KAC7C,MAAM,YACJ,IAAI,UAAU,MACV,OAAO,IAAI,MAAM,IACjB,cAAc,UACZ,UACA;KACR,KAAK,aAAa,iBAAiB,SAAS;IAC9C;;GAGF,KAAK,YAAY,OAAO,GAAG;GAC3B,KAAK,0BAA0B,MAAM,GAAG;GACxC,KAAK,IAAI;GAET,0BAA0B,CAAC,CAAC,SAAS,MAAM;IACzC,KAAK,IAAI;IACT,cAAc,OAAO,KAAK;IAC1B,YAAY,YAAY,IAAI;GAC9B,CAAC;EACH;CACF;;;;CAKA,0BAAkC,MAAY,KAAqB;EACjE,MAAM,8BACJ,KAAK,UAAU,CAAC,CAAC;EACnB,IAAI,6BACF,6BACQ,4BAA4B,MAAM,GAAG,IAC1C,UAAU;GACT,IAAI,CAAC,OACH;GAEF,KAAK,MAAM,MAAM,+BAA+B,KAAK;EACvD,GACA,IACF;CAEJ;;;;CAKA,YAAoB,KAAqB,KAAU,KAAc;EAE/D,MAAM,kBAAkB,KAAK,UAAU,CAAC,CAAC;EAIzC,IAHmB,SAAS,WAAW,IAAI,UACL,WAAW,IAAI,MAAM,eAAe,GAGxE,YAAY,OAAO,KAAK,KAAK,EAC3B,MAAM,GAAG,GAAG,MAAM;GAChB,EAAE,iBAAiB,GAAG,OAAO,MAAM,WAAW,IAAI,OAAO,CAAC,CAAC;EAC7D,EACF,CAAC;OACI;GACL,MAAM,UAA4C,CAAC;GACnD,YAAY,OAAO,KAAK,SAAS,EAC/B,MAAM,GAAG,GAAG,MAAM;IAChB,EAAE,KAAK;GACT,EACF,CAAC;GACD,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC,SAAS,GAChC,KAAK,MAAM,MAAM,2CAA2C;EAEhE;CACF;AACF"}

package/dist/xhr/semconv.js

@@ -0,0 +1,13 @@
+//#region src/xhr/semconv.ts
+/**
+* The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size.
+*
+* @example 3495
+*
+* @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`.
+*/
+const ATTR_HTTP_REQUEST_BODY_SIZE = "http.request.body.size";
+//#endregion
+export { ATTR_HTTP_REQUEST_BODY_SIZE };
+
+//# sourceMappingURL=semconv.js.map

package/dist/xhr/semconv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"semconv.js","names":[],"sources":["../../src/xhr/semconv.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n */\n\n/*\n * This file contains a copy of unstable semantic convention definitions\n * used by this package.\n * @see https://github.com/open-telemetry/opentelemetry-js/tree/main/semantic-conventions#unstable-semconv\n */\n\n/**\n * The size of the request payload body in bytes. This is the number of bytes transferred excluding headers and is often, but not always, present as the [Content-Length](https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length) header. For requests using transport encoding, this should be the compressed size.\n *\n * @example 3495\n *\n * @experimental This attribute is experimental and is subject to breaking changes in minor releases of `@opentelemetry/semantic-conventions`.\n */\nexport const ATTR_HTTP_REQUEST_BODY_SIZE = 'http.request.body.size' as const;\n"],"mappings":";;;;;;;;AAkBA,MAAa,8BAA8B"}

package/dist/xhr/types.d.ts

@@ -0,0 +1,23 @@
+import { Span } from "@opentelemetry/api";
+import { InstrumentationConfig } from "@opentelemetry/instrumentation";
+//#region src/xhr/types.d.ts
+type XhrCustomAttributeFunction = (span: Span, xhr: XMLHttpRequest) => void;
+interface XhrInstrumentationConfig extends InstrumentationConfig {
+  /** URLs which should include trace headers when origin doesn't match */
+  propagateTraceHeaderCorsUrls?: Array<string | RegExp>;
+  /**
+   * URLs that partially match any regex in ignoreUrls will not be traced.
+   * In addition, URLs that are _exact matches_ of strings in ignoreUrls will
+   * also not be traced.
+   */
+  ignoreUrls?: Array<string | RegExp>;
+  /** Function for adding custom attributes on the span */
+  applyCustomAttributesOnSpan?: XhrCustomAttributeFunction;
+  /** Measure outgoing request size */
+  measureRequestSize?: boolean;
+  /** Custom function to sanitize URLs before adding to log records. */
+  sanitizeUrl?: (url: string) => string;
+}
+//#endregion
+export { XhrInstrumentationConfig };
+//# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/browser-instrumentation",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "OpenTelemetry browser instrumentations.",
   "keywords": [
     "opentelemetry",
@@ -13,7 +13,9 @@
     "navigation-timing",
     "resource-timing",
     "user-action",
-    "web-vitals"
+    "web-vitals",
+    "fetch",
+    "xhr"
   ],
   "homepage": "https://github.com/open-telemetry/opentelemetry-browser",
   "bugs": "https://github.com/open-telemetry/opentelemetry-browser/issues",
@@ -36,7 +38,9 @@
     "./experimental/navigation-timing": "./dist/navigation-timing/index.js",
     "./experimental/resource-timing": "./dist/resource-timing/index.js",
     "./experimental/user-action": "./dist/user-action/index.js",
-    "./experimental/web-vitals": "./dist/web-vitals/index.js"
+    "./experimental/web-vitals": "./dist/web-vitals/index.js",
+    "./experimental/fetch": "./dist/fetch/index.js",
+    "./experimental/xhr": "./dist/xhr/index.js"
   },
   "sideEffects": false,
   "files": [
@@ -51,17 +55,20 @@
     "test:coverage": "vitest --coverage"
   },
   "dependencies": {
-    "@opentelemetry/api-logs": "^0.220.0",
-    "@opentelemetry/core": "^2.9.0",
-    "@opentelemetry/instrumentation": "^0.220.0",
+    "@opentelemetry/api-logs": "^0.221.0",
+    "@opentelemetry/instrumentation": "^0.221.0",
     "@opentelemetry/semantic-conventions": "^1.43.0",
-    "web-vitals": "^5.3.0"
+    "web-vitals": "^6.1.1"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.1"
   },
   "devDependencies": {
-    "@opentelemetry/sdk-logs": "0.220.0"
+    "@opentelemetry/core": "2.10.0",
+    "@opentelemetry/propagator-b3": "2.10.0",
+    "@opentelemetry/sdk-logs": "0.221.0",
+    "@opentelemetry/sdk-trace-base": "2.10.0",
+    "msw": "2.15.0"
   },
   "publishConfig": {
     "access": "public"