fix(multipart): Use correct discard reasons by elramen · Pull Request #5950 · getsentry/relay

elramen · 2026-05-06T15:14:03Z

Use correct discard reasons for outcomes across multipart endpoints. Also refactor from Vec<Managed<Item>> to Managed<Items> to simplify "all-item"-operations; albeit with a tradeoff of less ergonomic operations on individual items (see the indexing used to access and modify the minidump and proserpodump).

elramen · 2026-05-07T08:23:31Z

+    let envelope = items.map(|items, records| {
+        if items.iter().any(|i| i.creates_event()) {
+            records.modify_by(DataCategory::Error, 1);
+        }
+        Box::new(Envelope::from_request(Some(path.event_id), meta).with_items(items))


Steered away from a common envelope-creation function because of the complexity of keeping records correct in all cases. Opened #5949 to address this

…men-minidump-outcomes

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit eeb45a7. Configure here.}

jjbayer

Please take a look at https://github.com/getsentry/relay/pull/5950/changes#r3202052807 before merging.

jjbayer · 2026-05-07T13:53:10Z

+impl BadStoreRequest {
+    pub fn to_outcome(&self) -> Option<Outcome> {
+        let discard_reason = match self {
+            Self::InvalidCompressionContainer(_) => DiscardReason::InvalidCompression,
+            Self::InvalidMinidump => DiscardReason::InvalidMinidump,
+            #[cfg(sentry)]
+            Self::InvalidProsperodump => DiscardReason::InvalidProsperodump,
+            Self::MissingMinidump => DiscardReason::MissingMinidumpUpload,
+            #[cfg(sentry)]
+            Self::MissingProsperodump => DiscardReason::MissingProsperodumpUpload,
+            Self::Overflow(item_type) => DiscardReason::TooLarge(*item_type),
+            _ => DiscardReason::Internal,
+        };
+        Some(Outcome::Invalid(discard_reason))
+    }
+}


Not a blocker, but converting BadStoreRequest to a DiscardReason seems backward to me. It would be better to make the functions that currently return BadStoreRequest return a DiscardReason instead, and make that to a BadStoreRequest only if we reject the entire request.

I agree, and maybe we don't need BadStoreRequest at all. But changing all the functions that return BadStoreRequest seems out of scope for this PR.

Ideally we have proper scoped errors for these cases.

Also not really happy about:

impl From<Rejected<BadStoreRequest>> for BadStoreRequest { fn from(rejected: Rejected<BadStoreRequest>) -> Self { rejected.into_inner() } }

This also seems like a workaround rather than a solution and if it was explicit Rejected::into_inner it'd be more visible where there can be improvements.

That being said, this shouldn't block an overall improvement.

jjbayer · 2026-05-07T14:06:07Z

-                inner.set_filename(remove_container_extension(minidump_filename).to_owned())
+        items.try_modify(|items, records| -> Result<(), BadStoreRequest> {
+            let minidump_item = &mut items[minidump_idx];
+            minidump_item.set_payload(Minidump, payload);


Not related to this PR, but I noticed it: we always qualify enum variants:

Suggested change

minidump_item.set_payload(Minidump, payload);

minidump_item.set_payload(ContentType::Minidump, payload);

I'm confused, is qualifying something we should or shouldn't do?

Our convention is to always use the qualified path, that is MyEnum::MyVariant.

will fix in another PR

Dav1dde · 2026-05-08T08:15:35Z

    // Doing these operations does not make sense if we already streamed the minidump to objectstore.
-    if !minidump_item.is_attachment_ref() {
-        let payload = minidump_item.payload();
+    if !items[minidump_idx].is_attachment_ref() {


It's a bit nitpicky, but we do have a guideline to avoid slice syntax as it introduces a place where things can panic, see: https://develop.sentry.dev/engineering-practices/rust/#use-get-instead-of-slice-syntax

This policy while at times may seem useless, it did serve us well so far.

Something like this should do:

Suggested change

if !items[minidump_idx].is_attachment_ref() {

if !items.get(minidump_idx).is_some_and(|item| item.is_attachment_ref()) {

Or some variant of if let Some(x) = _.get() && x.foo()

will fix in another PR

Dav1dde · 2026-05-08T08:18:59Z

+impl BadStoreRequest {
+    pub fn to_outcome(&self) -> Option<Outcome> {
+        let discard_reason = match self {
+            Self::InvalidCompressionContainer(_) => DiscardReason::InvalidCompression,
+            Self::InvalidMinidump => DiscardReason::InvalidMinidump,
+            #[cfg(sentry)]
+            Self::InvalidProsperodump => DiscardReason::InvalidProsperodump,
+            Self::MissingMinidump => DiscardReason::MissingMinidumpUpload,
+            #[cfg(sentry)]
+            Self::MissingProsperodump => DiscardReason::MissingProsperodumpUpload,
+            Self::Overflow(item_type) => DiscardReason::TooLarge(*item_type),
+            _ => DiscardReason::Internal,
+        };
+        Some(Outcome::Invalid(discard_reason))
+    }
+}


Ideally we have proper scoped errors for these cases.

Also not really happy about:

impl From<Rejected<BadStoreRequest>> for BadStoreRequest { fn from(rejected: Rejected<BadStoreRequest>) -> Self { rejected.into_inner() } }

This also seems like a workaround rather than a solution and if it was explicit Rejected::into_inner it'd be more visible where there can be improvements.

That being said, this shouldn't block an overall improvement.

…men-minidump-outcomes

elramen force-pushed the elramen-minidump-outcomes branch 2 times, most recently from bab71e8 to 3ba99b0 Compare May 6, 2026 15:29

fix(multipart): Use correct discard reasons

c055532

elramen force-pushed the elramen-minidump-outcomes branch from 3ba99b0 to c055532 Compare May 6, 2026 15:32

elramen marked this pull request as ready for review May 6, 2026 15:40

elramen requested a review from a team as a code owner May 6, 2026 15:40

This comment was marked as off-topic.

Sign in to view

add changelog entry

d4025f1

elramen force-pushed the elramen-minidump-outcomes branch from ae96e45 to d4025f1 Compare May 6, 2026 15:52

Dav1dde reviewed May 7, 2026

View reviewed changes

Comment thread relay-server/src/endpoints/minidump.rs

Comment thread relay-server/src/endpoints/playstation.rs Outdated

elramen commented May 7, 2026

View reviewed changes

jjbayer reviewed May 7, 2026

View reviewed changes

Comment thread relay-server/src/endpoints/minidump.rs Outdated

Comment thread relay-server/src/endpoints/minidump.rs Outdated

Comment thread relay-server/src/endpoints/minidump.rs

elramen added 2 commits May 7, 2026 12:59

use reject

1a20b80

Merge branch 'master' of https://github.com/getsentry/relay into elra…

aa1370c

…men-minidump-outcomes

cursor Bot reviewed May 7, 2026

View reviewed changes

Comment thread relay-server/src/endpoints/common.rs

sentry Bot reviewed May 7, 2026

View reviewed changes

Comment thread relay-server/src/endpoints/common.rs

ref playstation

6f358f8

elramen requested a review from Dav1dde May 7, 2026 12:38

Merge branch 'master' of https://github.com/getsentry/relay into elra…

eeb45a7

…men-minidump-outcomes

sentry Bot reviewed May 7, 2026

View reviewed changes

Comment thread relay-server/src/utils/multipart.rs

cursor Bot reviewed May 7, 2026

View reviewed changes

Comment thread relay-server/src/endpoints/minidump.rs

elramen requested a review from jjbayer May 7, 2026 12:58

move down validate_minidump

6751950

jjbayer approved these changes May 7, 2026

View reviewed changes

Dav1dde approved these changes May 8, 2026

View reviewed changes

elramen force-pushed the elramen-minidump-outcomes branch from c0efc1c to ffe03f2 Compare May 8, 2026 10:10

Merge branch 'master' of https://github.com/getsentry/relay into elra…

0176978

…men-minidump-outcomes

elramen force-pushed the elramen-minidump-outcomes branch from ffe03f2 to 0176978 Compare May 8, 2026 10:18

sentry Bot reviewed May 8, 2026

View reviewed changes

Comment thread relay-server/src/utils/multipart.rs

elramen enabled auto-merge May 8, 2026 10:24

elramen added this pull request to the merge queue May 8, 2026

Merged via the queue into master with commit 4b2a159 May 8, 2026
30 checks passed

elramen deleted the elramen-minidump-outcomes branch May 8, 2026 10:56

elramen mentioned this pull request May 8, 2026

fix: Emit error outcome on pre-envelope failure in playstation and minidump #5966

Open

	minidump_item.set_payload(Minidump, payload);
	minidump_item.set_payload(ContentType::Minidump, payload);

	if !items[minidump_idx].is_attachment_ref() {
	if !items.get(minidump_idx).is_some_and(\|item\| item.is_attachment_ref()) {

Conversation

elramen commented May 6, 2026

Uh oh!

This comment was marked as off-topic.

Uh oh!

Uh oh!

Uh oh!

elramen May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jjbayer left a comment

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!

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!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

elramen May 7, 2026 •

edited

Loading