feat(relay): Simplify Proxy Mode #5165
Merged
Conversation
This file contains hidden or 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
tobias-wilfert
changed the title
tobias-wilfert
changed the title
…rt of t eh parameterization.
tobias-wilfert
commented
Oct 16, 2025
tobias-wilfert
commented
Oct 17, 2025
jjbayer
reviewed
Oct 21, 2025
…getsentry/relay into tobias-wilfert/feat/simplify-proxy-mode
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
…getsentry/relay into tobias-wilfert/feat/simplify-proxy-mode
Dav1dde
approved these changes
Oct 21, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 22, 2025
This is a big change, however this should not break anything. Users that run Relay in Proxy mode should not experience any negative side effects. With the recent changes to the Relay modes (#5108, #5057, #5053) it became apparent that the proxy mode is currently doing more than strictly necessary. That is, the logic is currently more complex than it needs to be and as such it also is less efficient than it could be. This PR tries to rectify this by making Proxy mode more of a 'pure' Proxy by introducing the `ProxyProcessorService` which is a simplified version of the `EnvelopeProcessorService`. There are also some changes to the `HealthCheckService`, `AutoscalingMetricService` and `RelayStats` to make these compatible. Fixes: https://linear.app/getsentry/issue/INGEST-581/simplify-proxy-mode
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 22, 2025
Now that #5165 has landed, we can cleanup the proxy mode handling in the new processing pipelines. This simplifies a bunch of code as the output now is always processed. This was always a bit messy and temporary and put in as a reminder to deal with proxy mode properly. Now that it is in, we can clean it up :)
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 22, 2025
…ts` (#5282) During the recent creation of the `ProxyProcessorService` it was rightfully [pointed out](#5165 (comment)) that we probably want to clean up the unwraps. This PR replaces the unwraps, both in the new `ProxyProcessorService` and the `EnvelopeProcessorService`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 is a big change, however this should not break anything. Users that run Relay in Proxy mode should not experience any negative side effects.
With the recent changes to the Relay modes (#5108, #5057, #5053) it became apparent that the proxy mode is currently doing more than strictly necessary. That is, the logic is currently more complex than it needs to be and as such it also is less efficient than it could be. This PR tries to rectify this by making Proxy mode more of a 'pure' Proxy by introducing the
ProxyProcessorServicewhich is a simplified version of theEnvelopeProcessorService. There are also some changes to theHealthCheckService,AutoscalingMetricServiceandRelayStatsto make these compatible.Fixes: https://linear.app/getsentry/issue/INGEST-581/simplify-proxy-mode