From 494a619bd8891bffe32b95419a8da4810587f3d5 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 27 Sep 2024 17:55:37 +0300
Subject: [PATCH 01/45] Adds breadcrumb origin in RNSentryBreadcrumb dictionary
 parsing

---
 android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java | 4 ++++
 ios/RNSentryBreadcrumb.m                                      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java b/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
index 3fcfffcf83..2c7db0be0d 100644
--- a/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
+++ b/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
@@ -48,6 +48,10 @@ public static Breadcrumb fromMap(ReadableMap from) {
             breadcrumb.setCategory(from.getString("category"));
         }
 
+        if (from.hasKey("origin")) {
+            breadcrumb.setOrigin(from.getString("origin"));
+        }
+
         if (from.hasKey("level")) {
             switch (from.getString("level")) {
                 case "fatal":
diff --git a/ios/RNSentryBreadcrumb.m b/ios/RNSentryBreadcrumb.m
index e900ba4833..4d0b094eb6 100644
--- a/ios/RNSentryBreadcrumb.m
+++ b/ios/RNSentryBreadcrumb.m
@@ -23,6 +23,7 @@ +(SentryBreadcrumb*) from: (NSDictionary *) dict
 
     [crumb setLevel:sentryLevel];
     [crumb setCategory:dict[@"category"]];
+    [crumb setOrigin:dict[@"origin"]];
     [crumb setType:dict[@"type"]];
     [crumb setMessage:dict[@"message"]];
     [crumb setData:dict[@"data"]];

From a636be5ea5ab91f1d1b11ab8c4735403fcdf3d43 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 8 Oct 2024 13:05:18 +0300
Subject: [PATCH 02/45] Use 8.38.0-beta.1 Cocoa SDK that has the new origin
 field

---
 RNSentry.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RNSentry.podspec b/RNSentry.podspec
index 5059662f04..beca2ba0cf 100644
--- a/RNSentry.podspec
+++ b/RNSentry.podspec
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.36.0'
+  s.dependency 'Sentry/HybridSDK', '8.38.0-beta.1'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)

From 197f863e8547fbac608a7df1689004aea71ba686 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 9 Oct 2024 17:16:55 +0300
Subject: [PATCH 03/45] Adds changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54033f5b6d..f5221a10a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Adds breadcrumb origin field to prevent exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
 - Use `appLaunchedInForeground` to determine invalid app start data on Android ([#4146](https://github.com/getsentry/sentry-react-native/pull/4146))
 - Upload source maps for all release variants on Android (not only the last found) ([#4125](https://github.com/getsentry/sentry-react-native/pull/4125))
 

From 9bee5c9af25a625061510a7a30b5fff92f0e2a21 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 9 Oct 2024 17:51:20 +0300
Subject: [PATCH 04/45] Fixes sentry-java breaking changes

---
 android/src/main/java/io/sentry/react/RNSentryModuleImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index cd498308f3..37e36bb4c1 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -317,7 +317,7 @@ private SentryReplayOptions getReplayOptions(@NotNull ReadableMap rnOptions) {
 
         androidReplayOptions.setSessionSampleRate(rnExperimentsOptions.hasKey("replaysSessionSampleRate")
                 ? rnExperimentsOptions.getDouble("replaysSessionSampleRate") : null);
-        androidReplayOptions.setErrorSampleRate(rnExperimentsOptions.hasKey("replaysOnErrorSampleRate")
+        androidReplayOptions.setOnErrorSampleRate(rnExperimentsOptions.hasKey("replaysOnErrorSampleRate")
                 ? rnExperimentsOptions.getDouble("replaysOnErrorSampleRate") : null);
 
         if (!rnOptions.hasKey("mobileReplayOptions")) {
@@ -333,7 +333,7 @@ private SentryReplayOptions getReplayOptions(@NotNull ReadableMap rnOptions) {
 
         final boolean redactVectors = !rnMobileReplayOptions.hasKey("maskAllVectors") || rnMobileReplayOptions.getBoolean("maskAllVectors");
         if (redactVectors) {
-            androidReplayOptions.addClassToRedact("com.horcrux.svg.SvgView"); // react-native-svg
+            androidReplayOptions.addRedactViewClass("com.horcrux.svg.SvgView"); // react-native-svg
         }
 
         return androidReplayOptions;

From 611cd97f7175edd4f5bb6af1d522ce43058f8cc0 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 23 Oct 2024 16:15:54 +0300
Subject: [PATCH 05/45] Adds origin native tests

---
 .../RNSentryBreadcrumbTest.kt                 | 23 +++++++++++++++++++
 .../project.pbxproj                           |  2 ++
 .../RNSentryBreadcrumbTests.swift             |  4 +++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt
index a41c3b964d..f1ae67e33e 100644
--- a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt
+++ b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt
@@ -1,6 +1,7 @@
 package io.sentry.rnsentryandroidtester
 
 import com.facebook.react.bridge.JavaOnlyMap
+import io.sentry.SentryLevel
 import io.sentry.react.RNSentryBreadcrumb
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
@@ -10,6 +11,28 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class RNSentryBreadcrumbTest {
 
+    @Test
+    fun generatesSentryBreadcrumbFromMap() {
+        val testData = JavaOnlyMap.of(
+            "test", "data",
+        )
+        val map = JavaOnlyMap.of(
+            "level", "error",
+            "category", "testCategory",
+            "origin", "testOrigin",
+            "type", "testType",
+            "message", "testMessage",
+            "data", testData,
+        )
+        val actual = RNSentryBreadcrumb.fromMap(map)
+        assertEquals(SentryLevel.ERROR, actual.level)
+        assertEquals("testCategory", actual.category)
+        assertEquals("testOrigin", actual.origin)
+        assertEquals("testType", actual.type)
+        assertEquals("testMessage", actual.message)
+        assertEquals(testData.toHashMap(), actual.data)
+    }
+
     @Test
     fun nullForMissingCategory() {
         val map = JavaOnlyMap.of()
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj b/packages/core/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj
index b1cc2aa6f4..a473ae7d57 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		33AFDFED2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33AFDFEC2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m */; };
 		33AFDFF12B8D15E500AAB120 /* RNSentryDependencyContainerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */; };
 		33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33F58ACF2977037D008F60EA /* RNSentryTests.mm */; };
+		AEFB00422CC90C4B00EC8A9A /* RNSentryBreadcrumbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3360843C2C340C76008CC412 /* RNSentryBreadcrumbTests.swift */; };
 		B5859A50A3E865EF5E61465A /* libPods-RNSentryCocoaTesterTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 650CB718ACFBD05609BF2126 /* libPods-RNSentryCocoaTesterTests.a */; };
 /* End PBXBuildFile section */
 
@@ -212,6 +213,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AEFB00422CC90C4B00EC8A9A /* RNSentryBreadcrumbTests.swift in Sources */,
 				33AFDFF12B8D15E500AAB120 /* RNSentryDependencyContainerTests.m in Sources */,
 				336084392C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift in Sources */,
 				33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */,
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift
index f4bd3ce8e9..9979f0cb58 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift
@@ -1,12 +1,13 @@
 import XCTest
 import Sentry
 
-class RNSentryBreadcrumbTests: XCTestCase {
+final class RNSentryBreadcrumbTests: XCTestCase {
 
     func testGeneratesSentryBreadcrumbFromNSDictionary() {
         let actualCrumb = RNSentryBreadcrumb.from([
             "level": "error",
             "category": "testCategory",
+            "origin": "testOrigin",
             "type": "testType",
             "message": "testMessage",
             "data": [
@@ -16,6 +17,7 @@ class RNSentryBreadcrumbTests: XCTestCase {
 
         XCTAssertEqual(actualCrumb!.level, SentryLevel.error)
         XCTAssertEqual(actualCrumb!.category, "testCategory")
+        XCTAssertEqual(actualCrumb!.origin, "testOrigin")
         XCTAssertEqual(actualCrumb!.type, "testType")
         XCTAssertEqual(actualCrumb!.message, "testMessage")
         XCTAssertEqual((actualCrumb!.data)!["test"] as! String, "data")

From 37553f296a99d532ff69a63c1953247c67ec7d1e Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 23 Oct 2024 16:16:52 +0300
Subject: [PATCH 06/45] Adds Capture exception with breadcrumb in the sample

---
 samples/react-native/src/Screens/ErrorsScreen.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/samples/react-native/src/Screens/ErrorsScreen.tsx b/samples/react-native/src/Screens/ErrorsScreen.tsx
index 6430440295..2890f8d19d 100644
--- a/samples/react-native/src/Screens/ErrorsScreen.tsx
+++ b/samples/react-native/src/Screens/ErrorsScreen.tsx
@@ -88,6 +88,13 @@ const ErrorsScreen = (_props: Props) => {
             Sentry.captureException(error);
           }}
         />
+        <Button
+          title="Capture exception with breadcrumb"
+          onPress={() => {
+            Sentry.captureException(new Error('Captured exception with breadcrumb'),
+              context => context.addBreadcrumb({ message: 'error with breadcrumb' }));
+          }}
+        />
         <Button
           title="Uncaught Thrown Error"
           onPress={() => {

From 24a527be83850ad4a63b47920b025fc1f7fe7003 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 28 Oct 2024 17:13:07 +0200
Subject: [PATCH 07/45] Set react native as event origin

---
 .../RNSentryBreadcrumbTest.kt                   | 10 ++++++++++
 .../RNSentryBreadcrumbTests.swift               | 17 +++++++++++++++++
 .../io/sentry/react/RNSentryBreadcrumb.java     |  2 ++
 packages/core/ios/RNSentryBreadcrumb.m          |  7 ++++++-
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt
index f1ae67e33e..e2eceab44a 100644
--- a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt
+++ b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt
@@ -33,6 +33,16 @@ class RNSentryBreadcrumbTest {
         assertEquals(testData.toHashMap(), actual.data)
     }
 
+    @Test
+    fun reactNativeForMissingOrigin() {
+        val map = JavaOnlyMap.of(
+            "message", "testMessage",
+        )
+        val actual = RNSentryBreadcrumb.fromMap(map)
+        assertEquals("testMessage", actual.message)
+        assertEquals("react-native", actual.origin)
+    }
+
     @Test
     fun nullForMissingCategory() {
         val map = JavaOnlyMap.of()
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift
index 9979f0cb58..397a18ea2d 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift
@@ -23,6 +23,23 @@ final class RNSentryBreadcrumbTests: XCTestCase {
         XCTAssertEqual((actualCrumb!.data)!["test"] as! String, "data")
     }
 
+    func testUsesReactNativeAsDefaultOrigin() {
+        let actualCrumb = RNSentryBreadcrumb.from([
+            "message": "testMessage"
+        ])
+
+        XCTAssertEqual(actualCrumb!.origin, "react-native")
+    }
+    
+    func testKeepsOriginIfSet() {
+        let actualCrumb = RNSentryBreadcrumb.from([
+            "message": "testMessage",
+            "origin": "someOrigin"
+        ])
+
+        XCTAssertEqual(actualCrumb!.origin, "someOrigin")
+    }
+    
     func testUsesInfoAsDefaultSentryLevel() {
         let actualCrumb = RNSentryBreadcrumb.from([
             "message": "testMessage"
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
index a316c3f470..45885adc9c 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
@@ -53,6 +53,8 @@ public static Breadcrumb fromMap(ReadableMap from) {
 
     if (from.hasKey("origin")) {
       breadcrumb.setOrigin(from.getString("origin"));
+    } else {
+      breadcrumb.setOrigin("react-native");
     }
 
     if (from.hasKey("level")) {
diff --git a/packages/core/ios/RNSentryBreadcrumb.m b/packages/core/ios/RNSentryBreadcrumb.m
index 4d0b094eb6..f002ba74a2 100644
--- a/packages/core/ios/RNSentryBreadcrumb.m
+++ b/packages/core/ios/RNSentryBreadcrumb.m
@@ -23,7 +23,12 @@ +(SentryBreadcrumb*) from: (NSDictionary *) dict
 
     [crumb setLevel:sentryLevel];
     [crumb setCategory:dict[@"category"]];
-    [crumb setOrigin:dict[@"origin"]];
+    id origin = dict[@"origin"];
+    if (origin != nil) {
+        [crumb setOrigin:origin];
+    } else {
+        [crumb setOrigin:@"react-native"];
+    }
     [crumb setType:dict[@"type"]];
     [crumb setMessage:dict[@"message"]];
     [crumb setData:dict[@"data"]];

From fabf0526a8b9d70a75c703b2d29accbc09e4fe93 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 28 Oct 2024 17:13:45 +0200
Subject: [PATCH 08/45] Filter out events with react-native origin from the
 native layer

---
 .../java/io/sentry/react/RNSentryModuleImpl.java   | 14 ++++++++++++++
 packages/core/ios/RNSentry.mm                      | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index ee24c634c2..971222dedd 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -26,6 +26,8 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import io.sentry.Breadcrumb;
 import io.sentry.HubAdapter;
 import io.sentry.ILogger;
 import io.sentry.IScope;
@@ -75,6 +77,7 @@
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -891,6 +894,17 @@ public void fetchNativeDeviceContexts(Promise promise) {
     }
 
     final @Nullable IScope currentScope = InternalSentrySdk.getCurrentScope();
+    if (currentScope != null) {
+      // Remove react-native breadcrumbs
+      Iterator<Breadcrumb> breadcrumbsIterator = currentScope.getBreadcrumbs().iterator();
+      while (breadcrumbsIterator.hasNext()) {
+        Breadcrumb breadcrumb = breadcrumbsIterator.next();
+        if ("react-native".equals(breadcrumb.getOrigin())) {
+          breadcrumbsIterator.remove();
+        }
+      }
+    }
+
     final @NotNull Map<String, Object> serialized =
         InternalSentrySdk.serializeScope(context, (SentryAndroidOptions) options, currentScope);
     final @Nullable Object deviceContext = RNSentryMapConverter.convertToWritable(serialized);
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index a04733e7b5..e726b1c3ca 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -382,6 +382,17 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
 
     [serializedScope setValue:contexts forKey:@"contexts"];
     [serializedScope removeObjectForKey:@"context"];
+        
+    // Remove react-native breadcrumbs
+    NSMutableArray<NSDictionary<NSString *, id> *> *breadcrumbs = [serializedScope[@"breadcrumbs"] mutableCopy];
+    for (NSInteger i = breadcrumbs.count - 1; i >= 0; i--) {
+        NSDictionary<NSString *, id> *breadcrumb = breadcrumbs[i];
+        if ([breadcrumb[@"origin"] isEqualToString:@"react-native"]) {
+            [breadcrumbs removeObjectAtIndex:i];
+        }
+    }
+    [serializedScope setValue:breadcrumbs forKey:@"breadcrumbs"];
+
     resolve(serializedScope);
 }
 

From d0b163342380980a878c340f8ad55df08e86d1a5 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 28 Oct 2024 17:14:30 +0200
Subject: [PATCH 09/45] Merge event breadcrumbs with native context

---
 packages/core/src/js/integrations/devicecontext.ts    | 2 +-
 packages/core/test/integrations/devicecontext.test.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts
index 942ca5210d..eeb6b87b8a 100644
--- a/packages/core/src/js/integrations/devicecontext.ts
+++ b/packages/core/src/js/integrations/devicecontext.ts
@@ -83,7 +83,7 @@ async function processEvent(event: Event): Promise<Event> {
     ? native['breadcrumbs'].map(breadcrumbFromObject)
     : undefined;
   if (nativeBreadcrumbs) {
-    event.breadcrumbs = nativeBreadcrumbs;
+    event.breadcrumbs = (event.breadcrumbs || []).concat(nativeBreadcrumbs);
   }
 
   return event;
diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts
index ff46e5f3c1..cb641064c7 100644
--- a/packages/core/test/integrations/devicecontext.test.ts
+++ b/packages/core/test/integrations/devicecontext.test.ts
@@ -158,13 +158,13 @@ describe('Device Context Integration', () => {
     ).expectEvent.toStrictEqualMockEvent();
   });
 
-  it('use only native breadcrumbs', async () => {
+  it('merge native and event breadcrumbs', async () => {
     const { processedEvent } = await processEventWith({
-      nativeContexts: { breadcrumbs: [{ message: 'duplicate-breadcrumb' }, { message: 'native-breadcrumb' }] },
-      mockEvent: { breadcrumbs: [{ message: 'duplicate-breadcrumb' }, { message: 'event-breadcrumb' }] },
+      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },
+      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb' }] },
     });
     expect(processedEvent).toStrictEqual({
-      breadcrumbs: [{ message: 'duplicate-breadcrumb' }, { message: 'native-breadcrumb' }],
+      breadcrumbs: [{ message: 'event-breadcrumb' }, { message: 'native-breadcrumb' }],
     });
   });
 

From 5d2711c77564154333a4f7d5b90c6f142cbc7f96 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 28 Oct 2024 17:25:06 +0200
Subject: [PATCH 10/45] Lint: removes empty line

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 971222dedd..ece89837d3 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -26,7 +26,6 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-
 import io.sentry.Breadcrumb;
 import io.sentry.HubAdapter;
 import io.sentry.ILogger;

From 78c24f0b0d5a2fd635f54be457cb0e18c4e7dd65 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 31 Oct 2024 17:05:38 +0200
Subject: [PATCH 11/45] Use predicate to filter breadcrumbs

---
 packages/core/ios/RNSentry.mm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 1bcef33eea..0f4e1a06d4 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -388,13 +388,10 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
     [serializedScope removeObjectForKey:@"context"];
         
     // Remove react-native breadcrumbs
-    NSMutableArray<NSDictionary<NSString *, id> *> *breadcrumbs = [serializedScope[@"breadcrumbs"] mutableCopy];
-    for (NSInteger i = breadcrumbs.count - 1; i >= 0; i--) {
-        NSDictionary<NSString *, id> *breadcrumb = breadcrumbs[i];
-        if ([breadcrumb[@"origin"] isEqualToString:@"react-native"]) {
-            [breadcrumbs removeObjectAtIndex:i];
-        }
-    }
+    NSPredicate *removeRNBreadcrumbsPredicate = [NSPredicate predicateWithBlock:^BOOL(NSDictionary *breadcrumb, NSDictionary *bindings) {
+        return ![breadcrumb[@"origin"] isEqualToString:@"react-native"];
+    }];
+    NSArray *breadcrumbs = [[serializedScope[@"breadcrumbs"] mutableCopy] filteredArrayUsingPredicate:removeRNBreadcrumbsPredicate];
     [serializedScope setValue:breadcrumbs forKey:@"breadcrumbs"];
 
     resolve(serializedScope);

From 6fcd93dc9bc6d3420eb9d831680c50c740d01fbe Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 31 Oct 2024 17:06:31 +0200
Subject: [PATCH 12/45] Respect max breadcrumbs limit

---
 .../core/src/js/integrations/devicecontext.ts |  4 +-
 .../test/integrations/devicecontext.test.ts   | 54 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts
index eeb6b87b8a..7302e6eeae 100644
--- a/packages/core/src/js/integrations/devicecontext.ts
+++ b/packages/core/src/js/integrations/devicecontext.ts
@@ -1,4 +1,5 @@
 /* eslint-disable complexity */
+import { getClient } from '@sentry/core';
 import type { Event, Integration } from '@sentry/types';
 import { logger, severityLevelFromString } from '@sentry/utils';
 import { AppState } from 'react-native';
@@ -83,7 +84,8 @@ async function processEvent(event: Event): Promise<Event> {
     ? native['breadcrumbs'].map(breadcrumbFromObject)
     : undefined;
   if (nativeBreadcrumbs) {
-    event.breadcrumbs = (event.breadcrumbs || []).concat(nativeBreadcrumbs);
+    const maxBreadcrumbs = getClient()?.getOptions().maxBreadcrumbs ?? 100; // Default is 100.
+    event.breadcrumbs = nativeBreadcrumbs.concat(event.breadcrumbs || []).slice(0, maxBreadcrumbs);
   }
 
   return event;
diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts
index cb641064c7..3a33a7d447 100644
--- a/packages/core/test/integrations/devicecontext.test.ts
+++ b/packages/core/test/integrations/devicecontext.test.ts
@@ -1,3 +1,4 @@
+import { getClient } from '@sentry/core';
 import type { Client, Event, EventHint, SeverityLevel } from '@sentry/types';
 
 import { deviceContextIntegration } from '../../src/js/integrations/devicecontext';
@@ -12,6 +13,13 @@ jest.mock('react-native', () => ({
   NativeModules: {},
   Platform: {},
 }));
+jest.mock('@sentry/core', () => ({
+  getClient: jest.fn().mockReturnValue({
+    getOptions: jest.fn().mockReturnValue({
+      maxBreadcrumbs: 100, // Default value
+    }),
+  }),
+}));
 
 describe('Device Context Integration', () => {
   it('add native user', async () => {
@@ -158,13 +166,55 @@ describe('Device Context Integration', () => {
     ).expectEvent.toStrictEqualMockEvent();
   });
 
-  it('merge native and event breadcrumbs', async () => {
+  it('merge native and event breadcrumbs (default maxBreadcrumbs = 100)', async () => {
+    const { processedEvent } = await processEventWith({
+      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
+      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
+    });
+    expect(processedEvent).toStrictEqual({
+      breadcrumbs: [
+        { message: 'native-breadcrumb-1' },
+        { message: 'native-breadcrumb-2' },
+        { message: 'event-breadcrumb-1' },
+        { message: 'event-breadcrumb-2' },
+      ],
+    });
+  });
+
+  it('merge a native breadcrumb and an event breadcrumb with maxBreadcrumbs = 1', async () => {
+    getClient().getOptions().maxBreadcrumbs = 1;
+    const { processedEvent } = await processEventWith({
+      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },
+      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb' }] },
+    });
+    expect(processedEvent).toStrictEqual({
+      breadcrumbs: [{ message: 'native-breadcrumb' }],
+    });
+  });
+
+  it('merge 2 native breadcrumbs and 2 event breadcrumbs with maxBreadcrumbs = 3', async () => {
+    getClient().getOptions().maxBreadcrumbs = 3;
+    const { processedEvent } = await processEventWith({
+      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
+      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
+    });
+    expect(processedEvent).toStrictEqual({
+      breadcrumbs: [
+        { message: 'native-breadcrumb-1' },
+        { message: 'native-breadcrumb-2' },
+        { message: 'event-breadcrumb-1' },
+      ],
+    });
+  });
+
+  it('merge native and event breadcrumbs with maxBreadcrumbs = 0', async () => {
+    getClient().getOptions().maxBreadcrumbs = 0;
     const { processedEvent } = await processEventWith({
       nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },
       mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb' }] },
     });
     expect(processedEvent).toStrictEqual({
-      breadcrumbs: [{ message: 'event-breadcrumb' }, { message: 'native-breadcrumb' }],
+      breadcrumbs: [],
     });
   });
 

From 44e02ec566385ae18b6a28965e232511542f7baa Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 1 Nov 2024 10:02:35 +0200
Subject: [PATCH 13/45] Updates changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77e906b4b6..5f79c102d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 ### Fixes
 
-- Adds breadcrumb origin field to prevent exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
+- Prevents exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
 - Skips ignoring require cycle logs for RN 0.70 or newer ([#4214](https://github.com/getsentry/sentry-react-native/pull/4214))
 - Enhanced accuracy of time-to-display spans. ([#4189](https://github.com/getsentry/sentry-react-native/pull/4189))
 

From a2d29de429c9e8f9e0e44e4be63aabb224a687cb Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 1 Nov 2024 10:46:24 +0200
Subject: [PATCH 14/45] Update test names

---
 packages/core/test/integrations/devicecontext.test.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts
index 3a33a7d447..ba15469b7e 100644
--- a/packages/core/test/integrations/devicecontext.test.ts
+++ b/packages/core/test/integrations/devicecontext.test.ts
@@ -166,7 +166,7 @@ describe('Device Context Integration', () => {
     ).expectEvent.toStrictEqualMockEvent();
   });
 
-  it('merge native and event breadcrumbs (default maxBreadcrumbs = 100)', async () => {
+  it('merge native and event breadcrumbs', async () => {
     const { processedEvent } = await processEventWith({
       nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
       mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
@@ -181,7 +181,7 @@ describe('Device Context Integration', () => {
     });
   });
 
-  it('merge a native breadcrumb and an event breadcrumb with maxBreadcrumbs = 1', async () => {
+  it('use only native breadcrumb if the maxBreadcrumbs limit does not leave space for event breadcrumbs', async () => {
     getClient().getOptions().maxBreadcrumbs = 1;
     const { processedEvent } = await processEventWith({
       nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },
@@ -192,7 +192,7 @@ describe('Device Context Integration', () => {
     });
   });
 
-  it('merge 2 native breadcrumbs and 2 event breadcrumbs with maxBreadcrumbs = 3', async () => {
+  it('use native breadcrumbs and pick only the event breadcrumbs that fit the maxBreadcrumbs limit', async () => {
     getClient().getOptions().maxBreadcrumbs = 3;
     const { processedEvent } = await processEventWith({
       nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
@@ -207,7 +207,7 @@ describe('Device Context Integration', () => {
     });
   });
 
-  it('merge native and event breadcrumbs with maxBreadcrumbs = 0', async () => {
+  it('do not use any breadcrumbs if the maxBreadcrumbs limit is set to zero', async () => {
     getClient().getOptions().maxBreadcrumbs = 0;
     const { processedEvent } = await processEventWith({
       nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },

From 81a11c365561b5dab6d49365af3774c64929959c Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 6 Nov 2024 11:55:16 +0200
Subject: [PATCH 15/45] Fixes lint issue

---
 packages/core/ios/RNSentry.mm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 714baf4a22..b9c44d5ef1 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -438,12 +438,14 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
 
     [serializedScope setValue:contexts forKey:@"contexts"];
     [serializedScope removeObjectForKey:@"context"];
-        
+
     // Remove react-native breadcrumbs
-    NSPredicate *removeRNBreadcrumbsPredicate = [NSPredicate predicateWithBlock:^BOOL(NSDictionary *breadcrumb, NSDictionary *bindings) {
-        return ![breadcrumb[@"origin"] isEqualToString:@"react-native"];
-    }];
-    NSArray *breadcrumbs = [[serializedScope[@"breadcrumbs"] mutableCopy] filteredArrayUsingPredicate:removeRNBreadcrumbsPredicate];
+    NSPredicate *removeRNBreadcrumbsPredicate =
+        [NSPredicate predicateWithBlock:^BOOL(NSDictionary *breadcrumb, NSDictionary *bindings) {
+            return ![breadcrumb[@"origin"] isEqualToString:@"react-native"];
+        }];
+    NSArray *breadcrumbs = [[serializedScope[@"breadcrumbs"] mutableCopy]
+        filteredArrayUsingPredicate:removeRNBreadcrumbsPredicate];
     [serializedScope setValue:breadcrumbs forKey:@"breadcrumbs"];
 
     resolve(serializedScope);

From 87bdc775970787ed364271168dc3f6b8aa245e1e Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 6 Nov 2024 18:00:39 +0200
Subject: [PATCH 16/45] Filter out DevServer and DSN related breadcrumbs

---
 .../core/src/js/integrations/devicecontext.ts | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts
index 7302e6eeae..02c4b257bd 100644
--- a/packages/core/src/js/integrations/devicecontext.ts
+++ b/packages/core/src/js/integrations/devicecontext.ts
@@ -1,12 +1,13 @@
 /* eslint-disable complexity */
 import { getClient } from '@sentry/core';
-import type { Event, Integration } from '@sentry/types';
+import type { Breadcrumb, Event, Integration } from '@sentry/types';
 import { logger, severityLevelFromString } from '@sentry/utils';
 import { AppState } from 'react-native';
 
 import { breadcrumbFromObject } from '../breadcrumb';
 import type { NativeDeviceContextsResponse } from '../NativeRNSentry';
 import { NATIVE } from '../wrapper';
+import { getDevServer } from './debugsymbolicatorutils';
 
 const INTEGRATION_NAME = 'DeviceContext';
 
@@ -84,9 +85,27 @@ async function processEvent(event: Event): Promise<Event> {
     ? native['breadcrumbs'].map(breadcrumbFromObject)
     : undefined;
   if (nativeBreadcrumbs) {
-    const maxBreadcrumbs = getClient()?.getOptions().maxBreadcrumbs ?? 100; // Default is 100.
-    event.breadcrumbs = nativeBreadcrumbs.concat(event.breadcrumbs || []).slice(0, maxBreadcrumbs);
+    // Concatenate nativeBreadcrumbs first, then event.breadcrumbs
+    event.breadcrumbs = nativeBreadcrumbs.concat(event.breadcrumbs || []);
   }
 
+  const options = getClient()?.getOptions();
+  const maxBreadcrumbs = options.maxBreadcrumbs ?? 100; // Default is 100.
+  const devServerUrl = getDevServer()?.url || '';
+  const dsn = options.dsn || '';
+
+  let allBreadcrumbs = event.breadcrumbs || [];
+
+  // Filter out Dev Server and Sentry DSN request breadcrumbs
+  allBreadcrumbs = allBreadcrumbs.filter((breadcrumb: Breadcrumb) => {
+    const type = breadcrumb.type || '';
+    const url = breadcrumb.data?.url || '';
+    return !(type === 'http' && (url.includes(devServerUrl) || url.includes(dsn)));
+  });
+
+  // Ensure the maxBreadcrumbs limit is not exceeded after merging event and native breadcrumbs
+  // and filtering out Dev Server and Sentry DSN request breadcrumbs
+  event.breadcrumbs = allBreadcrumbs.slice(0, maxBreadcrumbs);
+
   return event;
 }

From 2d68620fd10cd11ac47365b72baf152874dd316a Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 6 Nov 2024 18:05:36 +0200
Subject: [PATCH 17/45] Adds changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf9442ef05..1a25cbcde4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 ### Fixes
 
+- Excludes Dev Server and Sentry Dsn requests from Breadcrums ([#4240](https://github.com/getsentry/sentry-react-native/pull/4240))
 - Prevents exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
 - Skips ignoring require cycle logs for RN 0.70 or newer ([#4214](https://github.com/getsentry/sentry-react-native/pull/4214))
 - Enhanced accuracy of time-to-display spans. ([#4189](https://github.com/getsentry/sentry-react-native/pull/4189))

From c4246d789b690da34fb47056f38c63e25064a9ee Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 7 Nov 2024 18:01:16 +0200
Subject: [PATCH 18/45] Keep the last maxBreadcrumbs (default 100) when merging
 native and js breadcrumbs

---
 .../core/src/js/integrations/devicecontext.ts |  5 +-
 .../test/integrations/devicecontext.test.ts   | 59 ++++++++++++-------
 2 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts
index 7302e6eeae..b7e1aedc06 100644
--- a/packages/core/src/js/integrations/devicecontext.ts
+++ b/packages/core/src/js/integrations/devicecontext.ts
@@ -85,7 +85,10 @@ async function processEvent(event: Event): Promise<Event> {
     : undefined;
   if (nativeBreadcrumbs) {
     const maxBreadcrumbs = getClient()?.getOptions().maxBreadcrumbs ?? 100; // Default is 100.
-    event.breadcrumbs = nativeBreadcrumbs.concat(event.breadcrumbs || []).slice(0, maxBreadcrumbs);
+    event.breadcrumbs = nativeBreadcrumbs
+      .concat(event.breadcrumbs || []) // concatenate the native and js breadcrumbs
+      .sort((a, b) => (a.timestamp ?? 0) - (b.timestamp ?? 0)) // sort by timestamp
+      .slice(-maxBreadcrumbs); // keep the last maxBreadcrumbs
   }
 
   return event;
diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts
index ba15469b7e..c8b643799b 100644
--- a/packages/core/test/integrations/devicecontext.test.ts
+++ b/packages/core/test/integrations/devicecontext.test.ts
@@ -167,6 +167,7 @@ describe('Device Context Integration', () => {
   });
 
   it('merge native and event breadcrumbs', async () => {
+    getClient().getOptions().maxBreadcrumbs = undefined; // Default 100
     const { processedEvent } = await processEventWith({
       nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
       mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
@@ -181,43 +182,57 @@ describe('Device Context Integration', () => {
     });
   });
 
-  it('use only native breadcrumb if the maxBreadcrumbs limit does not leave space for event breadcrumbs', async () => {
-    getClient().getOptions().maxBreadcrumbs = 1;
+  it('respect breadcrumb order when merging', async () => {
+    getClient().getOptions().maxBreadcrumbs = undefined; // Default 100
     const { processedEvent } = await processEventWith({
-      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },
-      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb' }] },
+      nativeContexts: {
+        breadcrumbs: [
+          { message: 'native-breadcrumb-3', timestamp: 'Thursday, November 7, 2024 3:24:59 PM GMT+02:00' }, // 1730985899
+          { message: 'native-breadcrumb-1', timestamp: 'Thursday, November 7, 2024 3:24:57 PM GMT+02:00' }, // 1730985897
+        ],
+      },
+      mockEvent: {
+        breadcrumbs: [
+          { message: 'event-breadcrumb-4', timestamp: 1730985999 },
+          { message: 'event-breadcrumb-2', timestamp: 1730985898 },
+        ],
+      },
     });
     expect(processedEvent).toStrictEqual({
-      breadcrumbs: [{ message: 'native-breadcrumb' }],
+      breadcrumbs: [
+        { message: 'native-breadcrumb-1', timestamp: 1730985897 },
+        { message: 'event-breadcrumb-2', timestamp: 1730985898 },
+        { message: 'native-breadcrumb-3', timestamp: 1730985899 },
+        { message: 'event-breadcrumb-4', timestamp: 1730985999 },
+      ],
     });
   });
 
-  it('use native breadcrumbs and pick only the event breadcrumbs that fit the maxBreadcrumbs limit', async () => {
+  it('keep the last maxBreadcrumbs when merging', async () => {
     getClient().getOptions().maxBreadcrumbs = 3;
     const { processedEvent } = await processEventWith({
-      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
-      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
+      nativeContexts: {
+        breadcrumbs: [
+          { message: 'native-breadcrumb-3', timestamp: 'Thursday, November 7, 2024 3:24:59 PM GMT+02:00' }, // 1730985899
+          { message: 'native-breadcrumb-1', timestamp: 'Thursday, November 7, 2024 3:24:57 PM GMT+02:00' }, // 1730985897
+        ],
+      },
+      mockEvent: {
+        breadcrumbs: [
+          { message: 'event-breadcrumb-4', timestamp: 1730985999 },
+          { message: 'event-breadcrumb-2', timestamp: 1730985898 },
+        ],
+      },
     });
     expect(processedEvent).toStrictEqual({
       breadcrumbs: [
-        { message: 'native-breadcrumb-1' },
-        { message: 'native-breadcrumb-2' },
-        { message: 'event-breadcrumb-1' },
+        { message: 'event-breadcrumb-2', timestamp: 1730985898 },
+        { message: 'native-breadcrumb-3', timestamp: 1730985899 },
+        { message: 'event-breadcrumb-4', timestamp: 1730985999 },
       ],
     });
   });
 
-  it('do not use any breadcrumbs if the maxBreadcrumbs limit is set to zero', async () => {
-    getClient().getOptions().maxBreadcrumbs = 0;
-    const { processedEvent } = await processEventWith({
-      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb' }] },
-      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb' }] },
-    });
-    expect(processedEvent).toStrictEqual({
-      breadcrumbs: [],
-    });
-  });
-
   it('adds in_foreground false to native app contexts', async () => {
     mockCurrentAppState = 'background';
     const { processedEvent } = await processEventWith({

From 17e2201fb939a3e1aba5af40df53600787cc9747 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 11 Nov 2024 13:51:20 +0200
Subject: [PATCH 19/45] Use client from function parameter

---
 .../core/src/js/integrations/devicecontext.ts |   7 +-
 .../test/integrations/devicecontext.test.ts   | 114 ++++++++++--------
 2 files changed, 66 insertions(+), 55 deletions(-)

diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts
index b7e1aedc06..9948557c8a 100644
--- a/packages/core/src/js/integrations/devicecontext.ts
+++ b/packages/core/src/js/integrations/devicecontext.ts
@@ -1,6 +1,5 @@
 /* eslint-disable complexity */
-import { getClient } from '@sentry/core';
-import type { Event, Integration } from '@sentry/types';
+import type { Client, Event, EventHint, Integration } from '@sentry/types';
 import { logger, severityLevelFromString } from '@sentry/utils';
 import { AppState } from 'react-native';
 
@@ -21,7 +20,7 @@ export const deviceContextIntegration = (): Integration => {
   };
 };
 
-async function processEvent(event: Event): Promise<Event> {
+async function processEvent(event: Event, _hint: EventHint, client: Client): Promise<Event> {
   let native: NativeDeviceContextsResponse | null = null;
   try {
     native = await NATIVE.fetchNativeDeviceContexts();
@@ -84,7 +83,7 @@ async function processEvent(event: Event): Promise<Event> {
     ? native['breadcrumbs'].map(breadcrumbFromObject)
     : undefined;
   if (nativeBreadcrumbs) {
-    const maxBreadcrumbs = getClient()?.getOptions().maxBreadcrumbs ?? 100; // Default is 100.
+    const maxBreadcrumbs = client?.getOptions().maxBreadcrumbs ?? 100; // Default is 100.
     event.breadcrumbs = nativeBreadcrumbs
       .concat(event.breadcrumbs || []) // concatenate the native and js breadcrumbs
       .sort((a, b) => (a.timestamp ?? 0) - (b.timestamp ?? 0)) // sort by timestamp
diff --git a/packages/core/test/integrations/devicecontext.test.ts b/packages/core/test/integrations/devicecontext.test.ts
index c8b643799b..d8ad810d8e 100644
--- a/packages/core/test/integrations/devicecontext.test.ts
+++ b/packages/core/test/integrations/devicecontext.test.ts
@@ -1,4 +1,3 @@
-import { getClient } from '@sentry/core';
 import type { Client, Event, EventHint, SeverityLevel } from '@sentry/types';
 
 import { deviceContextIntegration } from '../../src/js/integrations/devicecontext';
@@ -7,19 +6,18 @@ import { NATIVE } from '../../src/js/wrapper';
 
 let mockCurrentAppState: string = 'unknown';
 
+const mockClient = {
+  getOptions: jest.fn().mockReturnValue({
+    maxBreadcrumbs: undefined, // Default 100
+  }),
+} as unknown as Client;
+
 jest.mock('../../src/js/wrapper');
 jest.mock('react-native', () => ({
   AppState: new Proxy({}, { get: () => mockCurrentAppState }),
   NativeModules: {},
   Platform: {},
 }));
-jest.mock('@sentry/core', () => ({
-  getClient: jest.fn().mockReturnValue({
-    getOptions: jest.fn().mockReturnValue({
-      maxBreadcrumbs: 100, // Default value
-    }),
-  }),
-}));
 
 describe('Device Context Integration', () => {
   it('add native user', async () => {
@@ -167,11 +165,13 @@ describe('Device Context Integration', () => {
   });
 
   it('merge native and event breadcrumbs', async () => {
-    getClient().getOptions().maxBreadcrumbs = undefined; // Default 100
-    const { processedEvent } = await processEventWith({
-      nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
-      mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
-    });
+    const { processedEvent } = await processEventWith(
+      {
+        nativeContexts: { breadcrumbs: [{ message: 'native-breadcrumb-1' }, { message: 'native-breadcrumb-2' }] },
+        mockEvent: { breadcrumbs: [{ message: 'event-breadcrumb-1' }, { message: 'event-breadcrumb-2' }] },
+      },
+      mockClient,
+    );
     expect(processedEvent).toStrictEqual({
       breadcrumbs: [
         { message: 'native-breadcrumb-1' },
@@ -183,21 +183,23 @@ describe('Device Context Integration', () => {
   });
 
   it('respect breadcrumb order when merging', async () => {
-    getClient().getOptions().maxBreadcrumbs = undefined; // Default 100
-    const { processedEvent } = await processEventWith({
-      nativeContexts: {
-        breadcrumbs: [
-          { message: 'native-breadcrumb-3', timestamp: 'Thursday, November 7, 2024 3:24:59 PM GMT+02:00' }, // 1730985899
-          { message: 'native-breadcrumb-1', timestamp: 'Thursday, November 7, 2024 3:24:57 PM GMT+02:00' }, // 1730985897
-        ],
-      },
-      mockEvent: {
-        breadcrumbs: [
-          { message: 'event-breadcrumb-4', timestamp: 1730985999 },
-          { message: 'event-breadcrumb-2', timestamp: 1730985898 },
-        ],
+    const { processedEvent } = await processEventWith(
+      {
+        nativeContexts: {
+          breadcrumbs: [
+            { message: 'native-breadcrumb-3', timestamp: 'Thursday, November 7, 2024 3:24:59 PM GMT+02:00' }, // 1730985899
+            { message: 'native-breadcrumb-1', timestamp: 'Thursday, November 7, 2024 3:24:57 PM GMT+02:00' }, // 1730985897
+          ],
+        },
+        mockEvent: {
+          breadcrumbs: [
+            { message: 'event-breadcrumb-4', timestamp: 1730985999 },
+            { message: 'event-breadcrumb-2', timestamp: 1730985898 },
+          ],
+        },
       },
-    });
+      mockClient,
+    );
     expect(processedEvent).toStrictEqual({
       breadcrumbs: [
         { message: 'native-breadcrumb-1', timestamp: 1730985897 },
@@ -209,21 +211,28 @@ describe('Device Context Integration', () => {
   });
 
   it('keep the last maxBreadcrumbs when merging', async () => {
-    getClient().getOptions().maxBreadcrumbs = 3;
-    const { processedEvent } = await processEventWith({
-      nativeContexts: {
-        breadcrumbs: [
-          { message: 'native-breadcrumb-3', timestamp: 'Thursday, November 7, 2024 3:24:59 PM GMT+02:00' }, // 1730985899
-          { message: 'native-breadcrumb-1', timestamp: 'Thursday, November 7, 2024 3:24:57 PM GMT+02:00' }, // 1730985897
-        ],
-      },
-      mockEvent: {
-        breadcrumbs: [
-          { message: 'event-breadcrumb-4', timestamp: 1730985999 },
-          { message: 'event-breadcrumb-2', timestamp: 1730985898 },
-        ],
+    const mockClient = {
+      getOptions: jest.fn().mockReturnValue({
+        maxBreadcrumbs: 3,
+      }),
+    } as unknown as Client;
+    const { processedEvent } = await processEventWith(
+      {
+        nativeContexts: {
+          breadcrumbs: [
+            { message: 'native-breadcrumb-3', timestamp: 'Thursday, November 7, 2024 3:24:59 PM GMT+02:00' }, // 1730985899
+            { message: 'native-breadcrumb-1', timestamp: 'Thursday, November 7, 2024 3:24:57 PM GMT+02:00' }, // 1730985897
+          ],
+        },
+        mockEvent: {
+          breadcrumbs: [
+            { message: 'event-breadcrumb-4', timestamp: 1730985999 },
+            { message: 'event-breadcrumb-2', timestamp: 1730985898 },
+          ],
+        },
       },
-    });
+      mockClient,
+    );
     expect(processedEvent).toStrictEqual({
       breadcrumbs: [
         { message: 'event-breadcrumb-2', timestamp: 1730985898 },
@@ -278,13 +287,16 @@ describe('Device Context Integration', () => {
   });
 });
 
-async function processEventWith({
-  nativeContexts,
-  mockEvent,
-}: {
-  nativeContexts: Record<string, unknown>;
-  mockEvent?: Event;
-}): Promise<{
+async function processEventWith(
+  {
+    nativeContexts,
+    mockEvent,
+  }: {
+    nativeContexts: Record<string, unknown>;
+    mockEvent?: Event;
+  },
+  client: Client = {} as undefined as Client,
+): Promise<{
   processedEvent: Event | null;
   expectEvent: {
     toStrictEqualToNativeContexts: () => void;
@@ -296,7 +308,7 @@ async function processEventWith({
   );
   const originalNativeContexts = { ...nativeContexts };
   const originalMockEvent = { ...mockEvent };
-  const processedEvent = await processEvent(mockEvent ?? {});
+  const processedEvent = await processEvent(mockEvent ?? {}, client);
   return {
     processedEvent,
     expectEvent: {
@@ -306,6 +318,6 @@ async function processEventWith({
   };
 }
 
-function processEvent(mockedEvent: Event): Event | null | PromiseLike<Event | null> {
-  return deviceContextIntegration().processEvent!(mockedEvent, {} as EventHint, {} as Client);
+function processEvent(mockedEvent: Event, client: Client): Event | null | PromiseLike<Event | null> {
+  return deviceContextIntegration().processEvent!(mockedEvent, {} as EventHint, client);
 }

From 76285fab00c467c76816ad4b0b8dd62e23b16666 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 11 Nov 2024 14:09:24 +0200
Subject: [PATCH 20/45] Refactor and test
 RNSentryModuleImpl.fetchNativeDeviceContexts (#4253)

* Refactor fetchNativeDeviceContexts for testability

* Test fetchNativeDeviceContexts

* Adds new line at the end
---
 .../io/sentry/react/RNSentryModuleImplTest.kt | 86 +++++++++++++++++++
 .../io/sentry/react/RNSentryModuleImpl.java   | 14 ++-
 2 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 packages/core/RNSentryAndroidTester/app/src/androidTest/java/io/sentry/react/RNSentryModuleImplTest.kt

diff --git a/packages/core/RNSentryAndroidTester/app/src/androidTest/java/io/sentry/react/RNSentryModuleImplTest.kt b/packages/core/RNSentryAndroidTester/app/src/androidTest/java/io/sentry/react/RNSentryModuleImplTest.kt
new file mode 100644
index 0000000000..d314420758
--- /dev/null
+++ b/packages/core/RNSentryAndroidTester/app/src/androidTest/java/io/sentry/react/RNSentryModuleImplTest.kt
@@ -0,0 +1,86 @@
+package io.sentry.react
+
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
+import com.facebook.react.bridge.PromiseImpl
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.soloader.SoLoader
+import io.sentry.Breadcrumb
+import io.sentry.Scope
+import io.sentry.SentryOptions
+import io.sentry.android.core.SentryAndroidOptions
+import org.junit.Assert.assertEquals
+import org.junit.Assert.fail
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class RNSentryModuleImplTest {
+
+    private lateinit var module: RNSentryModuleImpl
+    private lateinit var context: Context
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+        SoLoader.init(context, false)
+        val reactContext = ReactApplicationContext(context)
+        module = RNSentryModuleImpl(reactContext)
+    }
+
+    @Test
+    fun fetchNativeDeviceContextsWithNullContext() {
+        val options = SentryAndroidOptions()
+        val scope = Scope(options)
+        val promise = PromiseImpl({
+            assertEquals(1, it.size)
+            assertEquals(null, it[0])
+        }, {
+            fail("Promise was rejected unexpectedly")
+        })
+        module.fetchNativeDeviceContexts(promise, options, null, scope)
+    }
+
+    @Test
+    fun fetchNativeDeviceContextsWithInvalidSentryOptions() {
+        class NotAndroidSentryOptions : SentryOptions()
+
+        val options = NotAndroidSentryOptions()
+        val scope = Scope(options)
+        val promise = PromiseImpl({
+            assertEquals(1, it.size)
+            assertEquals(null, it[0])
+        }, {
+            fail("Promise was rejected unexpectedly")
+        })
+        module.fetchNativeDeviceContexts(promise, options, context, scope)
+    }
+
+    @Test
+    fun fetchNativeDeviceContextsFiltersBreadcrumbs() {
+        val options = SentryAndroidOptions().apply { maxBreadcrumbs = 5 }
+        val scope = Scope(options)
+        scope.addBreadcrumb(Breadcrumb("Breadcrumb1-RN").apply { origin = "react-native" })
+        scope.addBreadcrumb(Breadcrumb("Breadcrumb2-Native"))
+        scope.addBreadcrumb(Breadcrumb("Breadcrumb3-Native").apply { origin = "java" })
+        scope.addBreadcrumb(Breadcrumb("Breadcrumb2-RN").apply { origin = "react-native" })
+        scope.addBreadcrumb(Breadcrumb("Breadcrumb2-RN").apply { origin = "react-native" })
+
+        val promise = PromiseImpl({
+            assertEquals(1, it.size)
+            assertEquals(true, it[0] is WritableMap)
+            val actual = it[0] as WritableMap
+            val breadcrumbs = actual.getArray("breadcrumbs")
+            assertEquals(2, breadcrumbs?.size())
+            assertEquals("Breadcrumb2-Native", breadcrumbs?.getMap(0)?.getString("message"))
+            assertEquals("Breadcrumb3-Native", breadcrumbs?.getMap(1)?.getString("message"))
+        }, {
+            fail("Promise was rejected unexpectedly")
+        })
+
+        module.fetchNativeDeviceContexts(promise, options, context, scope)
+    }
+}
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 388b45dc7a..5ae47a0ae6 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -888,18 +888,24 @@ private String readStringFromFile(File path) throws IOException {
 
   public void fetchNativeDeviceContexts(Promise promise) {
     final @NotNull SentryOptions options = HubAdapter.getInstance().getOptions();
+    final @Nullable Context context = this.getReactApplicationContext().getApplicationContext();
+    final @Nullable IScope currentScope = InternalSentrySdk.getCurrentScope();
+    fetchNativeDeviceContexts(promise, options, context, currentScope);
+  }
+
+  protected void fetchNativeDeviceContexts(
+      Promise promise,
+      final @NotNull SentryOptions options,
+      final @Nullable Context context,
+      final @Nullable IScope currentScope) {
     if (!(options instanceof SentryAndroidOptions)) {
       promise.resolve(null);
       return;
     }
-
-    final @Nullable Context context = this.getReactApplicationContext().getApplicationContext();
     if (context == null) {
       promise.resolve(null);
       return;
     }
-
-    final @Nullable IScope currentScope = InternalSentrySdk.getCurrentScope();
     if (currentScope != null) {
       // Remove react-native breadcrumbs
       Iterator<Breadcrumb> breadcrumbsIterator = currentScope.getBreadcrumbs().iterator();

From ff7ca33fadb7fb72cef018c4504aa5d89914cc7e Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 12 Nov 2024 13:10:56 +0200
Subject: [PATCH 21/45] Revert "Filter out DevServer and DSN related
 breadcrumbs"

This reverts commit 87bdc775970787ed364271168dc3f6b8aa245e1e.
---
 .../core/src/js/integrations/devicecontext.ts | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/packages/core/src/js/integrations/devicecontext.ts b/packages/core/src/js/integrations/devicecontext.ts
index 02c4b257bd..7302e6eeae 100644
--- a/packages/core/src/js/integrations/devicecontext.ts
+++ b/packages/core/src/js/integrations/devicecontext.ts
@@ -1,13 +1,12 @@
 /* eslint-disable complexity */
 import { getClient } from '@sentry/core';
-import type { Breadcrumb, Event, Integration } from '@sentry/types';
+import type { Event, Integration } from '@sentry/types';
 import { logger, severityLevelFromString } from '@sentry/utils';
 import { AppState } from 'react-native';
 
 import { breadcrumbFromObject } from '../breadcrumb';
 import type { NativeDeviceContextsResponse } from '../NativeRNSentry';
 import { NATIVE } from '../wrapper';
-import { getDevServer } from './debugsymbolicatorutils';
 
 const INTEGRATION_NAME = 'DeviceContext';
 
@@ -85,27 +84,9 @@ async function processEvent(event: Event): Promise<Event> {
     ? native['breadcrumbs'].map(breadcrumbFromObject)
     : undefined;
   if (nativeBreadcrumbs) {
-    // Concatenate nativeBreadcrumbs first, then event.breadcrumbs
-    event.breadcrumbs = nativeBreadcrumbs.concat(event.breadcrumbs || []);
+    const maxBreadcrumbs = getClient()?.getOptions().maxBreadcrumbs ?? 100; // Default is 100.
+    event.breadcrumbs = nativeBreadcrumbs.concat(event.breadcrumbs || []).slice(0, maxBreadcrumbs);
   }
 
-  const options = getClient()?.getOptions();
-  const maxBreadcrumbs = options.maxBreadcrumbs ?? 100; // Default is 100.
-  const devServerUrl = getDevServer()?.url || '';
-  const dsn = options.dsn || '';
-
-  let allBreadcrumbs = event.breadcrumbs || [];
-
-  // Filter out Dev Server and Sentry DSN request breadcrumbs
-  allBreadcrumbs = allBreadcrumbs.filter((breadcrumb: Breadcrumb) => {
-    const type = breadcrumb.type || '';
-    const url = breadcrumb.data?.url || '';
-    return !(type === 'http' && (url.includes(devServerUrl) || url.includes(dsn)));
-  });
-
-  // Ensure the maxBreadcrumbs limit is not exceeded after merging event and native breadcrumbs
-  // and filtering out Dev Server and Sentry DSN request breadcrumbs
-  event.breadcrumbs = allBreadcrumbs.slice(0, maxBreadcrumbs);
-
   return event;
 }

From 3811047f24770a0e9ebed5ea7459a6d4886c48a1 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 12 Nov 2024 16:32:13 +0200
Subject: [PATCH 22/45] Passes development server url as an option to the
 native sdks

---
 packages/core/src/js/client.ts     |  2 ++
 packages/core/src/js/wrapper.ts    |  1 +
 packages/core/test/wrapper.test.ts | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/js/client.ts b/packages/core/src/js/client.ts
index eba33d13d3..b9fe2ad27d 100644
--- a/packages/core/src/js/client.ts
+++ b/packages/core/src/js/client.ts
@@ -14,6 +14,7 @@ import type {
 import { dateTimestampInSeconds, logger, SentryError } from '@sentry/utils';
 import { Alert } from 'react-native';
 
+import { getDevServer } from './integrations/debugsymbolicatorutils';
 import { defaultSdkInfo } from './integrations/sdkinfo';
 import { getDefaultSidecarUrl } from './integrations/spotlight';
 import type { ReactNativeClientOptions } from './options';
@@ -146,6 +147,7 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
     NATIVE.initNativeSdk({
       ...this._options,
       defaultSidecarUrl: getDefaultSidecarUrl(),
+      devServerUrl: getDevServer()?.url || '',
       mobileReplayOptions:
         this._integrations[MOBILE_REPLAY_INTEGRATION_NAME] &&
         'options' in this._integrations[MOBILE_REPLAY_INTEGRATION_NAME]
diff --git a/packages/core/src/js/wrapper.ts b/packages/core/src/js/wrapper.ts
index f32652a0ce..ef7396f666 100644
--- a/packages/core/src/js/wrapper.ts
+++ b/packages/core/src/js/wrapper.ts
@@ -50,6 +50,7 @@ export interface Screenshot {
 }
 
 export type NativeSdkOptions = Partial<ReactNativeClientOptions> & {
+  devServerUrl: string | undefined;
   defaultSidecarUrl: string | undefined;
 } & {
   mobileReplayOptions: MobileReplayOptions | undefined;
diff --git a/packages/core/test/wrapper.test.ts b/packages/core/test/wrapper.test.ts
index ff54667211..34869b9f7c 100644
--- a/packages/core/test/wrapper.test.ts
+++ b/packages/core/test/wrapper.test.ts
@@ -99,6 +99,7 @@ describe('Tests Native Wrapper', () => {
       await NATIVE.initNativeSdk({
         dsn: 'test',
         enableNative: true,
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -109,7 +110,12 @@ describe('Tests Native Wrapper', () => {
     test('warns if there is no dsn', async () => {
       logger.warn = jest.fn();
 
-      await NATIVE.initNativeSdk({ enableNative: true, defaultSidecarUrl: undefined, mobileReplayOptions: undefined });
+      await NATIVE.initNativeSdk({
+        enableNative: true,
+        defaultSidecarUrl: undefined,
+        devServerUrl: undefined,
+        mobileReplayOptions: undefined,
+      });
 
       expect(RNSentry.initNativeSdk).not.toBeCalled();
       expect(logger.warn).toHaveBeenLastCalledWith(
@@ -124,6 +130,7 @@ describe('Tests Native Wrapper', () => {
         dsn: 'test',
         enableNative: false,
         enableNativeNagger: true,
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -139,6 +146,7 @@ describe('Tests Native Wrapper', () => {
         enableNative: true,
         autoInitializeNativeSdk: true,
         beforeSend: jest.fn(),
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -156,6 +164,7 @@ describe('Tests Native Wrapper', () => {
         enableNative: true,
         autoInitializeNativeSdk: true,
         beforeBreadcrumb: jest.fn(),
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -173,6 +182,7 @@ describe('Tests Native Wrapper', () => {
         enableNative: true,
         autoInitializeNativeSdk: true,
         beforeSendTransaction: jest.fn(),
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -190,6 +200,7 @@ describe('Tests Native Wrapper', () => {
         enableNative: true,
         autoInitializeNativeSdk: true,
         integrations: [],
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -209,6 +220,7 @@ describe('Tests Native Wrapper', () => {
         dsn: 'test',
         enableNative: true,
         autoInitializeNativeSdk: false,
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });
@@ -249,6 +261,7 @@ describe('Tests Native Wrapper', () => {
       logger.warn = jest.fn();
 
       await NATIVE.initNativeSdk({
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
         dsn: 'test',
@@ -335,6 +348,7 @@ describe('Tests Native Wrapper', () => {
         await NATIVE.initNativeSdk({
           dsn: 'test-dsn',
           enableNative: false,
+          devServerUrl: undefined,
           defaultSidecarUrl: undefined,
           mobileReplayOptions: undefined,
         });
@@ -532,6 +546,7 @@ describe('Tests Native Wrapper', () => {
       await NATIVE.initNativeSdk({
         dsn: 'test-dsn',
         enableNative: false,
+        devServerUrl: undefined,
         defaultSidecarUrl: undefined,
         mobileReplayOptions: undefined,
       });

From c3da88b56b97fd7e3241826f9f01ad8ba7c34cfe Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 12 Nov 2024 17:31:26 +0200
Subject: [PATCH 23/45] Filter out Dev Server and Sentry Dsn breadcrumbs on
 Android

---
 .../java/io/sentry/react/RNSentryModuleImpl.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 5ae47a0ae6..eb229956f3 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -277,6 +277,21 @@ protected void getSentryAndroidOptions(
       options.getReplayController().setBreadcrumbConverter(new RNSentryReplayBreadcrumbConverter());
     }
 
+    // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
+    String dsn = rnOptions.getString("dsn") != null ? rnOptions.getString("dsn") : "";
+    String devServerUrl =
+        rnOptions.getString("devServerUrl") != null ? rnOptions.getString("devServerUrl") : "";
+    options.setBeforeBreadcrumb(
+        (breadcrumb, hint) -> {
+          Object urlObject = breadcrumb.getData("url");
+          String url = urlObject instanceof String ? (String) urlObject : "";
+          if ("http".equals(breadcrumb.getType())
+              && (url.contains(dsn) || url.contains(devServerUrl))) {
+            return null;
+          }
+          return breadcrumb;
+        });
+
     // React native internally throws a JavascriptException.
     // we want to ignore it on the native side to avoid sending it twice.
     options.addIgnoredExceptionForType(JavascriptException.class);

From d67de6cea5239c4ee79777d6014a47f17cb050a1 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 12 Nov 2024 17:31:36 +0200
Subject: [PATCH 24/45] Filter out Dev Server and Sentry Dsn breadcrumbs on iOS

---
 packages/core/ios/RNSentry.mm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 3e2e554782..0ecc37ee4c 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -162,6 +162,21 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
         return nil;
     }
 
+    // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
+    NSString *dsn = [mutableOptions valueForKey:@"dsn"] ?: @"";
+    NSString *devServerUrl = [mutableOptions valueForKey:@"devServerUrl"] ?: @"";
+    sentryOptions.beforeBreadcrumb
+        = ^SentryBreadcrumb *_Nullable(SentryBreadcrumb *_Nonnull breadcrumb)
+    {
+        NSString *url = breadcrumb.data[@"url"] ?: @"";
+
+        if ([@"http" isEqualToString:breadcrumb.type]
+            && ([url containsString:dsn] || [url containsString:devServerUrl])) {
+            return nil;
+        }
+        return breadcrumb;
+    };
+
     if ([mutableOptions valueForKey:@"enableNativeCrashHandling"] != nil) {
         BOOL enableNativeCrashHandling = [mutableOptions[@"enableNativeCrashHandling"] boolValue];
 

From 6ddc665e5755c42f5eeb7ae52a46d71ac1e94587 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 12 Nov 2024 19:41:30 +0200
Subject: [PATCH 25/45] Filter out Dev Server and Sentry Dsn breadcrumbs on JS

---
 packages/core/src/js/sdk.tsx | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index 70e74300cd..275913115b 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -4,11 +4,12 @@ import {
   defaultStackParser,
   makeFetchTransport,
 } from '@sentry/react';
-import type { Integration, Scope,UserFeedback } from '@sentry/types';
+import type { Breadcrumb, BreadcrumbHint,Integration, Scope,UserFeedback  } from '@sentry/types';
 import { logger, stackParserFromStackParserOptions } from '@sentry/utils';
 import * as React from 'react';
 
 import { ReactNativeClient } from './client';
+import { getDevServer } from './integrations/debugsymbolicatorutils';
 import { getDefaultIntegrations } from './integrations/default';
 import type { ReactNativeClientOptions, ReactNativeOptions, ReactNativeWrapperOptions } from './options';
 import { shouldEnableNativeNagger } from './options';
@@ -62,6 +63,32 @@ export function init(passedOptions: ReactNativeOptions): void {
     enableSyncToNative(getIsolationScope());
   }
 
+  const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });
+
+  // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
+  const devServerUrl = getDevServer()?.url || '';
+  const dsn = passedOptions.dsn || '';
+  const defaultBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint): Breadcrumb | null => {
+    const type = breadcrumb.type || '';
+    const url = typeof breadcrumb.data?.url === 'string' ? breadcrumb.data.url : '';
+    if (type === 'http' && (url.includes(devServerUrl) || url.includes(dsn))) {
+      return null;
+    }
+    return breadcrumb;
+  };
+
+  const chainedBeforeBreadcrumb = (breadcrumb: Breadcrumb, hint?: BreadcrumbHint): Breadcrumb | null => {
+    let modifiedBreadcrumb = breadcrumb;
+    if (userBeforeBreadcrumb) {
+      const result = userBeforeBreadcrumb(breadcrumb, hint);
+      if (result === null) {
+        return null;
+      }
+      modifiedBreadcrumb = result;
+    }
+    return defaultBeforeBreadcrumb(modifiedBreadcrumb, hint);
+  };
+
   const options: ReactNativeClientOptions = {
     ...DEFAULT_OPTIONS,
     ...passedOptions,
@@ -81,7 +108,7 @@ export function init(passedOptions: ReactNativeOptions): void {
     maxQueueSize,
     integrations: [],
     stackParser: stackParserFromStackParserOptions(passedOptions.stackParser || defaultStackParser),
-    beforeBreadcrumb: safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' }),
+    beforeBreadcrumb: chainedBeforeBreadcrumb,
     initialScope: safeFactory(passedOptions.initialScope, { loggerMessage: 'The initialScope threw an error' }),
   };
   if ('tracesSampler' in options) {

From af02c03d55f55335cc420c38314deb1b6a79f80d Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 13 Nov 2024 12:10:48 +0200
Subject: [PATCH 26/45] Adds Java tests

---
 .../io/sentry/react/RNSentryModuleImplTest.kt | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
index 448715d43d..36f00c3185 100644
--- a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
+++ b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
@@ -8,12 +8,14 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.common.JavascriptException
+import io.sentry.Breadcrumb
 import io.sentry.ILogger
 import io.sentry.SentryLevel
 import io.sentry.android.core.SentryAndroidOptions
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -134,4 +136,63 @@ class RNSentryModuleImplTest {
         module.getSentryAndroidOptions(actualOptions, JavaOnlyMap.of(), logger)
         assertTrue(actualOptions.ignoredExceptionsForType.contains(JavascriptException::class.java))
     }
+
+    @Test
+    fun `beforeBreadcrumb callback filters out Sentry DSN requests breadcrumbs`() {
+        val mockDsn = "https://abc@def.ingest.sentry.io/1234567"
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of(
+            "dsn", mockDsn,
+            "devServerUrl", "http://localhost:8081",
+        )
+        module.getSentryAndroidOptions(options, rnOptions, logger)
+
+        val breadcrumb = Breadcrumb().apply {
+            type = "http"
+            setData("url", mockDsn)
+        }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertNull("Breadcrumb should be filtered out", result)
+    }
+
+    @Test
+    fun `beforeBreadcrumb callback filters out dev server breadcrumbs`() {
+        val mockDevServerUrl = "http://localhost:8081"
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of(
+            "dsn", "https://abc@def.ingest.sentry.io/1234567",
+            "devServerUrl", mockDevServerUrl,
+        )
+        module.getSentryAndroidOptions(options, rnOptions, logger)
+
+        val breadcrumb = Breadcrumb().apply {
+            type = "http"
+            setData("url", mockDevServerUrl)
+        }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertNull("Breadcrumb should be filtered out", result)
+    }
+
+    @Test
+    fun `beforeBreadcrumb callback does not filter out non dev server or dsn breadcrumbs`() {
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of(
+            "dsn", "https://abc@def.ingest.sentry.io/1234567",
+            "devServerUrl", "http://localhost:8081",
+        )
+        module.getSentryAndroidOptions(options, rnOptions, logger)
+
+        val breadcrumb = Breadcrumb().apply {
+            type = "http"
+            setData("url", "http://testurl.com/service")
+        }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
 }

From 7ae568a245d128edbf0c399583d5e2e6bea624fe Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 13 Nov 2024 12:34:05 +0200
Subject: [PATCH 27/45] Adds Cocoa tests

---
 .../RNSentryCocoaTesterTests/RNSentryTests.mm | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
index a72ed1e0bf..8eeecf59b2 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
@@ -238,6 +238,65 @@ - (void)testPassesErrorOnWrongDsn
     XCTAssertNotNil(error, @"Did not created error on invalid dsn");
 }
 
+- (void)testBeforeBreadcrumbsCallbackFiltersOutSentryDsnRequestBreadcrumbs
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSString *mockDsn = @"https://abc@def.ingest.sentry.io/1234567";
+
+    NSDictionary *_Nonnull mockedDictionary = @{ @"dsn" : mockDsn, @"" : @"http://localhost:8081" };
+    SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
+
+    SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
+    breadcrumb.type = @"http";
+    breadcrumb.data = @{ @"url" : mockDsn };
+
+    SentryBreadcrumb *result = options.beforeBreadcrumb(breadcrumb);
+
+    XCTAssertNil(result, @"Breadcrumb should be filtered out");
+}
+
+- (void)testBeforeBreadcrumbsCallbackFiltersOutDevServerRequestBreadcrumbs
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSString *mockDevServer = @"https://abc@def.ingest.sentry.io/1234567";
+
+    NSDictionary *_Nonnull mockedDictionary =
+        @{ @"dsn" : @"https://abc@def.ingest.sentry.io/1234567", @"" : mockDevServer };
+    SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
+
+    SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
+    breadcrumb.type = @"http";
+    breadcrumb.data = @{ @"url" : mockDevServer };
+
+    SentryBreadcrumb *result = options.beforeBreadcrumb(breadcrumb);
+
+    XCTAssertNil(result, @"Breadcrumb should be filtered out");
+}
+
+- (void)testBeforeBreadcrumbsCallbackDoesNotFiltersOutNonDevServerOrDsnRequestBreadcrumbs
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSDictionary *_Nonnull mockedDictionary = @{
+        @"dsn" : @"https://abc@def.ingest.sentry.io/1234567",
+        @"" : @"https://abc@def.ingest.sentry.io/1234567"
+    };
+    SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
+
+    SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
+    breadcrumb.type = @"http";
+    breadcrumb.data = @{ @"url" : @"http://testurl.com/service" };
+
+    SentryBreadcrumb *result = options.beforeBreadcrumb(breadcrumb);
+
+    XCTAssertEqual(breadcrumb, result);
+}
+
 - (void)testEventFromSentryCocoaReactNativeHasOriginAndEnvironmentTags
 {
     RNSentry *rnSentry = [[RNSentry alloc] init];

From 575821e798759f7660689af6b0d8b58917ea035b Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 13 Nov 2024 13:09:55 +0200
Subject: [PATCH 28/45] Adds JS tests

---
 packages/core/test/sdk.test.ts | 116 ++++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index b5487340cd..2b3e574184 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -1,8 +1,16 @@
 import { initAndBind } from '@sentry/core';
 import { makeFetchTransport } from '@sentry/react';
-import type { BaseTransportOptions, ClientOptions, Integration, Scope } from '@sentry/types';
+import type {
+  BaseTransportOptions,
+  Breadcrumb,
+  BreadcrumbHint,
+  ClientOptions,
+  Integration,
+  Scope,
+} from '@sentry/types';
 import { logger } from '@sentry/utils';
 
+import { getDevServer } from '../src/js/integrations/debugsymbolicatorutils';
 import { init, withScope } from '../src/js/sdk';
 import type { ReactNativeTracingIntegration } from '../src/js/tracing';
 import { REACT_NATIVE_TRACING_INTEGRATION_NAME, reactNativeTracingIntegration } from '../src/js/tracing';
@@ -18,6 +26,9 @@ jest.mock('@sentry/core', () => ({
   ...jest.requireActual('@sentry/core'),
   initAndBind: jest.fn(),
 }));
+jest.mock('../src/js/integrations/debugsymbolicatorutils', () => ({
+  getDevServer: jest.fn(),
+}));
 
 describe('Tests the SDK functionality', () => {
   beforeEach(() => {
@@ -292,6 +303,109 @@ describe('Tests the SDK functionality', () => {
     });
   });
 
+  describe('beforeBreadcrumb', () => {
+    it('should filters out dev server breadcrumbs', () => {
+      const devServerUrl = 'http://localhost:8081';
+      (getDevServer as jest.Mock).mockReturnValue({ url: devServerUrl });
+
+      const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
+        return breadcrumb;
+      };
+
+      const passedOptions = {
+        dsn: 'https://example@sentry.io/123',
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
+
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: devServerUrl },
+      };
+
+      const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+      expect(result).toBeNull();
+    });
+
+    it('should filters out dsn breadcrumbs', () => {
+      const mockDsn = 'https://example@sentry.io/123';
+      (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });
+
+      const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
+        return breadcrumb;
+      };
+
+      const passedOptions = {
+        dsn: mockDsn,
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
+
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: mockDsn },
+      };
+
+      const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+      expect(result).toBeNull();
+    });
+
+    it('should keep non dev server or dsn breadcrumbs', () => {
+      (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });
+
+      const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
+        return breadcrumb;
+      };
+
+      const passedOptions = {
+        dsn: 'https://example@sentry.io/123',
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
+
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: 'http://testurl.com/service' },
+      };
+
+      const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+      expect(result).toEqual(breadcrumb);
+    });
+
+    it('verify the user beforeBreadcrumb is chained', () => {
+      const devServerUrl = 'http://localhost:8081';
+
+      (getDevServer as jest.Mock).mockReturnValue({ url: devServerUrl });
+
+      const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
+        breadcrumb.data = { url: devServerUrl }; // Set to an excuded url
+        return breadcrumb;
+      };
+
+      const passedOptions = {
+        dsn: 'https://example@sentry.io/123',
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
+
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: 'http://testurl.com/service' }, // Not an excuded url
+      };
+
+      const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+      expect(result).toBeNull();
+    });
+  });
+
   describe('withScope', () => {
     test('withScope callback does not throw', () => {
       const mockScopeCallback = jest.fn(() => {

From efa38715d461bf116767a937f82602ea8eb4424c Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 10:41:57 +0200
Subject: [PATCH 29/45] Sets correct spacing in import

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 packages/core/src/js/sdk.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index 275913115b..54e857af42 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -4,7 +4,7 @@ import {
   defaultStackParser,
   makeFetchTransport,
 } from '@sentry/react';
-import type { Breadcrumb, BreadcrumbHint,Integration, Scope,UserFeedback  } from '@sentry/types';
+import type { Breadcrumb, BreadcrumbHint, Integration, Scope, UserFeedback } from '@sentry/types';
 import { logger, stackParserFromStackParserOptions } from '@sentry/utils';
 import * as React from 'react';
 

From 709b8df8c9c2977b33eb27de1278accac7a6137d Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 10:42:32 +0200
Subject: [PATCH 30/45] Fixes changelog typo

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cfd1de5f9..ae3923383e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@
 
 ### Fixes
 
-- Excludes Dev Server and Sentry Dsn requests from Breadcrums ([#4240](https://github.com/getsentry/sentry-react-native/pull/4240))
+- Excludes Dev Server and Sentry Dsn requests from Breadcrumbs ([#4240](https://github.com/getsentry/sentry-react-native/pull/4240))
 - Prevents exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
 - Ignore JavascriptException to filter out obfuscated duplicate JS Errors on Android ([#4232](https://github.com/getsentry/sentry-react-native/pull/4232))
 - Skips ignoring require cycle logs for RN 0.70 or newer ([#4214](https://github.com/getsentry/sentry-react-native/pull/4214))

From fef13cac49916955b4156f80b552251263bfa4a5 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 10:46:29 +0200
Subject: [PATCH 31/45] Handles undefined dev server urls

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 packages/core/src/js/sdk.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index 54e857af42..7ff0db3e3a 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -66,12 +66,12 @@ export function init(passedOptions: ReactNativeOptions): void {
   const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });
 
   // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
-  const devServerUrl = getDevServer()?.url || '';
+  const devServerUrl = getDevServer()?.url';
   const dsn = passedOptions.dsn || '';
   const defaultBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint): Breadcrumb | null => {
     const type = breadcrumb.type || '';
     const url = typeof breadcrumb.data?.url === 'string' ? breadcrumb.data.url : '';
-    if (type === 'http' && (url.includes(devServerUrl) || url.includes(dsn))) {
+    if (type === 'http' && (devServerUrl && url.includes(devServerUrl) || url.includes(dsn))) {
       return null;
     }
     return breadcrumb;

From 96f3b5d4d4a58826a1c7c6da6fb71faf90692f56 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 11:03:36 +0200
Subject: [PATCH 32/45] Handles undefined dsns

---
 packages/core/src/js/sdk.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index 7ff0db3e3a..dbf94fd095 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -66,12 +66,12 @@ export function init(passedOptions: ReactNativeOptions): void {
   const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });
 
   // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
-  const devServerUrl = getDevServer()?.url';
-  const dsn = passedOptions.dsn || '';
+  const devServerUrl = getDevServer()?.url;
+  const dsn = passedOptions.dsn;
   const defaultBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint): Breadcrumb | null => {
     const type = breadcrumb.type || '';
     const url = typeof breadcrumb.data?.url === 'string' ? breadcrumb.data.url : '';
-    if (type === 'http' && (devServerUrl && url.includes(devServerUrl) || url.includes(dsn))) {
+    if (type === 'http' && ((devServerUrl && url.includes(devServerUrl)) || (dsn && url.includes(dsn)))) {
       return null;
     }
     return breadcrumb;

From ccaa5027a7390603c903bfca6f6d3deb00968736 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 11:03:59 +0200
Subject: [PATCH 33/45] Adds tests for undefined dev servers and dsns

---
 packages/core/test/sdk.test.ts | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index 2b3e574184..11db087dd2 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -406,6 +406,36 @@ describe('Tests the SDK functionality', () => {
     });
   });
 
+  it('should keep the breadcrumb when the dev server and dsn are undefined', () => {
+    (getDevServer as jest.Mock).mockReturnValue({ url: undefined });
+
+    init({});
+
+    const breadcrumb: Breadcrumb = {
+      type: 'http',
+      data: { url: 'http://testurl.com/service' },
+    };
+
+    const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+    expect(result).toEqual(breadcrumb);
+  });
+
+  it('should keep the breadcrumb when the dev server does not match and the dsn is undefined', () => {
+    (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });
+
+    init({});
+
+    const breadcrumb: Breadcrumb = {
+      type: 'http',
+      data: { url: 'http://testurl.com/service' },
+    };
+
+    const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+    expect(result).toEqual(breadcrumb);
+  });
+
   describe('withScope', () => {
     test('withScope callback does not throw', () => {
       const mockScopeCallback = jest.fn(() => {

From 06ff84c0cc564745dff4c3374654b8409306ef58 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 11:41:23 +0200
Subject: [PATCH 34/45] Handles undefined dev server urls in native code

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 8 ++++----
 packages/core/ios/RNSentry.mm                             | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index eb229956f3..afc5addee6 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -278,15 +278,15 @@ protected void getSentryAndroidOptions(
     }
 
     // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
-    String dsn = rnOptions.getString("dsn") != null ? rnOptions.getString("dsn") : "";
-    String devServerUrl =
-        rnOptions.getString("devServerUrl") != null ? rnOptions.getString("devServerUrl") : "";
+    String dsn = rnOptions.getString("dsn");
+    String devServerUrl = rnOptions.getString("devServerUrl");
     options.setBeforeBreadcrumb(
         (breadcrumb, hint) -> {
           Object urlObject = breadcrumb.getData("url");
           String url = urlObject instanceof String ? (String) urlObject : "";
           if ("http".equals(breadcrumb.getType())
-              && (url.contains(dsn) || url.contains(devServerUrl))) {
+              && ((dsn != null && url.contains(dsn))
+                  || (devServerUrl != null && url.contains(devServerUrl)))) {
             return null;
           }
           return breadcrumb;
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 0ecc37ee4c..f1e45f6d4f 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -163,15 +163,16 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     }
 
     // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
-    NSString *dsn = [mutableOptions valueForKey:@"dsn"] ?: @"";
-    NSString *devServerUrl = [mutableOptions valueForKey:@"devServerUrl"] ?: @"";
+    NSString *dsn = [mutableOptions valueForKey:@"dsn"];
+    NSString *devServerUrl = [mutableOptions valueForKey:@"devServerUrl"];
     sentryOptions.beforeBreadcrumb
         = ^SentryBreadcrumb *_Nullable(SentryBreadcrumb *_Nonnull breadcrumb)
     {
         NSString *url = breadcrumb.data[@"url"] ?: @"";
 
         if ([@"http" isEqualToString:breadcrumb.type]
-            && ([url containsString:dsn] || [url containsString:devServerUrl])) {
+            && ([url containsString:dsn]
+                || (devServerUrl != nil && [url containsString:devServerUrl]))) {
             return nil;
         }
         return breadcrumb;

From a213332290871706574734346ef6c4664d3c3c4a Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 11:42:00 +0200
Subject: [PATCH 35/45] Updates test cases

---
 .../io/sentry/react/RNSentryModuleImplTest.kt | 47 +++++++++++++++++++
 .../RNSentryCocoaTesterTests/RNSentryTests.mm | 28 +++++++++--
 packages/core/test/sdk.test.ts                | 15 ++++++
 3 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
index 36f00c3185..79ae2a733e 100644
--- a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
+++ b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
@@ -195,4 +195,51 @@ class RNSentryModuleImplTest {
 
         assertEquals(breadcrumb, result)
     }
+
+    @Test
+    fun `the breadcrumb is not filtered out when the dev server url and dsn are not passed`() {
+        val options = SentryAndroidOptions()
+        module.getSentryAndroidOptions(options, JavaOnlyMap(), logger)
+
+        val breadcrumb = Breadcrumb().apply {
+            type = "http"
+            setData("url", "http://testurl.com/service")
+        }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
+
+    @Test
+    fun `the breadcrumb is not filtered out when the dev server url is not passed and the dsn does not match`() {
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of("dsn", "https://abc@def.ingest.sentry.io/1234567")
+        module.getSentryAndroidOptions(options, rnOptions, logger)
+
+        val breadcrumb = Breadcrumb().apply {
+            type = "http"
+            setData("url", "http://testurl.com/service")
+        }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
+
+    @Test
+    fun `the breadcrumb is not filtered out when the dev server url does not match and the dsn is not passed`() {
+        val options = SentryAndroidOptions()
+        val rnOptions = JavaOnlyMap.of("devServerUrl", "http://localhost:8081")
+        module.getSentryAndroidOptions(options, rnOptions, logger)
+
+        val breadcrumb = Breadcrumb().apply {
+            type = "http"
+            setData("url", "http://testurl.com/service")
+        }
+
+        val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
+
+        assertEquals(breadcrumb, result)
+    }
 }
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
index 8eeecf59b2..b80661e949 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
@@ -245,7 +245,8 @@ - (void)testBeforeBreadcrumbsCallbackFiltersOutSentryDsnRequestBreadcrumbs
 
     NSString *mockDsn = @"https://abc@def.ingest.sentry.io/1234567";
 
-    NSDictionary *_Nonnull mockedDictionary = @{ @"dsn" : mockDsn, @"" : @"http://localhost:8081" };
+    NSDictionary *_Nonnull mockedDictionary =
+        @{ @"dsn" : mockDsn, @"devServerUrl" : @"http://localhost:8081" };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
 
     SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
@@ -262,10 +263,10 @@ - (void)testBeforeBreadcrumbsCallbackFiltersOutDevServerRequestBreadcrumbs
     RNSentry *rnSentry = [[RNSentry alloc] init];
     NSError *error = nil;
 
-    NSString *mockDevServer = @"https://abc@def.ingest.sentry.io/1234567";
+    NSString *mockDevServer = @"http://localhost:8081";
 
     NSDictionary *_Nonnull mockedDictionary =
-        @{ @"dsn" : @"https://abc@def.ingest.sentry.io/1234567", @"" : mockDevServer };
+        @{ @"dsn" : @"https://abc@def.ingest.sentry.io/1234567", @"devServerUrl" : mockDevServer };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
 
     SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
@@ -284,7 +285,26 @@ - (void)testBeforeBreadcrumbsCallbackDoesNotFiltersOutNonDevServerOrDsnRequestBr
 
     NSDictionary *_Nonnull mockedDictionary = @{
         @"dsn" : @"https://abc@def.ingest.sentry.io/1234567",
-        @"" : @"https://abc@def.ingest.sentry.io/1234567"
+        @"devServerUrl" : @"http://localhost:8081"
+    };
+    SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
+
+    SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
+    breadcrumb.type = @"http";
+    breadcrumb.data = @{ @"url" : @"http://testurl.com/service" };
+
+    SentryBreadcrumb *result = options.beforeBreadcrumb(breadcrumb);
+
+    XCTAssertEqual(breadcrumb, result);
+}
+
+- (void)testBeforeBreadcrumbsCallbackKeepsBreadcrumbWhenDevServerUrlIsNotPassedAndDsnDoesNotMatch
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSDictionary *_Nonnull mockedDictionary = @{ // dsn is always validated in SentryOptions initialisation
+        @"dsn" : @"https://abc@def.ingest.sentry.io/1234567"
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
 
diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index 11db087dd2..cfd4749569 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -436,6 +436,21 @@ describe('Tests the SDK functionality', () => {
     expect(result).toEqual(breadcrumb);
   });
 
+  it('should keep the breadcrumb when the dev server is undefined and the dsn does not match', () => {
+    (getDevServer as jest.Mock).mockReturnValue({ url: undefined });
+
+    init({ dsn: 'https://example@sentry.io/123' });
+
+    const breadcrumb: Breadcrumb = {
+      type: 'http',
+      data: { url: 'http://testurl.com/service' },
+    };
+
+    const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);
+
+    expect(result).toEqual(breadcrumb);
+  });
+
   describe('withScope', () => {
     test('withScope callback does not throw', () => {
       const mockScopeCallback = jest.fn(() => {

From a69d5e8cd2f78882e237bba3e15fdadd090d6fab Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 14:32:48 +0200
Subject: [PATCH 36/45] Uses the url from the passed dsn to filter breadcrumbs

---
 .../io/sentry/react/RNSentryModuleImplTest.kt   |  5 ++---
 .../RNSentryCocoaTesterTests/RNSentryTests.mm   | 10 +++++-----
 .../io/sentry/react/RNSentryModuleImpl.java     | 17 ++++++++++++++++-
 packages/core/ios/RNSentry.mm                   | 11 ++++++++++-
 packages/core/src/js/sdk.tsx                    | 10 +++++++++-
 packages/core/test/sdk.test.ts                  |  5 ++---
 6 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
index 79ae2a733e..b181625138 100644
--- a/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
+++ b/packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryModuleImplTest.kt
@@ -139,17 +139,16 @@ class RNSentryModuleImplTest {
 
     @Test
     fun `beforeBreadcrumb callback filters out Sentry DSN requests breadcrumbs`() {
-        val mockDsn = "https://abc@def.ingest.sentry.io/1234567"
         val options = SentryAndroidOptions()
         val rnOptions = JavaOnlyMap.of(
-            "dsn", mockDsn,
+            "dsn", "https://abc@def.ingest.sentry.io/1234567",
             "devServerUrl", "http://localhost:8081",
         )
         module.getSentryAndroidOptions(options, rnOptions, logger)
 
         val breadcrumb = Breadcrumb().apply {
             type = "http"
-            setData("url", mockDsn)
+            setData("url", "https://def.ingest.sentry.io/1234567")
         }
 
         val result = options.beforeBreadcrumb?.execute(breadcrumb, mock())
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
index b80661e949..c567acda51 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
@@ -243,15 +243,15 @@ - (void)testBeforeBreadcrumbsCallbackFiltersOutSentryDsnRequestBreadcrumbs
     RNSentry *rnSentry = [[RNSentry alloc] init];
     NSError *error = nil;
 
-    NSString *mockDsn = @"https://abc@def.ingest.sentry.io/1234567";
-
-    NSDictionary *_Nonnull mockedDictionary =
-        @{ @"dsn" : mockDsn, @"devServerUrl" : @"http://localhost:8081" };
+    NSDictionary *_Nonnull mockedDictionary = @{
+        @"dsn" : @"https://abc@def.ingest.sentry.io/1234567",
+        @"devServerUrl" : @"http://localhost:8081"
+    };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];
 
     SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] init];
     breadcrumb.type = @"http";
-    breadcrumb.data = @{ @"url" : mockDsn };
+    breadcrumb.data = @{ @"url" : @"https://def.ingest.sentry.io/1234567" };
 
     SentryBreadcrumb *result = options.beforeBreadcrumb(breadcrumb);
 
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index afc5addee6..c7d148c7c0 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -75,6 +75,8 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -278,7 +280,7 @@ protected void getSentryAndroidOptions(
     }
 
     // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
-    String dsn = rnOptions.getString("dsn");
+    String dsn = getURLFromDSN(rnOptions.getString("dsn"));
     String devServerUrl = rnOptions.getString("devServerUrl");
     options.setBeforeBreadcrumb(
         (breadcrumb, hint) -> {
@@ -1016,4 +1018,17 @@ private boolean checkAndroidXAvailability() {
   private boolean isFrameMetricsAggregatorAvailable() {
     return androidXAvailable && frameMetricsAggregator != null;
   }
+
+  public static @Nullable String getURLFromDSN(@Nullable String dsn) {
+    if (dsn == null) {
+      return null;
+    }
+    URI uri = null;
+    try {
+      uri = new URI(dsn);
+    } catch (URISyntaxException e) {
+      return null;
+    }
+    return uri.getScheme() + "://" + uri.getHost();
+  }
 }
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index f1e45f6d4f..9738749a20 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -163,7 +163,7 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     }
 
     // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
-    NSString *dsn = [mutableOptions valueForKey:@"dsn"];
+    NSString *dsn = [self getURLFromDSN:[mutableOptions valueForKey:@"dsn"]];
     NSString *devServerUrl = [mutableOptions valueForKey:@"devServerUrl"];
     sentryOptions.beforeBreadcrumb
         = ^SentryBreadcrumb *_Nullable(SentryBreadcrumb *_Nonnull breadcrumb)
@@ -217,6 +217,15 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     return sentryOptions;
 }
 
+- (NSString *_Nullable)getURLFromDSN:(NSString *)dsn
+{
+    NSURL *url = [NSURL URLWithString:dsn];
+    if (!url) {
+        return nil;
+    }
+    return [NSString stringWithFormat:@"%@://%@", url.scheme, url.host];
+}
+
 - (void)setEventOriginTag:(SentryEvent *)event
 {
     if (event.sdk != nil) {
diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index dbf94fd095..8ba95a2672 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -63,11 +63,19 @@ export function init(passedOptions: ReactNativeOptions): void {
     enableSyncToNative(getIsolationScope());
   }
 
+  const getURLFromDSN = (dsn: string | null): string | undefined => {
+    if (!dsn) {
+      return undefined;
+    }
+    const url = new URL(dsn);
+    return `${url.protocol}//${url.host}`;
+  };
+
   const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });
 
   // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
   const devServerUrl = getDevServer()?.url;
-  const dsn = passedOptions.dsn;
+  const dsn = getURLFromDSN(passedOptions.dsn);
   const defaultBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint): Breadcrumb | null => {
     const type = breadcrumb.type || '';
     const url = typeof breadcrumb.data?.url === 'string' ? breadcrumb.data.url : '';
diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index cfd4749569..a1e56e245b 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -330,7 +330,6 @@ describe('Tests the SDK functionality', () => {
     });
 
     it('should filters out dsn breadcrumbs', () => {
-      const mockDsn = 'https://example@sentry.io/123';
       (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });
 
       const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
@@ -338,7 +337,7 @@ describe('Tests the SDK functionality', () => {
       };
 
       const passedOptions = {
-        dsn: mockDsn,
+        dsn: 'https://abc@def.ingest.sentry.io/1234567',
         beforeBreadcrumb: mockBeforeBreadcrumb,
       };
 
@@ -346,7 +345,7 @@ describe('Tests the SDK functionality', () => {
 
       const breadcrumb: Breadcrumb = {
         type: 'http',
-        data: { url: mockDsn },
+        data: { url: 'https://def.ingest.sentry.io/1234567' },
       };
 
       const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);

From e451c06d8802e0370166a2e8a757a8d7646ecad7 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Thu, 14 Nov 2024 14:40:30 +0200
Subject: [PATCH 37/45] Handles nil dsn though this state should never be
 reached due to SentryOptions validation

---
 packages/core/ios/RNSentry.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 9738749a20..6bd571ea4c 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -171,7 +171,7 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
         NSString *url = breadcrumb.data[@"url"] ?: @"";
 
         if ([@"http" isEqualToString:breadcrumb.type]
-            && ([url containsString:dsn]
+            && ((dsn != nil && [url containsString:dsn])
                 || (devServerUrl != nil && [url containsString:devServerUrl]))) {
             return nil;
         }

From eae86ad337db4e6254989af4645f935d8252ec23 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 15 Nov 2024 13:45:18 +0200
Subject: [PATCH 38/45] Use startsWith to check url matching

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 packages/core/src/js/sdk.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index 8ba95a2672..6f7b63de27 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -79,7 +79,7 @@ export function init(passedOptions: ReactNativeOptions): void {
   const defaultBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint): Breadcrumb | null => {
     const type = breadcrumb.type || '';
     const url = typeof breadcrumb.data?.url === 'string' ? breadcrumb.data.url : '';
-    if (type === 'http' && ((devServerUrl && url.includes(devServerUrl)) || (dsn && url.includes(dsn)))) {
+    if (type === 'http' && ((devServerUrl && url.startsWith(devServerUrl)) || (dsn && url.startsWith(dsn)))) {
       return null;
     }
     return breadcrumb;

From c05c3c2679400cf285d5d3869df1eab5e3e61b9d Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 15 Nov 2024 13:54:17 +0200
Subject: [PATCH 39/45] Check url with prefix instead of contains for
 efficiency

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java     | 4 ++--
 packages/core/ios/RNSentry.mm                                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index c7d148c7c0..9366662cc6 100644
--- a/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -287,8 +287,8 @@ protected void getSentryAndroidOptions(
           Object urlObject = breadcrumb.getData("url");
           String url = urlObject instanceof String ? (String) urlObject : "";
           if ("http".equals(breadcrumb.getType())
-              && ((dsn != null && url.contains(dsn))
-                  || (devServerUrl != null && url.contains(devServerUrl)))) {
+              && ((dsn != null && url.startsWith(dsn))
+                  || (devServerUrl != null && url.startsWith(devServerUrl)))) {
             return null;
           }
           return breadcrumb;
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 6bd571ea4c..990c561f0d 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -171,8 +171,8 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
         NSString *url = breadcrumb.data[@"url"] ?: @"";
 
         if ([@"http" isEqualToString:breadcrumb.type]
-            && ((dsn != nil && [url containsString:dsn])
-                || (devServerUrl != nil && [url containsString:devServerUrl]))) {
+            && ((dsn != nil && [url hasPrefix:dsn])
+                || (devServerUrl != nil && [url hasPrefix:devServerUrl]))) {
             return nil;
         }
         return breadcrumb;

From 48034dcea21ecd9868b73ebcfe42738ea18bb484 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 15 Nov 2024 13:55:20 +0200
Subject: [PATCH 40/45] Fix comment typo

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 packages/core/test/sdk.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index a1e56e245b..e014675bfb 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -396,7 +396,7 @@ describe('Tests the SDK functionality', () => {
 
       const breadcrumb: Breadcrumb = {
         type: 'http',
-        data: { url: 'http://testurl.com/service' }, // Not an excuded url
+        data: { url: 'http://testurl.com/service' }, // Not an excluded url
       };
 
       const result = usedOptions()?.beforeBreadcrumb!(breadcrumb);

From 3381a9e8cc66d195933dd0625bf9e8b7841d1a7f Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 15 Nov 2024 13:55:34 +0200
Subject: [PATCH 41/45] Fix comment typo

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 packages/core/test/sdk.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index e014675bfb..57ad35d9b4 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -383,7 +383,7 @@ describe('Tests the SDK functionality', () => {
       (getDevServer as jest.Mock).mockReturnValue({ url: devServerUrl });
 
       const mockBeforeBreadcrumb = (breadcrumb: Breadcrumb, _hint?: BreadcrumbHint) => {
-        breadcrumb.data = { url: devServerUrl }; // Set to an excuded url
+        breadcrumb.data = { url: devServerUrl }; // Set to an excluded url
         return breadcrumb;
       };
 

From 1f7891ed2671f41dee4f4df065acac8cec179f36 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Fri, 15 Nov 2024 14:05:12 +0200
Subject: [PATCH 42/45] Fix comment typo

Co-authored-by: LucasZF <lucas-zimerman1@hotmail.com>
---
 .../RNSentryCocoaTesterTests/RNSentryTests.mm                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
index c567acda51..df720ee1af 100644
--- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
+++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
@@ -303,7 +303,7 @@ - (void)testBeforeBreadcrumbsCallbackKeepsBreadcrumbWhenDevServerUrlIsNotPassedA
     RNSentry *rnSentry = [[RNSentry alloc] init];
     NSError *error = nil;
 
-    NSDictionary *_Nonnull mockedDictionary = @{ // dsn is always validated in SentryOptions initialisation
+    NSDictionary *_Nonnull mockedDictionary = @{ // dsn is always validated in SentryOptions initialization
         @"dsn" : @"https://abc@def.ingest.sentry.io/1234567"
     };
     SentryOptions *options = [rnSentry createOptionsWithDictionary:mockedDictionary error:&error];

From 848aaa332a0d52502264718f3517712a166a96e4 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <31292499+krystofwoldrich@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:51:33 +0100
Subject: [PATCH 43/45] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c9d243c19..fa379826b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ### Fixes
 
 - Prevents exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
+- Excludes Dev Server and Sentry Dsn requests from Breadcrumbs ([#4240](https://github.com/getsentry/sentry-react-native/pull/4240))
 
 ## 6.2.0
 
@@ -39,8 +40,6 @@
 
 ### Fixes
 
-- Excludes Dev Server and Sentry Dsn requests from Breadcrumbs ([#4240](https://github.com/getsentry/sentry-react-native/pull/4240))
-- Prevents exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
 - Ignore JavascriptException to filter out obfuscated duplicate JS Errors on Android ([#4232](https://github.com/getsentry/sentry-react-native/pull/4232))
 - Skips ignoring require cycle logs for RN 0.70 or newer ([#4214](https://github.com/getsentry/sentry-react-native/pull/4214))
 - Enhanced accuracy of time-to-display spans. ([#4189](https://github.com/getsentry/sentry-react-native/pull/4189))

From 41ac85a826d11623f6f7ba22793c7f3a736babad Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 18 Nov 2024 14:55:44 +0200
Subject: [PATCH 44/45] Safely parses dsn url

---
 packages/core/src/js/sdk.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/js/sdk.tsx b/packages/core/src/js/sdk.tsx
index 6f7b63de27..039b44850d 100644
--- a/packages/core/src/js/sdk.tsx
+++ b/packages/core/src/js/sdk.tsx
@@ -67,8 +67,13 @@ export function init(passedOptions: ReactNativeOptions): void {
     if (!dsn) {
       return undefined;
     }
-    const url = new URL(dsn);
-    return `${url.protocol}//${url.host}`;
+    try {
+      const url = new URL(dsn);
+      return `${url.protocol}//${url.host}`;
+    } catch (e) {
+      logger.error('Failed to extract url from DSN', e);
+      return undefined;
+    }
   };
 
   const userBeforeBreadcrumb = safeFactory(passedOptions.beforeBreadcrumb, { loggerMessage: 'The beforeBreadcrumb threw an error' });

From b6191bead407627af0992f346bad63707f5995ba Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Mon, 18 Nov 2024 15:31:42 +0200
Subject: [PATCH 45/45] Adds test case for url exception

---
 packages/core/test/sdk.test.ts | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/core/test/sdk.test.ts b/packages/core/test/sdk.test.ts
index 57ad35d9b4..2f9f6e4e69 100644
--- a/packages/core/test/sdk.test.ts
+++ b/packages/core/test/sdk.test.ts
@@ -353,6 +353,39 @@ describe('Tests the SDK functionality', () => {
       expect(result).toBeNull();
     });
 
+    it('should keep breadcrumbs matching dsn 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://abc@def.ingest.sentry.io/1234567',
+        beforeBreadcrumb: mockBeforeBreadcrumb,
+      };
+
+      init(passedOptions);
+
+      const breadcrumb: Breadcrumb = {
+        type: 'http',
+        data: { url: 'https://def.ingest.sentry.io/1234567' },
+      };
+
+      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', () => {
       (getDevServer as jest.Mock).mockReturnValue({ url: 'http://localhost:8081' });