Skip to content

perf(core): [SDK Overhead reduction for JVM 2] Short-circuit combined scope breadcrumbs #5541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adinauer wants to merge 1 commit into
base: perf/sdk-overhead-jvm-v2
Choose a base branch
from
+61 −3
Draft

perf(core): [SDK Overhead reduction for JVM 2] Short-circuit combined scope breadcrumbs #5541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions sentry/src/main/java/io/sentry/CombinedScopeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,31 @@ public void setFingerprint(@NotNull List<String> fingerprint) {

@Override
public @NotNull Queue<Breadcrumb> getBreadcrumbs() {
final @NotNull Queue<Breadcrumb> globalBreadcrumbs = globalScope.getBreadcrumbs();
final @NotNull Queue<Breadcrumb> isolationBreadcrumbs = isolationScope.getBreadcrumbs();
final @NotNull Queue<Breadcrumb> currentBreadcrumbs = scope.getBreadcrumbs();

final boolean hasGlobalBreadcrumbs = !globalBreadcrumbs.isEmpty();
final boolean hasIsolationBreadcrumbs = !isolationBreadcrumbs.isEmpty();
final boolean hasCurrentBreadcrumbs = !currentBreadcrumbs.isEmpty();

if (!hasGlobalBreadcrumbs && !hasIsolationBreadcrumbs && !hasCurrentBreadcrumbs) {

@romtsn romtsn Jun 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm, but previously we'd been always returning a copy, whereas now it's not a copy anymore, so it could've been modified?

return getDefaultWriteScope().getBreadcrumbs();
}
if (!hasIsolationBreadcrumbs && !hasCurrentBreadcrumbs) {
return globalBreadcrumbs;
}
if (!hasGlobalBreadcrumbs && !hasCurrentBreadcrumbs) {
return isolationBreadcrumbs;
}
if (!hasGlobalBreadcrumbs && !hasIsolationBreadcrumbs) {
return currentBreadcrumbs;
}

final @NotNull List<Breadcrumb> allBreadcrumbs = new ArrayList<>();
allBreadcrumbs.addAll(globalScope.getBreadcrumbs());
allBreadcrumbs.addAll(isolationScope.getBreadcrumbs());
allBreadcrumbs.addAll(scope.getBreadcrumbs());
allBreadcrumbs.addAll(globalBreadcrumbs);
allBreadcrumbs.addAll(isolationBreadcrumbs);
allBreadcrumbs.addAll(currentBreadcrumbs);
Collections.sort(allBreadcrumbs);

final @NotNull Queue<Breadcrumb> breadcrumbs =
Expand Down
37 changes: 37 additions & 0 deletions sentry/src/test/java/io/sentry/CombinedScopeViewTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import junit.framework.TestCase.assertTrue
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
import kotlin.test.assertNotSame
import kotlin.test.assertNull
import kotlin.test.assertSame
import org.junit.Assert.assertNotEquals
Expand Down Expand Up @@ -72,6 +73,42 @@ class CombinedScopeViewTest {
assertEquals("current 2", breadcrumbs.poll().message)
}

@Test
fun `returns single non-empty breadcrumb queue directly`() {
var combined = fixture.getSut()
fixture.globalScope.addBreadcrumb(Breadcrumb.info("global"))
assertSame(fixture.globalScope.breadcrumbs, combined.breadcrumbs)

combined = fixture.getSut()
fixture.isolationScope.addBreadcrumb(Breadcrumb.info("isolation"))
assertSame(fixture.isolationScope.breadcrumbs, combined.breadcrumbs)

combined = fixture.getSut()
fixture.scope.addBreadcrumb(Breadcrumb.info("current"))
assertSame(fixture.scope.breadcrumbs, combined.breadcrumbs)
}

@Test
fun `returns default write scope breadcrumbs when all scopes are empty`() {
val combined = fixture.getSut(SentryOptions().also { it.defaultScopeType = ScopeType.CURRENT })

assertSame(fixture.scope.breadcrumbs, combined.breadcrumbs)
}

@Test
fun `returns merged breadcrumb copy when multiple scopes have breadcrumbs`() {
val combined = fixture.getSut()

fixture.globalScope.addBreadcrumb(Breadcrumb.info("global"))
fixture.isolationScope.addBreadcrumb(Breadcrumb.info("isolation"))

val breadcrumbs = combined.breadcrumbs

assertNotSame(fixture.globalScope.breadcrumbs, breadcrumbs)
assertNotSame(fixture.isolationScope.breadcrumbs, breadcrumbs)
assertEquals(2, breadcrumbs.size)
}

@Test
fun `oldest breadcrumbs are dropped first`() {
val options = SentryOptions().also { it.maxBreadcrumbs = 5 }
Expand Down
Loading