feat(core): Add getGlobalScope() method
#9920
Merged
Conversation
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
size-limit report 📦
|
AbhiPrasad
reviewed
Dec 19, 2023
packages/core/src/scope.ts
Outdated
| @@ -469,7 +472,7 @@ export class Scope implements ScopeInterface { | |||
| } | |||
|
|
|||
| /** @inheritDoc */ | |||
| public getScopeData(): ScopeData { | |||
| public getPerScopeData(): ScopeData { | |||
There was a problem hiding this comment.
Does getPerScopeData have to be public API?
I also am not the biggest fan of the scope class being aware of a separate global scope. I'd rather it be the consumers of the scope that decide to use the global scope.
There was a problem hiding this comment.
Hmm, I see your point. I'll see if we can do this another way!
mydea
force-pushed
the
fn/globalScope
branch
2 times, most recently
from
0ed9262
to
b17d167
Compare
mydea
commented
Dec 20, 2023
| // of `@sentry/core` that does not have the `getAttachments` method. | ||
| // See: https://github.com/getsentry/sentry-javascript/issues/5229 | ||
| // Merge scope data together | ||
| const data = getGlobalScope().getScopeData(); |
There was a problem hiding this comment.
@AbhiPrasad I refactored this so that the global scope is merged/applied in prepareEvent.
mydea
commented
Dec 20, 2023
| const data = getGlobalScope().getPerScopeData(); | ||
| const isolationScopeData = this._getIsolationScope().getPerScopeData(); | ||
| const scopeData = this.getPerScopeData(); | ||
| const globalScope = getGlobalScope(); |
There was a problem hiding this comment.
When we introduce the isolation scope in a follow up PR, we can clean this up here and drastically simplify this! But for now I think this is "OK".
AbhiPrasad
approved these changes
Dec 20, 2023
packages/core/src/globals.ts
Outdated
| import type { Scope } from '@sentry/types'; | ||
|
|
||
| interface GlobalData { | ||
| globalScope?: Scope; |
There was a problem hiding this comment.
m: we need to be careful for global{s}.ts because of #5969
Let's rename this file to globalscope.ts? Also why do we have the indirection to GLOBAL_DATA.globalScope, can't we point to globalScope directly? If we refactor to need more GLOBAL_DATA, items, we can add it back.
This scope lives in module scope and is applied to _all_ events.
mydea
force-pushed
the
fn/globalScope
branch
from
b17d167
to
94ae54c
Compare
lforst
approved these changes
Dec 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This scope lives in module scope and is applied to all events.
Please review this carefully, as it is important that data is correctly applied etc. There should be a decent amount of tests covering all of this, but just to make sure. This was mostly ported/extracted from node-experimental.