Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### New Features

- Added a `Envelope::into_items` method, which returns an iterator over owned [`EnvelopeItem`s](https://docs.rs/sentry/0.46.2/sentry/protocol/enum.EnvelopeItem.html) in the [`Envelope`](https://docs.rs/sentry/0.46.2/sentry/struct.Envelope.html) ([#983](https://github.com/getsentry/sentry-rust/pull/983)).

## 0.46.2

### New Features
Expand Down
6 changes: 3 additions & 3 deletions sentry-opentelemetry/tests/creates_distributed_trace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ fn test_creates_distributed_trace() {
let mut first_tx = None;
let mut second_tx = None;

for envelope in &envelopes {
let tx = match envelope.items().next().unwrap() {
sentry::protocol::EnvelopeItem::Transaction(tx) => tx.clone(),
for envelope in envelopes {
let tx = match envelope.into_items().next().unwrap() {
sentry::protocol::EnvelopeItem::Transaction(tx) => tx,
unexpected => panic!("Expected transaction, but got {unexpected:#?}"),
};

Expand Down
11 changes: 11 additions & 0 deletions sentry-types/src/protocol/envelope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,17 @@ impl Envelope {
EnvelopeItemIter { inner }
}

/// Consume the Envelope and create an [`Iterator`] over all
/// owned [`EnvelopeItem`]s.
///
/// Raw envelopes yield an empty iterator.
pub fn into_items(self) -> impl Iterator<Item = EnvelopeItem> {
match self.items {
Items::EnvelopeItems(items) => items.into_iter(),
Items::Raw(_) => Default::default(),
}
}

/// Returns the Envelope headers.
pub fn headers(&self) -> &EnvelopeHeaders {
&self.headers
Expand Down