feat(processor): Fast path rate limiting for trace attachments

relay-server/src/envelope/item.rs

@@ -476,6 +476,27 @@ impl Item {
         self.is_attachment_v2() && self.parent_id().is_none()
     }
 
+    /// Returns the [`AttachmentParentType`] of an attachment.
+    ///
+    /// For standard attachments (V1) always returns [`AttachmentParentType::Event`].
+    pub fn attachment_parent_type(&self) -> AttachmentParentType {
+        let is_attachment = self.ty() == &ItemType::Attachment;
+        debug_assert!(
+            is_attachment,
+            "function should only be called on attachments"
+        );
+        let is_trace_attachment = self.content_type() == Some(&ContentType::TraceAttachment);
+
+        if is_trace_attachment {
+            match self.parent_id() {
+                Some(ParentId::SpanId(_)) => AttachmentParentType::Span,
+                None => AttachmentParentType::Trace,
+            }
+        } else {
+            AttachmentParentType::Event
+        }
+    }
+
     /// Returns the attachment payload size.
     ///
     /// For AttachmentV2, returns only the size of the actual payload, excluding the attachment meta.
@@ -1086,6 +1107,23 @@ impl ParentId {
     }
 }
 
+/// The type of parent entity an attachment is associated with.
+///
+/// This is used to route attachments to different rate limiting buckets, since
+/// depending on the parent the limiting logic is different. E.g. if the attachment has
+/// [`AttachmentParentType::Span`] than it should be dropped if there are span limits.
+///
+/// See [`Item::attachment_parent_type`] for how this is determined from an item.
+#[derive(Debug)]
+pub enum AttachmentParentType {
+    /// The parent type for all V1 attachments (e.g. minidumps)
+    Event,
+    /// The parent type for all span V2 attachments.
+    Span,
+    /// The parent type for all trace V2 attachments.
+    Trace,
+}
+
 #[cfg(test)]
 mod tests {
     use crate::integrations::OtelFormat;

relay-server/src/managed/counted.rs

@@ -74,10 +74,13 @@ impl Counted for Box<Envelope> {
         }
 
         let data = [
-            (DataCategory::Attachment, summary.attachment_quantity),
+            (
+                DataCategory::Attachment,
+                summary.attachment_quantities.bytes(),
+            ),
             (
                 DataCategory::AttachmentItem,
-                summary.attachment_item_quantity,
+                summary.attachment_quantities.count(),
             ),
             (DataCategory::Profile, summary.profile_quantity),
             (DataCategory::ProfileIndexed, summary.profile_quantity),

relay-server/src/managed/envelope.rs

@@ -330,7 +330,7 @@ impl ManagedEnvelope {
 
                 relay_log::error!(
                     tags.project_key = self.scoping().project_key.to_string(),
-                    tags.has_attachments = summary.attachment_quantity > 0,
+                    tags.has_attachments = summary.attachment_quantities.bytes() > 0,
                     tags.has_sessions = summary.session_quantity > 0,
                     tags.has_profiles = summary.profile_quantity > 0,
                     tags.has_transactions = summary.secondary_transaction_quantity > 0,
@@ -354,19 +354,19 @@ impl ManagedEnvelope {
             self.track_outcome(outcome.clone(), category, 1);
         }
 
-        if self.context.summary.attachment_quantity > 0 {
+        if self.context.summary.attachment_quantities.bytes() > 0 {
             self.track_outcome(
                 outcome.clone(),
                 DataCategory::Attachment,
-                self.context.summary.attachment_quantity,
+                self.context.summary.attachment_quantities.bytes(),
             );
         }
 
-        if self.context.summary.attachment_item_quantity > 0 {
+        if self.context.summary.attachment_quantities.count() > 0 {
             self.track_outcome(
                 outcome.clone(),
                 DataCategory::AttachmentItem,
-                self.context.summary.attachment_item_quantity,
+                self.context.summary.attachment_quantities.count(),
             );
         }