ref(server): Fix and re-apply #3770 #3854
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
… types (#3770) We currently deal with different envelope states inconsistently: Because the state of a project is encoded into many separate fields and types, it's hard to enforce that the config is validated correctly everywhere that it is used. For example, invalid (i.e. unparsable) project configs are sometimes treated the same as pending, sometimes the same as disabled.
jjbayer
force-pushed
the
feat/unify-project-states-again
branch
from
e9434ab to
5607bd3
Compare
jjbayer
commented
Jul 23, 2024
Comment on lines
+271
to
+276
| def test_root_project_disabled(mini_sentry, relay): | ||
| project_id = 42 | ||
| mini_sentry.add_full_project_config(project_id) | ||
| disabled_dsn = "00000000000000000000000000000000" | ||
| txn = send_transaction_with_dsc(mini_sentry, relay, project_id, disabled_dsn) | ||
| assert txn |
There was a problem hiding this comment.
This test fails with the previous implementation in #3770.
jjbayer
changed the title
jjbayer
commented
Jul 23, 2024
| ProjectState::Disabled => { | ||
| relay_log::trace!("Sampling state is disabled ({sampling_key})"); | ||
| // We accept events even if its root project has been disabled. | ||
| requires_sampling_state = false; |
There was a problem hiding this comment.
This was missing in the previous PR: By setting state to None, we fell back to enqueueing an envelope if its sampling project was disabled (see test_root_project_disabled).
Dav1dde
approved these changes
Jul 24, 2024
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.
Fixes and reapplies #3770.
Above PR had a bug that created a tight spool-unspool loop for disabled projects (see commented test case).
To view the diff with the previous PR, minus latest master changes, see:
https://github.com/getsentry/relay/pull/3854/files/332619c8ff9c5257cd1ea13052ea60e4590df5a4..c320ba6e9666286a61b6dfbf05fb063df24bb331
#skip-changelog