Couple more things

getsentry · Jan 31, 2025 · c534553 · c534553
1 parent da7633a
commit c534553
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/relay-event-schema/src/protocol/contexts/mod.rs b/relay-event-schema/src/protocol/contexts/mod.rs
@@ -114,7 +114,7 @@ impl From<Context> for ContextInner {
 /// name is `contexts`.
 ///
 /// The `contexts` type can be used to define arbitrary contextual data on the event. It accepts an
-/// object of key/value pairs. The key is the “alias” of the context and can be freely chosen.
+/// object of key/value pairs. The key is the "alias" of the context and can be freely chosen.
 /// However, as per policy, it should match the type of the context unless there are two values for
 /// a type. You can omit `type` if the key name is the type.
 ///

diff --git a/relay-server/src/services/processor.rs b/relay-server/src/services/processor.rs
@@ -1601,14 +1601,6 @@ impl EnvelopeProcessorService {
             )?;
         });
 
-        if_processing!(self.inner.config, {
-            ourlog::extract_from_event(
-                managed_envelope,
-                &event,
-                &self.inner.global_config.current(),
-            );
-        });
-
         if event.value().is_some() {
             event::scrub(&mut event, project_info.clone())?;
             event::serialize(
@@ -1621,7 +1613,17 @@ impl EnvelopeProcessorService {
             event::emit_feedback_metrics(managed_envelope.envelope());
         }
 
-        attachment::scrub(managed_envelope, project_info);
+        attachment::scrub(managed_envelope, project_info.clone());
+
+        if_processing!(self.inner.config, {
+            if project_info.has_feature(Feature::OurLogsBreadcrumbExtraction) {
+                ourlog::extract_from_event(
+                    managed_envelope,
+                    &event,
+                    &self.inner.global_config.current(),
+                );
+            }
+        });
 
         if self.inner.config.processing_enabled() && !event_fully_normalized.0 {
             relay_log::error!(
@@ -1914,7 +1916,7 @@ impl EnvelopeProcessorService {
         });
 
         report::process_user_reports(managed_envelope);
-        attachment::scrub(managed_envelope, project_info);
+        attachment::scrub(managed_envelope, project_info.clone());
 
         Ok(Some(extracted_metrics))
     }