Skip to content

Commit 6a4df13

Browse files
committed
Fix #5844: rename misleading IScopeObserver.setBreadcrumbs to clearBreadcrumbs
- IScopeObserver + PersistingScopeObserver + adapter - Callers (Scope, SentryClient, EventSizeLimitingUtils) updated - Full rename, no leftover setBreadcrumbs references
1 parent a2aec5a commit 6a4df13

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

sentry/src/main/java/io/sentry/IScopeObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public interface IScopeObserver {
1818

1919
void addBreadcrumb(@NotNull Breadcrumb crumb);
2020

21-
void setBreadcrumbs(@NotNull Collection<Breadcrumb> breadcrumbs);
21+
void clearBreadcrumbs(@NotNull Collection<Breadcrumb> breadcrumbs);
2222

2323
void setTag(@NotNull String key, @NotNull String value);
2424

sentry/src/main/java/io/sentry/Scope.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ public void addBreadcrumb(@NotNull Breadcrumb breadcrumb, @Nullable Hint hint) {
510510

511511
for (final IScopeObserver observer : options.getScopeObservers()) {
512512
observer.addBreadcrumb(breadcrumb);
513-
observer.setBreadcrumbs(breadcrumbs);
513+
observer.clearBreadcrumbs(breadcrumbs);
514514
}
515515
} else {
516516
options.getLogger().log(SentryLevel.INFO, "Breadcrumb was dropped by beforeBreadcrumb");
@@ -534,7 +534,7 @@ public void clearBreadcrumbs() {
534534
breadcrumbs.clear();
535535

536536
for (final IScopeObserver observer : options.getScopeObservers()) {
537-
observer.setBreadcrumbs(breadcrumbs);
537+
observer.clearBreadcrumbs(breadcrumbs);
538538
}
539539
}
540540

sentry/src/main/java/io/sentry/ScopeObserverAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void setUser(@Nullable User user) {}
1717
public void addBreadcrumb(@NotNull Breadcrumb crumb) {}
1818

1919
@Override
20-
public void setBreadcrumbs(@NotNull Collection<Breadcrumb> breadcrumbs) {}
20+
public void clearBreadcrumbs(@NotNull Collection<Breadcrumb> breadcrumbs) {}
2121

2222
@Override
2323
public void setTag(@NotNull String key, @NotNull String value) {}

sentry/src/main/java/io/sentry/SentryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ public void captureBatchedMetricsEvents(final @NotNull SentryMetricsEvents metri
16281628
// A cached event comes from the outbox; its breadcrumbs (even if empty) belong to a
16291629
// past session, so the current scope's breadcrumbs are unrelated and must not be applied.
16301630
if (!isCached) {
1631-
sentryBaseEvent.setBreadcrumbs(new ArrayList<>(scope.getBreadcrumbs()));
1631+
sentryBaseEvent.clearBreadcrumbs(new ArrayList<>(scope.getBreadcrumbs()));
16321632
}
16331633
} else if (!isCached) {
16341634
// A Cached event comes from the outbox and already carries its own breadcrumbs (e.g. native

sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void addBreadcrumb(@NotNull Breadcrumb crumb) {
152152
}
153153

154154
@Override
155-
public void setBreadcrumbs(@NotNull Collection<Breadcrumb> breadcrumbs) {
155+
public void clearBreadcrumbs(@NotNull Collection<Breadcrumb> breadcrumbs) {
156156
if (breadcrumbs.isEmpty()) {
157157
// we only clear the queue if the new collection is empty (someone called clearBreadcrumbs)
158158
// If it's not empty, we'd add breadcrumbs one-by-one in the method above

sentry/src/main/java/io/sentry/util/EventSizeLimitingUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static boolean isSizeOk(
117117
final @NotNull SentryEvent event, final @NotNull SentryOptions options) {
118118
final @Nullable List<Breadcrumb> breadcrumbs = event.getBreadcrumbs();
119119
if (breadcrumbs != null && !breadcrumbs.isEmpty()) {
120-
event.setBreadcrumbs(null);
120+
event.clearBreadcrumbs(null);
121121
options
122122
.getLogger()
123123
.log(

0 commit comments

Comments
 (0)