Skip to content
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.

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

fix(core): Use makeDsn from core to extract the URL from DSN for filtering breadcrumbs #4395

Merged
merged 10 commits into from
Jan 16, 2025
12 changes: 6 additions & 6 deletions packages/core/src/js/sdk.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable complexity */
import type { Breadcrumb, BreadcrumbHint, Integration, Scope, SendFeedbackParams, UserFeedback } from '@sentry/core';
import { captureFeedback, getClient, getGlobalScope, getIntegrationsToSetup, getIsolationScope, initAndBind, logger, stackParserFromStackParserOptions, withScope as coreWithScope } from '@sentry/core';
import { captureFeedback, getClient, getGlobalScope, getIntegrationsToSetup, getIsolationScope, initAndBind, logger, makeDsn, stackParserFromStackParserOptions, withScope as coreWithScope } from '@sentry/core';
import {
defaultStackParser,
makeFetchTransport,
Expand Down Expand Up @@ -66,13 +66,13 @@ export function init(passedOptions: ReactNativeOptions): void {
if (!dsn) {
return undefined;
}
try {
const url = new URL(dsn);
return `${url.protocol}//${url.host}`;
} catch (e) {
logger.error('Failed to extract url from DSN', e);
const dsnComponents = makeDsn(dsn);
if (!dsnComponents) {
logger.error('Failed to extract url from DSN: ', dsn);
return undefined;
}
const port = dsnComponents.port ? `:${dsnComponents.port}` : '';
krystofwoldrich marked this conversation as resolved.
Show resolved Hide resolved
return `${dsnComponents.protocol}://${dsnComponents.host}${port}`;
};

const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });
Expand Down
13 changes: 2 additions & 11 deletions packages/core/test/sdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -345,21 +345,15 @@ describe('Tests the SDK functionality', () => {
expect(result).toBeNull();
});

it('should keep breadcrumbs matching dsn if the url parsing fails for dsn', () => {
it('should keep breadcrumbs if the url parsing fails for dsn', () => {
(getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });

const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
return breadcrumb;
};

// Mock the URL constructor to throw an exception for this test case
const originalURL = (global as any).URL;
jest.spyOn(global as any, 'URL').mockImplementationOnce(() => {
throw new Error('Failed to parse DSN URL');
});

const passedOptions = {
dsn: 'https://[email protected]/1234567',
dsn: 'invalid-dsn',
beforeBreadcrumb: mockBeforeBreadcrumb,
};

Expand All @@ -373,9 +367,6 @@ describe('Tests the SDK functionality', () => {
const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);

expect(result).toEqual(breadcrumb);

// Restore the original URL constructor
(global as any).URL = originalURL;
});

it('should keep non dev server or dsn breadcrumbs', () => {
Expand Down
Loading