Hubs/Scopes Merge 14 - Add Scopes to replace Hub
#3311
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment.
There was a problem hiding this comment. Will address in a follow up PR. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| import io.sentry.protocol.App; | ||
| import io.sentry.protocol.Contexts; | ||
| import io.sentry.protocol.Request; | ||
| import io.sentry.protocol.SentryId; | ||
| import io.sentry.protocol.TransactionNameSource; | ||
| import io.sentry.protocol.User; | ||
| import io.sentry.util.CollectionUtils; | ||
|
|
@@ -22,6 +23,8 @@ | |
| /** Scope data to be sent with the event */ | ||
| public final class Scope implements IScope { | ||
|
|
||
| private volatile @NotNull SentryId lastEventId; | ||
|
|
||
| /** Scope's SentryLevel */ | ||
| private @Nullable SentryLevel level; | ||
|
|
||
|
|
@@ -80,6 +83,8 @@ public final class Scope implements IScope { | |
|
|
||
| private @NotNull PropagationContext propagationContext; | ||
|
|
||
| private @NotNull ISentryClient client = NoOpSentryClient.getInstance(); | ||
|
|
||
| /** | ||
| * Scope's ctor | ||
| * | ||
|
|
@@ -89,6 +94,7 @@ public Scope(final @NotNull SentryOptions options) { | |
| this.options = Objects.requireNonNull(options, "SentryOptions is required."); | ||
| this.breadcrumbs = createBreadcrumbsList(this.options.getMaxBreadcrumbs()); | ||
| this.propagationContext = new PropagationContext(); | ||
| this.lastEventId = SentryId.EMPTY_ID; | ||
| } | ||
|
|
||
| private Scope(final @NotNull Scope scope) { | ||
|
|
@@ -97,6 +103,8 @@ private Scope(final @NotNull Scope scope) { | |
| this.session = scope.session; | ||
| this.options = scope.options; | ||
| this.level = scope.level; | ||
| // TODO should we do this? didn't do it for Hub | ||
| this.lastEventId = scope.getLastEventId(); | ||
|
|
||
| final User userRef = scope.user; | ||
| this.user = userRef != null ? new User(userRef) : null; | ||
|
|
@@ -945,6 +953,26 @@ public void setPropagationContext(final @NotNull PropagationContext propagationC | |
| return new Scope(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void setLastEventId(@NotNull SentryId lastEventId) { | ||
| this.lastEventId = lastEventId; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull SentryId getLastEventId() { | ||
|
There was a problem hiding this comment. It's a bit weird but JS removed this feature altogether:
But to be honest I still think we need it though 😅 There was a problem hiding this comment. If we intend to remove it, we should deprecate it for a while and only remove this in a later major, not in |
||
| return lastEventId; | ||
| } | ||
|
|
||
| @Override | ||
| public void setClient(@NotNull ISentryClient client) { | ||
| this.client = client; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull ISentryClient getClient() { | ||
| return client; | ||
| } | ||
|
|
||
| /** The IWithTransaction callback */ | ||
| @ApiStatus.Internal | ||
| public interface IWithTransaction { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Client now lives on
IScopeand we'll set the default one on global scope in the future (follow up PR).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Client is now bound to global scope, as of #3344 but the code region is changed in later PRs a couple times.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good! For metrics it would be important to have only one shared
SentryClientinstance by default, as metrics aggregation/sending is bound to that right now. If that's not the case anymore just let me know, I can take a look.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should still be true. The
SentryClientis set on global scope onSentry.init. Before that there's aNoOpSentryClienton global scope. By default there should also only ever beNoOpSentryClienton isolation and current scope. A user can however bind any client on any of the scopes.