fixes

Author: mydea

packages/tracing-internal/src/browser/request.ts

@@ -15,13 +15,6 @@ import {
 import { instrumentFetchRequest } from '../common/fetch';
 import { addPerformanceInstrumentationHandler } from './instrument';
 
-/** Exported only for tests. */
-export type ExtendedSentryWrappedXMLHttpRequest = SentryWrappedXMLHttpRequest & {
-  __sentry_xhr_span_id__?: string;
-  setRequestHeader?: (key: string, val: string) => void;
-  getRequestHeader?: (key: string) => string;
-};
-
 export const DEFAULT_TRACE_PROPAGATION_TARGETS = ['localhost', /^\/(?!\/)/];
 
 /** Options for Request Instrumentation */
@@ -263,7 +256,7 @@ export function xhrCallback(
   shouldAttachHeaders: (url: string) => boolean,
   spans: Record<string, Span>,
 ): Span | undefined {
-  const xhr = handlerData.xhr as ExtendedSentryWrappedXMLHttpRequest;
+  const xhr = handlerData.xhr;
   const sentryXhrData = xhr && xhr[SENTRY_XHR_DATA_KEY];
 
   if (!hasTracingEnabled() || (xhr && xhr.__sentry_own_request__) || !xhr || !sentryXhrData) {
@@ -332,7 +325,7 @@ export function xhrCallback(
 }
 
 function setHeaderOnXhr(
-  xhr: ExtendedSentryWrappedXMLHttpRequest,
+  xhr: SentryWrappedXMLHttpRequest,
   sentryTraceHeader: string,
   sentryBaggageHeader: string | undefined,
 ): void {

packages/tracing-internal/test/browser/request.test.ts

@@ -1,13 +1,12 @@
 /* eslint-disable deprecation/deprecation */
 import * as sentryCore from '@sentry/core';
-import type { HandlerDataFetch } from '@sentry/types';
+import type { HandlerDataFetch, SentryWrappedXMLHttpRequest } from '@sentry/types';
 import * as utils from '@sentry/utils';
 import { SENTRY_XHR_DATA_KEY } from '@sentry/utils';
 
 import type { Transaction } from '../../../tracing/src';
 import { addExtensionMethods, Span, spanStatusfromHttpCode } from '../../../tracing/src';
 import { getDefaultBrowserClientOptions } from '../../../tracing/test/testutils';
-import type { ExtendedSentryWrappedXMLHttpRequest } from '../../src/browser/request';
 import {
   extractNetworkProtocol,
   instrumentOutgoingRequests,
@@ -296,7 +295,7 @@ describe('callbacks', () => {
           },
           __sentry_xhr_span_id__: '1231201211212012',
           setRequestHeader,
-        } as ExtendedSentryWrappedXMLHttpRequest,
+        } as SentryWrappedXMLHttpRequest,
         startTimestamp,
       };
     });
@@ -352,7 +351,7 @@ describe('callbacks', () => {
       });
       expect(newSpan.description).toBe('GET http://dogs.are.great/');
       expect(newSpan.op).toBe('http.client');
-      const spanId = (xhrHandlerData.xhr as ExtendedSentryWrappedXMLHttpRequest | undefined)?.__sentry_xhr_span_id__;
+      const spanId = xhrHandlerData.xhr?.__sentry_xhr_span_id__;
       expect(spanId).toBeDefined();
       expect(spanId).toEqual(newSpan?.spanId);
 

packages/types/src/instrument.ts

@@ -8,6 +8,10 @@ export type ConsoleLevel = 'debug' | 'info' | 'warn' | 'error' | 'log' | 'assert
 export interface SentryWrappedXMLHttpRequest {
   __sentry_xhr_v3__?: SentryXhrData;
   __sentry_own_request__?: boolean;
+  // span id for the xhr request
+  __sentry_xhr_span_id__?: string;
+  setRequestHeader?: (key: string, val: string) => void;
+  getRequestHeader?: (key: string) => string;
 }
 
 // WARNING: When the shape of this type is changed bump the version in `SentryWrappedXMLHttpRequest`