Merge 10a7091 into 2442538

Author: antonis

packages/core/src/js/sdk.tsx

@@ -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,
@@ -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}` : '';
+    return `${dsnComponents.protocol}://${dsnComponents.host}${port}`;
   };
 
   const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });

packages/core/test/sdk.test.ts

@@ -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,
       };
 
@@ -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', () => {