feat: Basic attachment support

sentry-core/src/client.rs

@@ -278,6 +278,13 @@ impl Client {
                         envelope.add_item(session_item);
                     }
                 }
+
+                if let Some(scope) = scope {
+                    for attachment in scope.attachments.iter().cloned() {
+                        envelope.add_item(attachment);
+                    }
+                }
+
                 transport.send_envelope(envelope);
                 return event_id;
             }

sentry-core/src/scope/real.rs

@@ -4,7 +4,7 @@ use std::fmt;
 use std::sync::{Arc, Mutex, PoisonError, RwLock};
 
 use crate::performance::TransactionOrSpan;
-use crate::protocol::{Breadcrumb, Context, Event, Level, User, Value};
+use crate::protocol::{Attachment, Breadcrumb, Context, Event, Level, User, Value};
 use crate::session::Session;
 use crate::Client;
 
@@ -46,6 +46,7 @@ pub struct Scope {
     pub(crate) event_processors: Arc<Vec<EventProcessor>>,
     pub(crate) session: Arc<Mutex<Option<Session>>>,
     pub(crate) span: Arc<Option<TransactionOrSpan>>,
+    pub(crate) attachments: Arc<Vec<Attachment>>,
 }
 
 impl fmt::Debug for Scope {
@@ -218,6 +219,16 @@ impl Scope {
         Arc::make_mut(&mut self.event_processors).push(Arc::new(f));
     }
 
+    /// Adds an attachment to the scope
+    pub fn add_attachment(&mut self, attachment: Attachment) {
+        Arc::make_mut(&mut self.attachments).push(attachment);
+    }
+
+    /// Clears attachments from the scope
+    pub fn clear_attachments(&mut self) {
+        Arc::make_mut(&mut self.attachments).clear();
+    }
+
     /// Applies the contained scoped data to fill an event.
     pub fn apply_to_event(&self, mut event: Event<'static>) -> Option<Event<'static>> {
         // TODO: event really should have an optional level

sentry-types/src/protocol/attachment.rs

@@ -44,6 +44,8 @@ pub struct Attachment {
     pub buffer: Vec<u8>,
     /// The filename of the attachment.
     pub filename: String,
+    /// The Content Type of the attachment
+    pub content_type: Option<String>,
     /// The special type of this attachment.
     pub ty: Option<AttachmentType>,
 }
@@ -56,10 +58,14 @@ impl Attachment {
     {
         writeln!(
             writer,
-            r#"{{"type":"attachment","length":{length},"filename":"{filename}","attachment_type":"{at}"}}"#,
+            r#"{{"type":"attachment","length":{length},"filename":"{filename}","attachment_type":"{at}","content_type":"{ct}"}}"#,
             filename = self.filename,
             length = self.buffer.len(),
-            at = self.ty.unwrap_or_default().as_str()
+            at = self.ty.unwrap_or_default().as_str(),
+            ct = self
+                .content_type
+                .as_ref()
+                .unwrap_or(&"application/octet-stream".to_string())
         )?;
 
         writer.write_all(&self.buffer)?;

sentry-types/src/protocol/envelope.rs

@@ -65,6 +65,12 @@ impl From<Transaction<'static>> for EnvelopeItem {
     }
 }
 
+impl From<Attachment> for EnvelopeItem {
+    fn from(attachment: Attachment) -> Self {
+        EnvelopeItem::Attachment(attachment)
+    }
+}
+
 /// An Iterator over the items of an Envelope.
 #[derive(Clone)]
 pub struct EnvelopeItemIter<'s> {