diff --git a/CHANGELOG.md b/CHANGELOG.md index 2212d17058..4e4a615cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/relay/src/setup.rs b/relay/src/setup.rs index 48aacd1d7a..8c42e0b1eb 100644 --- a/relay/src/setup.rs +++ b/relay/src/setup.rs @@ -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")] diff --git a/tests/integration/test_healthchecks.py b/tests/integration/test_healthchecks.py index 4c3a57d195..8f159c176a 100644 --- a/tests/integration/test_healthchecks.py +++ b/tests/integration/test_healthchecks.py @@ -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))