Merge 2683cdb into b292090

stefanosiano · web-flow · commit 22fe8fc99a2d · 2025-06-20T12:55:43.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Optimize scope when maxBreadcrumb is 0 ([#4504](https://github.com/getsentry/sentry-java/pull/4504))
 - No longer send out empty log envelopes ([#4497](https://github.com/getsentry/sentry-java/pull/4497))
 
 ### Dependencies
diff --git a/sentry/src/main/java/io/sentry/Scope.java b/sentry/src/main/java/io/sentry/Scope.java
@@ -466,7 +466,7 @@ public Queue<Breadcrumb> getBreadcrumbs() {
    */
   @Override
   public void addBreadcrumb(@NotNull Breadcrumb breadcrumb, @Nullable Hint hint) {
-    if (breadcrumb == null) {
+    if (breadcrumb == null || breadcrumbs instanceof DisabledQueue) {
       return;
     }
     if (hint == null) {
@@ -862,7 +862,7 @@ public void clearAttachments() {
   static @NotNull Queue<Breadcrumb> createBreadcrumbsList(final int maxBreadcrumb) {
     return maxBreadcrumb > 0
         ? SynchronizedQueue.synchronizedQueue(new CircularFifoQueue<>(maxBreadcrumb))
-        : SynchronizedQueue.synchronizedQueue(new DisabledQueue<>());
+        : new DisabledQueue<>();
   }
 
   /**
diff --git a/sentry/src/test/java/io/sentry/ScopeTest.kt b/sentry/src/test/java/io/sentry/ScopeTest.kt
@@ -6,13 +6,15 @@ import io.sentry.protocol.SentryId
 import io.sentry.protocol.User
 import io.sentry.test.callMethod
 import org.junit.Assert.assertArrayEquals
+import org.mockito.kotlin.any
 import org.mockito.kotlin.argThat
 import org.mockito.kotlin.check
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.test.Test
@@ -339,6 +341,66 @@ class ScopeTest {
         assertEquals(1, scope.breadcrumbs.count())
     }
 
+    @Test
+    fun `when adding breadcrumb and maxBreadcrumb is 0, beforeBreadcrumb is not executed`() {
+        var called = false
+        val options = SentryOptions().apply {
+            maxBreadcrumbs = 0
+            beforeBreadcrumb = SentryOptions.BeforeBreadcrumbCallback { breadcrumb, _ ->
+                called = true
+                breadcrumb
+            }
+        }
+
+        val scope = Scope(options)
+        scope.addBreadcrumb(Breadcrumb())
+        assertEquals(0, scope.breadcrumbs.count())
+        assertFalse(called)
+    }
+
+    @Test
+    fun `when adding breadcrumb and maxBreadcrumb is not 0, beforeBreadcrumb is executed`() {
+        var called = false
+        val options = SentryOptions().apply {
+            beforeBreadcrumb = SentryOptions.BeforeBreadcrumbCallback { breadcrumb, _ ->
+                called = true
+                breadcrumb
+            }
+        }
+
+        val scope = Scope(options)
+        scope.addBreadcrumb(Breadcrumb())
+        assertEquals(1, scope.breadcrumbs.count())
+        assertTrue(called)
+    }
+
+    @Test
+    fun `when adding breadcrumb and maxBreadcrumb is 0, scopesObservers are not called`() {
+        val observer = mock<IScopeObserver>()
+        val options = SentryOptions().apply {
+            maxBreadcrumbs = 0
+            addScopeObserver(observer)
+        }
+
+        val scope = Scope(options)
+        scope.addBreadcrumb(Breadcrumb())
+        assertEquals(0, scope.breadcrumbs.count())
+        verifyNoInteractions(observer)
+    }
+
+    @Test
+    fun `when adding breadcrumb and maxBreadcrumb is not 0, scopesObservers are called`() {
+        val observer = mock<IScopeObserver>()
+        val options = SentryOptions().apply {
+            addScopeObserver(observer)
+        }
+
+        val scope = Scope(options)
+        scope.addBreadcrumb(Breadcrumb())
+        assertEquals(1, scope.breadcrumbs.count())
+        verify(observer).addBreadcrumb(any())
+    }
+
     @Test
     fun `when adding eventProcessor, eventProcessor should be in the list`() {
         val processor = CustomEventProcessor()
