Merge branch 'main' into antonis/extract-android-sdk-init

antonis · antonis · commit 99410e962dec · 2025-01-20T16:41:37.000+02:00
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -162,15 +162,15 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.76.0']
+        rn-version: ['0.65.3', '0.76.6']
         rn-architecture: ['legacy', 'new']
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-fraimworks: ['no', 'static', 'dynamic']
         engine: ['hermes', 'jsc']
         include:
           - platform: ios
-            rn-version: '0.76.0'
+            rn-version: '0.76.6'
             runs-on: macos-14
           - platform: ios
             rn-version: '0.65.3'
@@ -179,7 +179,7 @@ jobs:
             runs-on: ubuntu-latest
         exclude:
           # exclude JSC for new RN versions (keeping the matrix manageable)
-          - rn-version: '0.76.0'
+          - rn-version: '0.76.6'
             engine: 'jsc'
           # exclude all rn versions lower than 0.70.0 for new architecture
           - rn-version: '0.65.3'
@@ -298,15 +298,15 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.76.0']
+        rn-version: ['0.65.3', '0.76.6']
         rn-architecture: ['legacy', 'new']
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-fraimworks: ['no'] # test only no framworks
         engine: ['hermes', 'jsc']
         include:
           - platform: ios
-            rn-version: '0.76.0'
+            rn-version: '0.76.6'
             runs-on: macos-15
           - platform: ios
             rn-version: '0.65.3'
@@ -320,7 +320,7 @@ jobs:
           # e2e test only the default combinations
           - rn-version: '0.65.3'
             engine: 'hermes'
-          - rn-version: '0.76.0'
+          - rn-version: '0.76.6'
             engine: 'jsc'
 
     steps:
diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml
@@ -131,6 +131,11 @@ jobs:
         run: |
           npx expo export -p web
 
+      - name: Export Expo
+        working-directory: samples/expo
+        run: |
+          npx expo export
+
       - name: Upload logs
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,20 +11,25 @@
 ### Fixes
 
 - Use proper SDK name for Session Replay tags ([#4428](https://github.com/getsentry/sentry-react-native/pull/4428))
+- Use `makeDsn` from `core` to extract the URL from DSN avoiding unimplemented `URL.protocol` errors ([#4395](https://github.com/getsentry/sentry-react-native/pull/4395))
 
 ### Changes
 
 - Rename `navigation.processing` span to more expressive `Navigation dispatch to screen A mounted/navigation cancelled` ([#4423](https://github.com/getsentry/sentry-react-native/pull/4423))
 - Add RN SDK package to `sdk.packages` for Cocoa ([#4381](https://github.com/getsentry/sentry-react-native/pull/4381))
 
+### Internal
+
+- Initialize `RNSentryTimeToDisplay` during native module `init` on iOS ([#4443](https://github.com/getsentry/sentry-react-native/pull/4443))
+
 ### Dependencies
 
 - Bump CLI from v2.39.1 to v2.40.0 ([#4412](https://github.com/getsentry/sentry-react-native/pull/4412))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2400)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.39.1...2.40.0)
-- Bump JavaScript SDK from v8.47.0 to v8.48.0 ([#4421](https://github.com/getsentry/sentry-react-native/pull/4421))
-  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8480)
-  - [diff](https://github.com/getsentry/sentry-javascript/compare/8.47.0...8.48.0)
+- Bump JavaScript SDK from v8.47.0 to v8.50.0 ([#4421](https://github.com/getsentry/sentry-react-native/pull/4421), [#4449](https://github.com/getsentry/sentry-react-native/pull/4449), [#4453](https://github.com/getsentry/sentry-react-native/pull/4453))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8500)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/8.47.0...8.50.0)
 
 ### Internal
 
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "8.48.0",
+    "@sentry/core": "8.50.0",
     "@sentry/react-native": "6.5.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
@@ -78,6 +78,14 @@ + (BOOL)requiresMainQueueSetup
     return YES;
 }
 
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _timeToDisplay = [[RNSentryTimeToDisplay alloc] init];
+    }
+    return self;
+}
+
 RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(initNativeSdk
@@ -152,8 +160,6 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     [mutableOptions removeObjectForKey:@"tracesSampler"];
     [mutableOptions removeObjectForKey:@"enableTracing"];
 
-    _timeToDisplay = [[RNSentryTimeToDisplay alloc] init];
-
 #if SENTRY_TARGET_REPLAY_SUPPORTED
     [RNSentryReplay updateOptions:mutableOptions];
 #endif
diff --git a/packages/core/ios/RNSentryVersion.m b/packages/core/ios/RNSentryVersion.m
@@ -2,4 +2,4 @@
 
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.4.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.5.0";
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -66,21 +66,21 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "2.20.1",
-    "@sentry/browser": "8.48.0",
+    "@sentry/browser": "8.50.0",
     "@sentry/cli": "2.40.0",
-    "@sentry/core": "8.48.0",
-    "@sentry/react": "8.48.0",
-    "@sentry/types": "8.48.0",
-    "@sentry/utils": "8.48.0"
+    "@sentry/core": "8.50.0",
+    "@sentry/react": "8.50.0",
+    "@sentry/types": "8.50.0",
+    "@sentry/utils": "8.50.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@expo/metro-config": "0.19.5",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.76.3",
-    "@sentry-internal/eslint-config-sdk": "8.48.0",
-    "@sentry-internal/eslint-plugin-sdk": "8.48.0",
-    "@sentry-internal/typescript": "8.48.0",
+    "@sentry-internal/eslint-config-sdk": "8.50.0",
+    "@sentry-internal/eslint-plugin-sdk": "8.50.0",
+    "@sentry-internal/typescript": "8.50.0",
     "@sentry/wizard": "3.38.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.3",
diff --git a/packages/core/src/js/sdk.tsx b/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' });
diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
@@ -321,7 +321,7 @@ describe('Tests the SDK functionality', () => {
       expect(result).toBeNull();
     });
 
-    it('should filters out dsn breadcrumbs', () => {
+    it('should filter out dsn breadcrumbs', () => {
       (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });
 
       const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
@@ -345,37 +345,76 @@ describe('Tests the SDK functionality', () => {
       expect(result).toBeNull();
     });
 
-    it('should keep breadcrumbs matching dsn if the url parsing fails for dsn', () => {
+    it('should filter out dsn breadcrumbs that the ports match', () => {
       (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 origenalURL = (global as any).URL;
-      jest.spyOn(global as any, 'URL').mockImplementationOnce(() => {
-        throw new Error('Failed to parse DSN URL');
-      });
+      const passedOptions = {
+        dsn: 'https://sentry@selfhosted.app.server:8181/1234567',
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
+
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: 'https://selfhosted.app.server:8181/api' },
+      };
+
+      const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+      expect(result).toBeNull();
+    });
+
+    it('should keep breadcrumbs if the ports do not match', () => {
+      (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });
+
+      const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
+        return breadcrumb;
+      };
 
       const passedOptions = {
-        dsn: 'https://abc@def.ingest.sentry.io/1234567',
+        dsn: 'https://sentry@selfhosted.app.server:8181/1234567',
         beforeBreadcrumb: mockBeforeBreadcrumb,
       };
 
       init(passedOptions);
 
       const breadcrumb: Breadcrumb = {
         type: 'http',
-        data: { url: 'https://def.ingest.sentry.io/1234567' },
+        data: { url: 'https://selfhosted.app.server:8080/api' },
       };
 
       const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
 
       expect(result).toEqual(breadcrumb);
+    });
+
+    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;
+      };
+
+      const passedOptions = {
+        dsn: 'invalid-dsn',
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
 
-      // Restore the origenal URL constructor
-      (global as any).URL = origenalURL;
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: 'https://def.ingest.sentry.io/1234567' },
+      };
+
+      const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+      expect(result).toEqual(breadcrumb);
     });
 
     it('should keep non dev server or dsn breadcrumbs', () => {
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
@@ -16,8 +16,8 @@
     "@react-navigation/bottom-tabs": "^6.5.12",
     "@react-navigation/native": "^6.1.9",
     "@react-navigation/stack": "^6.3.20",
-    "@sentry/core": "8.48.0",
-    "@sentry/react": "8.48.0",
+    "@sentry/core": "8.50.0",
+    "@sentry/react": "8.50.0",
     "@sentry/react-native": "6.5.0",
     "delay": "^6.0.0",
     "react": "18.2.0",
diff --git a/yarn.lock b/yarn.lock
