Merge branch 'ref/internal-error-on-transaction-with-exception' of ht…

…tps://github.com/getsentry/sentry-dotnet into ref/internal-error-on-transaction-with-exception
getsentry · Jul 27, 2021 · 0ab7f56 · 0ab7f56
2 parents 7625410 + b5b260b
commit 0ab7f56
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 - Set error status to transaction if http has exception and ok status ([#1143](https://github.com/getsentry/sentry-dotnet/pull/1143))
+- Fix max breadcrumbs limit when MaxBreadcrumbs is zero or lower ([#1145](https://github.com/getsentry/sentry-dotnet/pull/1145))
 
 ## 3.8.3
 

diff --git a/src/Sentry/Scope.cs b/src/Sentry/Scope.cs
@@ -226,9 +226,12 @@ public void AddBreadcrumb(Breadcrumb breadcrumb)
                 }
             }
 
-            var overflow = Breadcrumbs.Count - Options.MaxBreadcrumbs + 1;
-
-            if (overflow > 0)
+            if (Options.MaxBreadcrumbs <= 0)
+            {
+                //Always drop the breadcrumb.
+                return;
+            }
+            else if (Breadcrumbs.Count - Options.MaxBreadcrumbs + 1 > 0)
             {
                 _breadcrumbs.TryDequeue(out _);
             }

diff --git a/test/Sentry.Tests/ScopeTests.cs b/test/Sentry.Tests/ScopeTests.cs
@@ -254,5 +254,30 @@ public void ClearAttachments_HasAttachments_EmptyList()
             //Assert
             scope.Attachments.Should().BeEmpty();
         }
+
+        [Theory]
+        [InlineData(0, -2, 0)]
+        [InlineData(0, -1, 0)]
+        [InlineData(0,  0, 0)]
+        [InlineData(0,  1, 1)]
+        [InlineData(0,  2, 1)]
+        [InlineData(1,  2, 2)]
+        [InlineData(2,  2, 2)]
+        public void AddBreadcrumb__AddBreadcrumb_RespectLimits(int initialCount, int maxBreadcrumbs, int expectedCount)
+        {
+            //Arrange
+            var scope = new Scope(new SentryOptions() { MaxBreadcrumbs = maxBreadcrumbs });
+
+            for (int i = 0; i < initialCount; i++)
+            {
+                scope.AddBreadcrumb(new Breadcrumb());
+            }
+
+            //Act
+            scope.AddBreadcrumb(new Breadcrumb());
+
+            //Assert
+            Assert.Equal(expectedCount, scope.Breadcrumbs.Count);
+        }
     }
 }