fix(playstation): Make feature flag organisation wide (#4736)

Author: tobias-wilfert

relay-dynamic-config/src/feature.rs

@@ -63,8 +63,8 @@ pub enum Feature {
     OtelEndpoint,
     /// Enable playstation crash dump ingestion via the `/playstation/` endpoint.
     ///
-    /// Serialized as `project:relay-playstation-ingestion`.
-    #[serde(rename = "projects:relay-playstation-ingestion")]
+    /// Serialized as `organizations:relay-playstation-ingestion`.
+    #[serde(rename = "organizations:relay-playstation-ingestion")]
     PlaystationIngestion,
     /// Discard transactions in a spans-only world.
     ///

relay-server/src/services/processor.rs

@@ -1606,9 +1606,12 @@ impl EnvelopeProcessorService {
                 event_fully_normalized = inner_event_fully_normalized;
             }
             #[cfg(all(sentry, feature = "processing"))]
-            if let Some(inner_event_fully_normalized) =
-                playstation::process(managed_envelope, &mut event, &self.inner.config)?
-            {
+            if let Some(inner_event_fully_normalized) = playstation::process(
+                managed_envelope,
+                &mut event,
+                &self.inner.config,
+                &project_info,
+            )? {
                 event_fully_normalized = inner_event_fully_normalized;
             }
             if let Some(inner_event_fully_normalized) =

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

@@ -3,6 +3,7 @@
 //! These functions are included only in the processing mode.
 
 use relay_config::Config;
+use relay_dynamic_config::Feature;
 use relay_event_schema::protocol::{
     AppContext, Context, Contexts, DeviceContext, LenientString, OsContext, RuntimeContext, Tags,
 };
@@ -13,6 +14,7 @@ use relay_protocol::{Annotated, Object};
 use crate::envelope::{AttachmentType, ContentType, Item, ItemType};
 use crate::services::processor::metric;
 use crate::services::processor::{ErrorGroup, EventFullyNormalized, ProcessingError};
+use crate::services::projects::project::ProjectInfo;
 use crate::statsd::RelayCounters;
 use crate::utils;
 use crate::utils::TypedEnvelope;
@@ -21,8 +23,14 @@ pub fn process(
     managed_envelope: &mut TypedEnvelope<ErrorGroup>,
     event: &mut Annotated<Event>,
     config: &Config,
+    project_info: &ProjectInfo,
 ) -> Result<Option<EventFullyNormalized>, ProcessingError> {
     let envelope = &mut managed_envelope.envelope_mut();
+
+    if !project_info.has_feature(Feature::PlaystationIngestion) {
+        return Ok(None);
+    }
+
     if let Some(item) = envelope.take_item_by(|item| {
         item.ty() == &ItemType::Attachment
             && item.attachment_type() == Some(&AttachmentType::Prosperodump)

tests/integration/test_playstation.py

@@ -82,7 +82,7 @@ def test_playstation_with_feature_flag(
     playstation_dump = load_dump_file("playstation.prosperodmp")
     mini_sentry.add_full_project_config(
         PROJECT_ID,
-        extra={"config": {"features": ["projects:relay-playstation-ingestion"]}},
+        extra={"config": {"features": ["organizations:relay-playstation-ingestion"]}},
     )
     outcomes_consumer = outcomes_consumer()
     attachments_consumer = attachments_consumer()
@@ -150,7 +150,7 @@ def test_playstation_attachment(
     playstation_dump = load_dump_file("playstation.prosperodmp")
     mini_sentry.add_full_project_config(
         PROJECT_ID,
-        extra={"config": {"features": ["projects:relay-playstation-ingestion"]}},
+        extra={"config": {"features": ["organizations:relay-playstation-ingestion"]}},
     )
     outcomes_consumer = outcomes_consumer()
     attachments_consumer = attachments_consumer()
@@ -218,3 +218,59 @@ def test_playstation_attachment(
     assert "_metrics" in event_data
     assert event_data["_metrics"]["bytes.ingested.event.minidump"] > 0
     assert event_data["_metrics"]["bytes.ingested.event.attachment"] > 0
+
+
+def test_playstation_attachment_no_feature_flag(
+    mini_sentry,
+    relay_with_playstation,
+    outcomes_consumer,
+    attachments_consumer,
+):
+    PROJECT_ID = 42
+    playstation_dump = load_dump_file("playstation.prosperodmp")
+    mini_sentry.add_full_project_config(
+        PROJECT_ID,
+    )
+    outcomes_consumer = outcomes_consumer()
+    attachments_consumer = attachments_consumer()
+    relay = relay_with_playstation()
+
+    bogus_error = {
+        "event_id": "cbf6960622e14a45abc1f03b2055b186",
+        "type": "error",
+        "exception": {"values": [{"type": "ValueError", "value": "Should not happen"}]},
+    }
+    envelope = Envelope()
+    envelope.add_event(bogus_error)
+
+    # Add the PlayStation dump as an attachment
+    envelope.add_item(
+        Item(
+            type="attachment",
+            payload=PayloadRef(bytes=playstation_dump),
+            headers={
+                "attachment_type": "playstation.prosperodump",
+                "filename": "playstation.prosperodmp",
+                "content_type": "application/octet-stream",
+            },
+        )
+    )
+    relay.send_envelope(PROJECT_ID, envelope)
+
+    while True:
+        _, message = attachments_consumer.get_message()
+        if message is None or message["type"] != "attachment_chunk":
+            event = message
+            break
+
+    assert event
+
+    assert len(event["attachments"]) == 1
+    attachment = event["attachments"][0]
+    assert attachment["attachment_type"] == "playstation.prosperodump"
+
+    event_data = json.loads(event["payload"])
+    assert event_data["type"] == "error"
+    assert "exception" in event_data
+    assert event_data["exception"]["values"][0]["type"] == "ValueError"
+    assert event_data["exception"]["values"][0]["value"] == "Should not happen"