Emit metrics from processor::process_errors, make helper in event pro…

…cessor

relay-server/src/services/processor.rs

@@ -1486,18 +1486,11 @@ impl EnvelopeProcessorService {
         if state.has_event() {
             event::scrub(state)?;
             event::serialize(state)?;
+            event::emit_feedback_metrics(state.envelope());
         }
 
         attachment::scrub(state);
 
-        /*
-        //TODO:
-        if envelope state has user report v2:
-            let num_attachments = 0; // unsigned
-            count num attachments
-            metric!(counter(RelayCounters::FeedbackAttachments) += num_attachments as i64);
-         */
-
         Ok(())
     }
 

relay-server/src/services/processor/event.rs

@@ -20,7 +20,7 @@ use relay_quotas::DataCategory;
 use relay_statsd::metric;
 use serde_json::Value as SerdeValue;
 
-use crate::envelope::{AttachmentType, ContentType, Item, ItemType};
+use crate::envelope::{AttachmentType, ContentType, Envelope, Item, ItemType};
 use crate::extractors::RequestMeta;
 use crate::services::outcome::Outcome;
 use crate::services::processor::{
@@ -420,6 +420,26 @@ pub fn has_unprintable_fields(event: &Annotated<Event>) -> bool {
     }
 }
 
+//TODO: comment
+//TODO: add test: all incr/no incr cases, envelope unchanged
+pub fn emit_feedback_metrics(envelope: &Envelope) -> i64 {
+    let mut has_feedback = false;
+    let mut num_attachments = 0;
+    for item in envelope.items() {
+        match item.ty() {
+            ItemType::UserReportV2 => has_feedback = true,
+            ItemType::Attachment => num_attachments += 1,
+            _ => (),
+        }
+    }
+    if has_feedback && num_attachments > 0 {
+        metric!(counter(RelayCounters::FeedbackAttachments) += num_attachments);
+        num_attachments
+    } else {
+        0
+    }
+}
+
 /// Checks for duplicate items in an envelope.
 ///
 /// An item is considered duplicate if it was not removed by sanitation in `process_event` and

relay-server/src/services/store.rs

@@ -224,7 +224,6 @@ impl StoreService {
         let mut replay_event = None;
         let mut replay_recording = None;
 
-        let mut has_feedback = false;
         for item in envelope.items() {
             match item.ty() {
                 ItemType::Attachment => {
@@ -253,7 +252,6 @@ impl StoreService {
                     )?;
                 }
                 ItemType::UserReportV2 => {
-                    has_feedback = true;
                     let remote_addr = envelope.meta().client_addr().map(|addr| addr.to_string());
                     self.produce_user_report_v2(
                         event_id.ok_or(StoreError::NoEventId)?,
@@ -350,10 +348,6 @@ impl StoreService {
             }
         }
 
-        if has_feedback && !attachments.is_empty() {
-            metric!(counter(RelayCounters::FeedbackAttachments) += attachments.len() as i64);
-        }
-
         if let Some(recording) = replay_recording {
             // If a recording item type was seen we produce it to Kafka with the replay-event
             // payload (should it have been provided).