feat(relay): Simplify Proxy Mode #5165

tobias-wilfert · 2025-09-19T08:10:52Z

Introduces the ProxyProcessorService which is a simplified version of the EnvelopeProcessorService to use if Relay is run in the Proxy mode. Also does some changes to the HealthCheckService, AutoscalingMetricService and RelayStats to make these compatible.

Fixes: https://linear.app/getsentry/issue/INGEST-581/simplify-proxy-mode

…test.

…rt of t eh parameterization.

relay-server/src/services/processor.rs

…inor formatting

tobias-wilfert · 2025-10-17T07:35:30Z

relay-server/src/services/autoscaling.rs

                            )
                                .collect();
-                            let worker_pool_utilization = self.async_pool.metrics().total_utilization();
+                            let worker_pool_utilization = self.async_pool.as_ref().map_or(0, |pool| pool.metrics().total_utilization());


Not sure if it is better here to make the runtime_utilization in AutoscalingData an option rather than setting 0 here.

Intuitively using 0 here makes sense to me.

linear · 2025-10-17T09:28:41Z

INGEST-581 Simplify Proxy Mode

loewenheim · 2025-10-17T09:29:10Z

relay-server/src/services/autoscaling.rs

                            )
                                .collect();
-                            let worker_pool_utilization = self.async_pool.metrics().total_utilization();
+                            let worker_pool_utilization = self.async_pool.as_ref().map_or(0, |pool| pool.metrics().total_utilization());


Intuitively using 0 here makes sense to me.

loewenheim · 2025-10-17T09:33:05Z

relay-server/src/services/proxy_processor.rs

+pub struct ProxyProcessorService {
+    inner: InnerProxyProcessor,
+}
+
+struct InnerProxyProcessor {
+    config: Arc<Config>,
+    project_cache: ProjectCacheHandle,
+    addrs: ProxyAddrs,
+}


What's the reason for the inner struct?

As Sebastian mentions, this looks like a leftover from when it was still multi-threaded.

Dav1dde · 2025-10-17T10:21:46Z

relay-server/src/services/autoscaling.rs

        envelope_buffer: PartitionedEnvelopeBuffer,
        handle: Handle,
-        async_pool: EnvelopeProcessorServicePool,
+        async_pool: Option<EnvelopeProcessorServicePool>,


Mh, we could also disable the service and not run it at all in Proxy mode.

Dav1dde · 2025-10-17T10:22:26Z

relay-server/src/services/processor.rs

 impl ProcessingGroup {
    /// Splits provided envelope into list of tuples of groups with associated envelopes.
-    fn split_envelope(
+    pub fn split_envelope(


This shouldn't be necessary.

Dav1dde · 2025-10-17T10:23:03Z

relay-server/src/services/processor.rs

 #[derive(Debug)]
 pub struct SendEnvelope {
-    envelope: TypedEnvelope<Processed>,
-    body: Bytes,
-    http_encoding: HttpEncoding,
-    project_cache: ProjectCacheHandle,
+    pub envelope: TypedEnvelope<Processed>,
+    pub body: Bytes,
+    pub http_encoding: HttpEncoding,
+    pub project_cache: ProjectCacheHandle,
 }


For the reader, we discussed what to do here and decided to just make it public for this PR, we can clean up visibility and types in a follow up

Dav1dde · 2025-10-17T10:23:38Z

relay-server/src/services/proxy_processor.rs

+pub struct ProxyProcessorService {
+    inner: InnerProxyProcessor,
+}
+
+struct InnerProxyProcessor {
+    config: Arc<Config>,
+    project_cache: ProjectCacheHandle,
+    addrs: ProxyAddrs,
+}


As Sebastian mentions, this looks like a leftover from when it was still multi-threaded.

Dav1dde · 2025-10-17T10:24:00Z

relay-server/src/services/proxy_processor.rs

+    pub outcome_aggregator: Addr<TrackOutcome>,
+    pub upstream_relay: Addr<UpstreamRelay>,


Generally we want docs on public fields, even if they are just very basic.

Dav1dde · 2025-10-17T10:25:45Z

relay-server/src/services/proxy_processor.rs

+}
+
+impl ProxyProcessorService {
+    /// Creates a multi-threaded proxy processor.


It's not multi threaded.

Dav1dde · 2025-10-17T10:27:06Z

relay-server/src/services/proxy_processor.rs

+        let mut envelope = Envelope::from_request(None, RequestMeta::outbound(dsn));
+        for client_report in client_reports {
+            let mut item = Item::new(ItemType::ClientReport);
+            item.set_payload(ContentType::Json, client_report.serialize().unwrap()); // TODO: unwrap OK?


Unwraps (with a TODO) are never okay, that todo should've been cleaned up a while ago in the other processor 🙈

Fine to leave it for now, we can do that in a follow up.

Dav1dde · 2025-10-17T10:27:27Z

relay-server/src/services/proxy_processor.rs

+    fn submit_upstream(&self, envelope: ManagedEnvelope) {
+        let mut envelope = envelope;


Suggested change

fn submit_upstream(&self, envelope: ManagedEnvelope) {

let mut envelope = envelope;

fn submit_upstream(&self, mut envelope: ManagedEnvelope) {

Dav1dde · 2025-10-17T10:29:14Z

CHANGELOG.md


+**Breaking Changes**:
+
+- Simplify proxy mode to forward without processing ([#5165](https://github.com/getsentry/relay/pull/5165))


Suggested change

- Simplify proxy mode to forward without processing ([#5165](https://github.com/getsentry/relay/pull/5165))

- Simplify proxy mode to forward without processing. ([#5165](https://github.com/getsentry/relay/pull/5165))

Dav1dde · 2025-10-17T10:30:16Z

CHANGELOG.md


 ## Unreleased

+**Breaking Changes**:


Since this is a large fundamental change of how Relay operates in Proxy mode it's a good idea to call that out.

Ideally the PR description then goes into details why this is a breaking change and/or what users are expected to do when they encounter this one.

Rough outline

6ce4b13

tobias-wilfert self-assigned this Sep 19, 2025

tobias-wilfert added 10 commits September 19, 2025 13:01

Copy logic for handle_submit_client_reports.

f08dd9c

Adapt handle_submit_client_reports logic

adae25d

Copy logic for handle_flush_buckets.

cdfd669

tmp save

6551766

Remove code that will not be needed in proxy mode

4800bb0

Update the tests that are now already breaking

c293dc0

Try getting the basics working first before addressing everything.

2d019d4

Remove outdated comments, add new ones and clean up code.

3684d37

More clean up

4f8939d

Rudimentary tests

130f83d

tobias-wilfert changed the title ~~WIP: Simplify Proxy Mode~~ ref(relay_mode): Simplify Proxy Mode Oct 14, 2025

tobias-wilfert changed the title ~~ref(relay_mode): Simplify Proxy Mode~~ feat(relay): Simplify Proxy Mode Oct 14, 2025

tobias-wilfert added 7 commits October 14, 2025 14:32

remove comment

6b83213

Update ratelimiting test to also check proxy mode

5175ddd

Add initial version of one large test.

9b660e5

Test the ratelimiting in a proxy test rather than changing the store …

ac14520

…test.

Don't start the aggregator and cogs in proxy mode.

b0f5ed9

Improve test by using random data and adding the expect outcome as pa…

213e7ea

…rt of t eh parameterization.

Make the edge-cases more explicit

4001c74

tobias-wilfert commented Oct 16, 2025

View reviewed changes

relay-server/src/services/processor.rs Outdated Show resolved Hide resolved

tobias-wilfert added 3 commits October 17, 2025 09:02

Remove pool from proxy mode processor

26174bb

Avoid monkey patching in test, asset outcomes against sorted list + m…

0f6646b

…inor formatting

Move proxy_processor into own file

ebcbd4c

tobias-wilfert commented Oct 17, 2025

View reviewed changes

tobias-wilfert and others added 4 commits October 17, 2025 09:51

Update comment + readd sleep to make CI happy

7b517d6

Merge branch 'master' into tobias-wilfert/feat/simplify-proxy-mode

44b9e0d

Add changelog entry

8eae7e0

Remove outdated item types

6af517c

tobias-wilfert and others added 3 commits October 17, 2025 10:49

Merge branch 'master' into tobias-wilfert/feat/simplify-proxy-mode

dca6f1f

update changelog entry

b278533

Merge branch 'master' into tobias-wilfert/feat/simplify-proxy-mode

0c02913

tobias-wilfert marked this pull request as ready for review October 17, 2025 09:21

tobias-wilfert requested a review from a team as a code owner October 17, 2025 09:21

loewenheim reviewed Oct 17, 2025

View reviewed changes

Dav1dde reviewed Oct 17, 2025

View reviewed changes

		pub outcome_aggregator: Addr<TrackOutcome>,
		pub upstream_relay: Addr<UpstreamRelay>,

		fn submit_upstream(&self, envelope: ManagedEnvelope) {
		let mut envelope = envelope;

	fn submit_upstream(&self, envelope: ManagedEnvelope) {
	let mut envelope = envelope;
	fn submit_upstream(&self, mut envelope: ManagedEnvelope) {


		Breaking Changes:

		- Simplify proxy mode to forward without processing ([#5165](https://github.com/getsentry/relay/pull/5165))

feat(relay): Simplify Proxy Mode #5165

Are you sure you want to change the base?

feat(relay): Simplify Proxy Mode #5165

Uh oh!

Conversation

tobias-wilfert commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

linear bot commented Oct 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tobias-wilfert commented Sep 19, 2025 •

edited

Loading