Skip to content

feat(tracing): Allow empty array as tracingOrigins #5583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2022
Merged

feat(tracing): Allow empty array as tracingOrigins #5583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/tracing/src/browser/browsertracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class BrowserTracing implements Integration {
let tracingOrigins = defaultRequestInstrumentationOptions.tracingOrigins;
// NOTE: Logger doesn't work in constructors, as it's initialized after integrations instances
if (_options) {
if (_options.tracingOrigins && Array.isArray(_options.tracingOrigins) && _options.tracingOrigins.length !== 0) {
if (_options.tracingOrigins && Array.isArray(_options.tracingOrigins)) {
tracingOrigins = _options.tracingOrigins;
} else {
__DEBUG_BUILD__ && (this._emitOptionsWarning = true);
Expand Down
20 changes: 11 additions & 9 deletions packages/tracing/test/browser/browsertracing.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,34 +145,36 @@ describe('BrowserTracing', () => {
expect(inst.options.tracingOrigins).toEqual(defaultRequestInstrumentationOptions.tracingOrigins);
});

it('warns and uses default tracing origins if empty array given', () => {
it('warns and uses default tracing origins if tracing origins are not defined', () => {
const inst = createBrowserTracing(true, {
routingInstrumentation: customInstrumentRouting,
tracingOrigins: [],
tracingOrigins: undefined,
});

expect(warnSpy).toHaveBeenCalledTimes(2);
expect(inst.options.tracingOrigins).toEqual(defaultRequestInstrumentationOptions.tracingOrigins);
});

it('warns and uses default tracing origins if tracing origins are not defined', () => {
it('sets tracing origins if provided and does not warn', () => {
const sampleTracingOrigins = ['something'];
const inst = createBrowserTracing(true, {
routingInstrumentation: customInstrumentRouting,
tracingOrigins: undefined,
tracingOrigins: sampleTracingOrigins,
});

expect(warnSpy).toHaveBeenCalledTimes(2);
expect(inst.options.tracingOrigins).toEqual(defaultRequestInstrumentationOptions.tracingOrigins);
expect(warnSpy).toHaveBeenCalledTimes(0);
expect(inst.options.tracingOrigins).toEqual(sampleTracingOrigins);
});

it('sets tracing origins if provided and does not warn', () => {
it('sets tracing origins to an empty array and does not warn', () => {
const sampleTracingOrigins: string[] = [];
const inst = createBrowserTracing(true, {
routingInstrumentation: customInstrumentRouting,
tracingOrigins: ['something'],
tracingOrigins: sampleTracingOrigins,
});

expect(warnSpy).toHaveBeenCalledTimes(0);
expect(inst.options.tracingOrigins).toEqual(['something']);
expect(inst.options.tracingOrigins).toEqual(sampleTracingOrigins);
});
});

Expand Down