Skip to content

ref(protocol): Generic items serializer #1021

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

Merged
szokeasaurusrex merged 1 commit into from
Mar 2, 2026
Merged

ref(protocol): Generic items serializer #1021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions sentry-types/src/protocol/envelope.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{io::Write, path::Path, time::SystemTime};
use std::{borrow::Cow, io::Write, path::Path, time::SystemTime};

use serde::{Deserialize, Serialize};
use thiserror::Error;
Expand Down Expand Up @@ -224,14 +224,15 @@ impl From<Vec<Log>> for ItemContainer {
}
}

#[derive(Serialize)]
struct LogsSerializationWrapper<'a> {
items: &'a [Log],
}

#[derive(Deserialize)]
struct LogsDeserializationWrapper {
items: Vec<Log>,
/// A lightweight wrapper for serializing/deserializing a slice of items,
/// so that it looks like:
///
/// ```json
/// { items: [...] }
/// ```
#[derive(Deserialize, Serialize)]
struct ItemsSerdeWrapper<'a, T: Clone> {
items: Cow<'a, [T]>,
}

impl From<Event<'static>> for EnvelopeItem {
Expand Down Expand Up @@ -502,7 +503,7 @@ impl Envelope {
}
EnvelopeItem::ItemContainer(container) => match container {
ItemContainer::Logs(logs) => {
let wrapper = LogsSerializationWrapper { items: logs };
let wrapper = ItemsSerdeWrapper { items: logs.into() };
serde_json::to_writer(&mut item_buf, &wrapper)?
}
},
Expand Down Expand Up @@ -673,8 +674,8 @@ impl Envelope {
serde_json::from_slice(payload).map(EnvelopeItem::MonitorCheckIn)
}
EnvelopeItemType::LogsContainer => {
serde_json::from_slice::<LogsDeserializationWrapper>(payload)
.map(|x| EnvelopeItem::ItemContainer(ItemContainer::Logs(x.items)))
serde_json::from_slice::<ItemsSerdeWrapper<_>>(payload)
.map(|x| EnvelopeItem::ItemContainer(ItemContainer::Logs(x.items.into())))
}
}
.map_err(EnvelopeError::InvalidItemPayload)?;
Expand Down