Skip to content

Commit cd93c1c

Browse files
committed
feat(tracing): Favour client options tracePropagationTargets
1 parent 98d3916 commit cd93c1c

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ export class BrowserTracing implements Integration {
214214
*/
215215
public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
216216
this._getCurrentHub = getCurrentHub;
217+
const hub = getCurrentHub();
218+
const client = hub.getClient();
219+
const clientOptions = client && client.getOptions();
217220

218221
const {
219222
routingInstrumentation: instrumentRouting,
@@ -222,11 +225,13 @@ export class BrowserTracing implements Integration {
222225
markBackgroundTransactions,
223226
traceFetch,
224227
traceXHR,
225-
tracePropagationTargets,
226228
shouldCreateSpanForRequest,
227229
_experiments,
228230
} = this.options;
229231

232+
const tracePropagationTargets =
233+
(clientOptions && clientOptions.tracePropagationTargets) || this.options.tracePropagationTargets;
234+
230235
instrumentRouting(
231236
(context: TransactionContext) => {
232237
const transaction = this._createRouteTransaction(context);

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,22 @@ describe('BrowserTracing', () => {
250250
tracePropagationTargets: ['something'],
251251
});
252252
});
253+
254+
it('uses `tracePropagationTargets` set by client over integration set targets', () => {
255+
jest.clearAllMocks();
256+
hub.getClient()!.getOptions().tracePropagationTargets = ['something-else'];
257+
const sampleTracePropagationTargets = ['something'];
258+
createBrowserTracing(true, {
259+
routingInstrumentation: customInstrumentRouting,
260+
tracePropagationTargets: sampleTracePropagationTargets,
261+
});
262+
263+
expect(instrumentOutgoingRequestsMock).toHaveBeenCalledWith({
264+
traceFetch: true,
265+
traceXHR: true,
266+
tracePropagationTargets: ['something-else'],
267+
});
268+
});
253269
});
254270

255271
describe('beforeNavigate', () => {

0 commit comments

Comments
 (0)