Skip to content

ref(managed): Implement Managed::zip function #6174

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

Open
pierceroberts wants to merge 6 commits into
base: master
Choose a base branch
from
+10 −21
Open

ref(managed): Implement Managed::zip function #6174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10a6fe8
Implement zip function in envelope fns
pierceroberts Jul 4, 2026
6e2e99c
Add entry to changelog
pierceroberts Jul 7, 2026
7dc7da4
rm chng log entry.
pierceroberts Jul 24, 2026
34504d8
simplify envelope fn.
pierceroberts Jul 24, 2026
a649ca7
fix implementation of managed::zip
pierceroberts Jul 24, 2026
06e9b6c
Merge branch 'master' into proberts-impl-managed-zip-fn
pierceroberts Aug 4, 2026
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
14 changes: 5 additions & 9 deletions relay-server/src/endpoints/minidump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,15 +631,11 @@ fn envelope(
meta: RequestMeta,
managed_err: Managed<(DataCategory, usize)>,
) -> Result<Managed<Box<Envelope>>, BadStoreRequest> {
let event_id = common::event_id_from_items(&items)
.reject2(&items, &managed_err)?
.unwrap_or_else(EventId::new);
let envelope = items.map(|items, records| {
managed_err.accept(|_| ()); // There will be an envelope with (DataCategory::Error, 1) now
records.modify_by(DataCategory::Error, 1);
Box::new(Envelope::from_request(Some(event_id), meta).with_items(items))
});
Ok(envelope)
Ok(Managed::zip(managed_err, items).try_map(|(_, items), _| {
let event_id = common::event_id_from_items(&items)?.unwrap_or_default();
let envelope = Envelope::from_request(Some(event_id), meta).with_items(items);
Ok::<_, BadStoreRequest>(Box::new(envelope))
})?)
}

async fn handle(
Expand Down
17 changes: 5 additions & 12 deletions relay-server/src/endpoints/playstation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,18 +226,11 @@ fn envelope(
meta: RequestMeta,
managed_err: Managed<(DataCategory, usize)>,
) -> Result<Managed<Box<Envelope>>, BadStoreRequest> {
let event_id = common::event_id_from_items(&items)
.reject2(&items, &managed_err)?
.unwrap_or_else(EventId::new);
let envelope = items.map(|items, records| {
managed_err.accept(|_| ()); // There will be an envelope with (DataCategory::Error, 1) now
records.modify_by(DataCategory::Error, 1);
let envelope = Envelope::from_request(Some(event_id), meta)
.with_items(items)
.with_required_feature(Feature::PlaystationIngestion);
Box::new(envelope)
});
Ok(envelope)
Ok(Managed::zip(managed_err, items).try_map(|(_, items), _| {
let event_id = common::event_id_from_items(&items)?.unwrap_or_default();
let envelope = Envelope::from_request(Some(event_id), meta).with_items(items);
Ok::<_, BadStoreRequest>(Box::new(envelope))
})?)
}

async fn handle(
Expand Down
Loading