Skip to content

ref: Remove Playstation::envelop and Minidump::envelop helpers #6317

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 3 commits into
base: master
Choose a base branch
from
+12 −28
Open

ref: Remove Playstation::envelop and Minidump::envelop helpers #6317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb087cd
remove envelop function.
pierceroberts Aug 25, 2026
10d309c
Merge branch 'master' into proberts-rm-envelop-fn
tobias-wilfert Aug 25, 2026
3272fcf
Merge branch 'master' into proberts-rm-envelop-fn
pierceroberts Aug 30, 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
18 changes: 5 additions & 13 deletions relay-server/src/endpoints/minidump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,18 +651,6 @@ async fn items(
Ok(items)
}

fn envelope(
items: Managed<Items>,
meta: RequestMeta,
managed_err: Managed<(DataCategory, usize)>,
) -> Result<Managed<Box<Envelope>>, BadStoreRequest> {
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(
state: ServiceState,
meta: RequestMeta,
Expand Down Expand Up @@ -701,7 +689,11 @@ async fn handle(
.await
.reject(&managed_err)?;

let mut envelope = envelope(items, meta, managed_err)?;
let mut envelope = 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))
})?;
if gpu_crash_split {
let (cpu, gpu) = utils::gpu::split_crash(envelope);
if let Some(gpu) = gpu {
Expand Down
22 changes: 7 additions & 15 deletions relay-server/src/endpoints/playstation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,20 +220,6 @@ async fn multipart_to_items(
Ok(items)
}

fn envelope(
items: Managed<Items>,
meta: RequestMeta,
managed_err: Managed<(DataCategory, usize)>,
) -> Result<Managed<Box<Envelope>>, BadStoreRequest> {
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)
.with_required_feature(Feature::PlaystationIngestion);
Ok::<_, BadStoreRequest>(Box::new(envelope))
})?)
}

async fn handle(
state: ServiceState,
meta: RequestMeta,
Expand All @@ -255,7 +241,13 @@ async fn handle(
let items = multipart_to_items(multipart, &meta, &state, upload_context)
.await
.reject(&managed_err)?;
let envelope = envelope(items, meta, managed_err)?;
let envelope = 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)
.with_required_feature(Feature::PlaystationIngestion);
Ok::<_, BadStoreRequest>(Box::new(envelope))
})?;

let id = envelope.event_id();

Expand Down