Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(server): Disallow static mode for processing #4087

Merged
merged 4 commits into from
Sep 30, 2024
Merged

fix(server): Disallow static mode for processing #4087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d40c7a6
fix(server): Disallow static mode for processing
jjbayer Sep 30, 2024
1b3bc18
Merge branch 'master' into fix/server-managed-processing
jjbayer Sep 30, 2024
4b64b5d
changelog
jjbayer Sep 30, 2024
08ecff7
test: fix flaky test
jjbayer Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

**Breaking Changes:**

- Only allow processing enabled in managed mode. ([#4087](https://github.com/getsentry/relay/pull/4087))

**Bug Fixes**:

- Report invalid spans with appropriate outcome reason. ([#4051](https://github.com/getsentry/relay/pull/4051))
Expand Down
4 changes: 2 additions & 2 deletions relay/src/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ pub fn check_config(config: &Config) -> Result<()> {
);
}

if config.relay_mode() == RelayMode::Proxy && config.processing_enabled() {
anyhow::bail!("Processing cannot be enabled while in proxy mode.");
if config.relay_mode() != RelayMode::Managed && config.processing_enabled() {
anyhow::bail!("Processing can only be enabled in managed mode.");
}

#[cfg(feature = "processing")]
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_healthchecks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def test_readiness_not_enough_memory_bytes(mini_sentry, relay):
)

response = wait_get(relay, "/api/relay/healthcheck/ready/")
time.sleep(0.3) # Wait for error
time.sleep(0.5) # Wait for error
error = str(mini_sentry.test_failures.pop(0))
assert "Not enough memory" in error and ">= 42" in error
error = str(mini_sentry.test_failures.pop(0))
Expand Down
Loading