diff --git a/CHANGELOG.md b/CHANGELOG.md index e89e7e07fd..6728dcbff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Fixes +- Fix typos in Spring GraphQL integration names (`GrahQL` to `GraphQL`) +- Fix misleading IScopeObserver.setBreadcrumbs method name to clearBreadcrumbs ([#5844](https://github.com/getsentry/sentry-java/pull/6077)) - Update `SentryTraced` so that it now honors `options.setIgnoredSpanOrigins` ([#6058](https://github.com/getsentry/sentry-java/pull/6058)) - `SentryTraced` now checks for its owning transaction dynamically rather than once per app process. The latter caused `SentryTraced` spans to be dropped process-wide once the original transaction finished ([#6057](https://github.com/getsentry/sentry-java/pull/6057)) - Fix typos in Spring GraphQL integration names (`GrahQL` to `GraphQL`) ([#6061](https://github.com/getsentry/sentry-java/pull/6061)) diff --git a/sentry/src/main/java/io/sentry/IScopeObserver.java b/sentry/src/main/java/io/sentry/IScopeObserver.java index e1b9a78504..18fa78ceca 100644 --- a/sentry/src/main/java/io/sentry/IScopeObserver.java +++ b/sentry/src/main/java/io/sentry/IScopeObserver.java @@ -18,6 +18,8 @@ public interface IScopeObserver { void addBreadcrumb(@NotNull Breadcrumb crumb); + void clearBreadcrumbs(@NotNull Collection breadcrumbs); + @Deprecated void setBreadcrumbs(@NotNull Collection breadcrumbs); void setTag(@NotNull String key, @NotNull String value); diff --git a/sentry/src/main/java/io/sentry/Scope.java b/sentry/src/main/java/io/sentry/Scope.java index 54e8b89355..ff6e5f247f 100644 --- a/sentry/src/main/java/io/sentry/Scope.java +++ b/sentry/src/main/java/io/sentry/Scope.java @@ -510,7 +510,7 @@ public void addBreadcrumb(@NotNull Breadcrumb breadcrumb, @Nullable Hint hint) { for (final IScopeObserver observer : options.getScopeObservers()) { observer.addBreadcrumb(breadcrumb); - observer.setBreadcrumbs(breadcrumbs); + observer.clearBreadcrumbs(breadcrumbs); } } else { options.getLogger().log(SentryLevel.INFO, "Breadcrumb was dropped by beforeBreadcrumb"); @@ -534,7 +534,7 @@ public void clearBreadcrumbs() { breadcrumbs.clear(); for (final IScopeObserver observer : options.getScopeObservers()) { - observer.setBreadcrumbs(breadcrumbs); + observer.clearBreadcrumbs(breadcrumbs); } } diff --git a/sentry/src/main/java/io/sentry/ScopeObserverAdapter.java b/sentry/src/main/java/io/sentry/ScopeObserverAdapter.java index 4f6a5ac842..06c85d14ab 100644 --- a/sentry/src/main/java/io/sentry/ScopeObserverAdapter.java +++ b/sentry/src/main/java/io/sentry/ScopeObserverAdapter.java @@ -17,7 +17,7 @@ public void setUser(@Nullable User user) {} public void addBreadcrumb(@NotNull Breadcrumb crumb) {} @Override - public void setBreadcrumbs(@NotNull Collection breadcrumbs) {} + public void clearBreadcrumbs(@NotNull Collection breadcrumbs) {} @Override public void setTag(@NotNull String key, @NotNull String value) {} diff --git a/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java b/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java index d6137ae051..0f51d01ea7 100644 --- a/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java +++ b/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java @@ -152,7 +152,7 @@ public void addBreadcrumb(@NotNull Breadcrumb crumb) { } @Override - public void setBreadcrumbs(@NotNull Collection breadcrumbs) { + public void clearBreadcrumbs(@NotNull Collection breadcrumbs) { if (breadcrumbs.isEmpty()) { // we only clear the queue if the new collection is empty (someone called clearBreadcrumbs) // If it's not empty, we'd add breadcrumbs one-by-one in the method above