review

Author: jjbayer

relay-kafka/src/config.rs

@@ -69,25 +69,6 @@ impl KafkaTopic {
         ];
         TOPICS.iter()
     }
-
-    /// Returns a name for the topic for instrumentation.
-    pub fn as_str(&self) -> &str {
-        match self {
-            KafkaTopic::Events => "events",
-            KafkaTopic::Attachments => "attachments",
-            KafkaTopic::Transactions => "transactions",
-            KafkaTopic::Outcomes => "outcomes",
-            KafkaTopic::OutcomesBilling => "outcomes_billing",
-            KafkaTopic::MetricsSessions => "metrics_sessions",
-            KafkaTopic::MetricsGeneric => "metrics_generic",
-            KafkaTopic::Profiles => "profiles",
-            KafkaTopic::ReplayRecordings => "replay_recordings",
-            KafkaTopic::Monitors => "monitors",
-            KafkaTopic::Spans => "spans",
-            KafkaTopic::Feedback => "feedback",
-            KafkaTopic::Items => "items",
-        }
-    }
 }
 
 macro_rules! define_topic_assignments {

relay-server/src/services/store.rs

@@ -427,11 +427,11 @@ impl StoreService {
                 Ok(())
             }
             Err(error) => {
-                let envelope = envelope.into_envelope();
-                Err(
-                    Managed::from_envelope(envelope, self.outcome_aggregator.clone())
-                        .reject_err(error),
-                )
+                // The envelope is now empty. `ManagedEnvelope` still counts items correctly
+                // through `EnvelopeSummary`, but `Managed<Box<Envelope>>` does not.
+                // -> reject the old way and return a dummy item.
+                envelope.reject(Outcome::Invalid(DiscardReason::Internal));
+                Err(Managed::with_meta_from(&envelope, ()).reject_err(error))
             }
         }
     }