fix(tracing): Pass tracePropagationTargets to instrumentOutgoingRequests

Author: Lms24

packages/tracing/src/browser/browsertracing.ts

@@ -112,7 +112,7 @@ export interface BrowserTracingOptions extends RequestInstrumentationOptions {
   ): void;
 }
 
-const DEFAULT_BROWSER_TRACING_OPTIONS = {
+const DEFAULT_BROWSER_TRACING_OPTIONS: BrowserTracingOptions = {
   idleTimeout: DEFAULT_IDLE_TIMEOUT,
   finalTimeout: DEFAULT_FINAL_TIMEOUT,
   heartbeatInterval: DEFAULT_HEARTBEAT_INTERVAL,
@@ -153,6 +153,15 @@ export class BrowserTracing implements Integration {
       ..._options,
     };
 
+    // TODO (v8): remove this block after tracingOrigins is removed
+    // Set tracePropagationTargets from tracingOrigins if specified by the user
+    // In case both are specified, tracePropagationTargets takes precedence
+    // eslint-disable-next-line deprecation/deprecation
+    if (_options && !_options.tracePropagationTargets && _options.tracingOrigins) {
+      // eslint-disable-next-line deprecation/deprecation
+      this.options.tracePropagationTargets = _options.tracingOrigins;
+    }
+
     const { _metricOptions } = this.options;
     startTrackingWebVitals(_metricOptions && _metricOptions._reportAllChanges);
     if (this.options._experiments?.enableLongTask) {
@@ -174,8 +183,7 @@ export class BrowserTracing implements Integration {
       markBackgroundTransactions,
       traceFetch,
       traceXHR,
-      // eslint-disable-next-line deprecation/deprecation
-      tracingOrigins,
+      tracePropagationTargets,
       shouldCreateSpanForRequest,
     } = this.options;
 
@@ -189,7 +197,12 @@ export class BrowserTracing implements Integration {
       registerBackgroundTabDetection();
     }
 
-    instrumentOutgoingRequests({ traceFetch, traceXHR, tracingOrigins, shouldCreateSpanForRequest });
+    instrumentOutgoingRequests({
+      traceFetch,
+      traceXHR,
+      tracePropagationTargets,
+      shouldCreateSpanForRequest,
+    });
   }
 
   /** Create routing idle transaction. */

packages/tracing/src/browser/request.ts

@@ -113,7 +113,7 @@ export const defaultRequestInstrumentationOptions: RequestInstrumentationOptions
 /** Registers span creators for xhr and fetch requests  */
 export function instrumentOutgoingRequests(_options?: Partial<RequestInstrumentationOptions>): void {
   // eslint-disable-next-line deprecation/deprecation
-  const { traceFetch, traceXHR, tracingOrigins, tracePropagationTargets, shouldCreateSpanForRequest } = {
+  const { traceFetch, traceXHR, tracePropagationTargets, shouldCreateSpanForRequest } = {
     traceFetch: defaultRequestInstrumentationOptions.traceFetch,
     traceXHR: defaultRequestInstrumentationOptions.traceXHR,
     ..._options,
@@ -122,8 +122,7 @@ export function instrumentOutgoingRequests(_options?: Partial<RequestInstrumenta
   const shouldCreateSpan =
     typeof shouldCreateSpanForRequest === 'function' ? shouldCreateSpanForRequest : (_: string) => true;
 
-  const shouldAttachHeadersWithTargets = (url: string): boolean =>
-    shouldAttachHeaders(url, tracingOrigins, tracePropagationTargets);
+  const shouldAttachHeadersWithTargets = (url: string): boolean => shouldAttachHeaders(url, tracePropagationTargets);
 
   const spans: Record<string, Span> = {};
 
@@ -147,17 +146,8 @@ export function instrumentOutgoingRequests(_options?: Partial<RequestInstrumenta
  *
  * TODO (v8): Remove `tracingOrigins` which should drastically simplify this function.
  */
-export function shouldAttachHeaders(
-  url: string,
-  tracePropagationTargets: (string | RegExp)[] | undefined,
-  tracingOrigins: (string | RegExp)[] | undefined,
-): boolean {
-  // TODO (v8): Replace the entire code below with this one-liner:
-  // return stringMatchesSomePattern(url, tracePropagationTargets || DEFAULT_TRACE_PROPAGATION_TARGETS);
-  if (tracePropagationTargets || tracingOrigins) {
-    return stringMatchesSomePattern(url, tracePropagationTargets || tracingOrigins);
-  }
-  return stringMatchesSomePattern(url, DEFAULT_TRACE_PROPAGATION_TARGETS);
+export function shouldAttachHeaders(url: string, tracePropagationTargets: (string | RegExp)[] | undefined): boolean {
+  return stringMatchesSomePattern(url, tracePropagationTargets || DEFAULT_TRACE_PROPAGATION_TARGETS);
 }
 
 /**