Fix rate-limiting/filtering of raw envelopes (#579)

It turns out, raw envelopes were never ever send out via transports that support rate-limiting, as the `filter` would discard raw envelopes.

Author: Swatinem

sentry-types/src/protocol/envelope.rs

@@ -109,6 +109,8 @@ pub enum EnvelopeItem {
     Attachment(Attachment),
     /// A Profile Item.
     Profile(SampleProfile),
+    /// This is a sentinel item used to `filter` raw envelopes.
+    Raw,
     // TODO:
     // etc…
 }
@@ -213,12 +215,15 @@ impl Envelope {
     where
         I: Into<EnvelopeItem>,
     {
+        let item = item.into();
+
         let Items::EnvelopeItems(ref mut items) = self.items else {
-            eprintln!("WARNING: This envelope contains raw items. Adding an item is not supported.");
+            if item != EnvelopeItem::Raw {
+                eprintln!("WARNING: This envelope contains raw items. Adding an item is not supported.");
+            }
             return;
         };
 
-        let item = item.into();
         if self.event_id.is_none() {
             if let EnvelopeItem::Event(ref event) = item {
                 self.event_id = Some(event.event_id);
@@ -271,7 +276,7 @@ impl Envelope {
         P: FnMut(&EnvelopeItem) -> bool,
     {
         let Items::EnvelopeItems(items) = self.items else {
-            return None;
+            return if predicate(&EnvelopeItem::Raw) { Some(self) } else { None };
         };
 
         let mut filtered = Envelope::new();
@@ -336,13 +341,16 @@ impl Envelope {
                     continue;
                 }
                 EnvelopeItem::Profile(profile) => serde_json::to_writer(&mut item_buf, profile)?,
+                EnvelopeItem::Raw => {
+                    continue;
+                }
             }
             let item_type = match item {
                 EnvelopeItem::Event(_) => "event",
                 EnvelopeItem::SessionUpdate(_) => "session",
                 EnvelopeItem::SessionAggregates(_) => "sessions",
                 EnvelopeItem::Transaction(_) => "transaction",
-                EnvelopeItem::Attachment(_) => unreachable!(),
+                EnvelopeItem::Attachment(_) | EnvelopeItem::Raw => unreachable!(),
                 EnvelopeItem::Profile(_) => "profile",
             };
             writeln!(

sentry/examples/tracing-demo.rs

@@ -34,21 +34,28 @@ fn main_span1() {
     thread::spawn(move || {
         thread::sleep(Duration::from_millis(50));
 
-        thread_span1();
+        thread_span1("foo");
 
         tracing::error!("Holy shit everything is on fire!");
     });
     thread::sleep(Duration::from_millis(100));
 
-    main_span2()
+    main_span2(SomeArgument::default())
 }
 
 #[tracing::instrument]
-fn thread_span1() {
+fn thread_span1(_arg: &str) {
     thread::sleep(Duration::from_millis(200));
 }
 
 #[tracing::instrument]
-fn main_span2() {
+fn main_span2(_arg: SomeArgument) {
     thread::sleep(Duration::from_millis(200));
 }
+
+#[derive(Debug, Default)]
+struct SomeArgument {
+    _a: u32,
+    _b: bool,
+    _c: &'static str,
+}