feat(global-filters): Introduce global generic filters

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Parametrize transaction in dynamic sampling context. ([#3141](https://github.com/getsentry/relay/pull/3141))
 - Adds ReplayVideo envelope-item type. ([#3105](https://github.com/getsentry/relay/pull/3105))
 - Parse & scrub span description for supabase. ([#3153](https://github.com/getsentry/relay/pull/3153), [#3156](https://github.com/getsentry/relay/pull/3156))
+- Introduce generic filters in global configs. ([#3161](https://github.com/getsentry/relay/pull/3161))
 
 **Bug Fixes**:
 

Cargo.toml

@@ -25,6 +25,7 @@ futures = { version = "0.3", default-features = false, features = ["std"] }
 insta = { version = "1.31.0", features = ["json", "redactions", "ron"] }
 hash32 = "0.3.1"
 hashbrown = "0.14.3"
+indexmap = "2.0.0"
 itertools = "0.10.5"
 once_cell = "1.13.1"
 parking_lot = "0.12.1"

relay-dynamic-config/Cargo.toml

@@ -23,7 +23,7 @@ relay-event-normalization = { path = "../relay-event-normalization" }
 relay-filter = { path = "../relay-filter" }
 relay-log = { path = "../relay-log" }
 relay-pii = { path = "../relay-pii" }
-relay-protocol  = { path = "../relay-protocol" }
+relay-protocol = { path = "../relay-protocol" }
 relay-quotas = { path = "../relay-quotas" }
 relay-sampling = { path = "../relay-sampling" }
 serde = { workspace = true }
@@ -33,3 +33,4 @@ smallvec = { workspace = true }
 [dev-dependencies]
 insta = { workspace = true }
 similar-asserts = { workspace = true }
+indexmap = { workspace = true }

relay-dynamic-config/src/global.rs

@@ -5,10 +5,13 @@ use std::path::Path;
 
 use relay_base_schema::metrics::MetricNamespace;
 use relay_event_normalization::MeasurementsConfig;
+use relay_filter::GenericFiltersConfig;
 use relay_quotas::Quota;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+use crate::ErrorBoundary;
+
 /// A dynamic configuration for all Relays passed down from Sentry.
 ///
 /// Values shared across all projects may also be included here, to keep
@@ -23,6 +26,12 @@ pub struct GlobalConfig {
     /// Quotas that apply to all projects.
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub quotas: Vec<Quota>,
+    /// Configuration for global inbound filters.
+    ///
+    /// These filters are merged with generic filters in project configs before
+    /// applying.
+    #[serde(skip_serializing_if = "skip_generic_filters")]
+    pub filters: ErrorBoundary<GenericFiltersConfig>,
     /// Sentry options passed down to Relay.
     #[serde(
         deserialize_with = "default_on_error",
@@ -46,6 +55,21 @@ impl GlobalConfig {
             Ok(None)
         }
     }
+
+    /// Returns the generic inbound filters.
+    pub fn filters(&self) -> Option<&GenericFiltersConfig> {
+        match &self.filters {
+            ErrorBoundary::Err(_) => None,
+            ErrorBoundary::Ok(f) => Some(f),
+        }
+    }
+}
+
+fn skip_generic_filters(filters_config: &ErrorBoundary<GenericFiltersConfig>) -> bool {
+    match filters_config {
+        ErrorBoundary::Err(_) => true,
+        ErrorBoundary::Ok(config) => config.version == 0 && config.filters.is_empty(),
+    }
 }
 
 /// All options passed down from Sentry to Relay.
@@ -246,6 +270,20 @@ mod tests {
       "namespace": null
     }
   ],
+  "filters": {
+    "version": 1,
+    "filters": [
+      {
+        "id": "myError",
+        "isEnabled": true,
+        "condition": {
+          "op": "eq",
+          "name": "event.exceptions",
+          "value": "myError"
+        }
+      }
+    ]
+  },
   "options": {
     "profiling.profile_metrics.unsampled_profiles.enabled": true
   }

relay-dynamic-config/src/project.rs

@@ -3,7 +3,7 @@ use relay_event_normalization::{
     BreakdownsConfig, MeasurementsConfig, PerformanceScoreConfig, SpanDescriptionRule,
     TransactionNameRule,
 };
-use relay_filter::FiltersConfig;
+use relay_filter::ProjectFiltersConfig;
 use relay_pii::{DataScrubbingConfig, PiiConfig};
 use relay_quotas::Quota;
 use relay_sampling::SamplingConfig;
@@ -32,8 +32,8 @@ pub struct ProjectConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub grouping_config: Option<Value>,
     /// Configuration for filter rules.
-    #[serde(skip_serializing_if = "FiltersConfig::is_empty")]
-    pub filter_settings: FiltersConfig,
+    #[serde(skip_serializing_if = "ProjectFiltersConfig::is_empty")]
+    pub filter_settings: ProjectFiltersConfig,
     /// Configuration for data scrubbers.
     #[serde(skip_serializing_if = "DataScrubbingConfig::is_disabled")]
     pub datascrubbing_settings: DataScrubbingConfig,
@@ -109,7 +109,7 @@ impl Default for ProjectConfig {
             trusted_relays: vec![],
             pii_config: None,
             grouping_config: None,
-            filter_settings: FiltersConfig::default(),
+            filter_settings: ProjectFiltersConfig::default(),
             datascrubbing_settings: DataScrubbingConfig::default(),
             event_retention: None,
             quotas: Vec::new(),
@@ -154,8 +154,8 @@ pub struct LimitedProjectConfig {
     pub allowed_domains: Vec<String>,
     pub trusted_relays: Vec<PublicKey>,
     pub pii_config: Option<PiiConfig>,
-    #[serde(skip_serializing_if = "FiltersConfig::is_empty")]
-    pub filter_settings: FiltersConfig,
+    #[serde(skip_serializing_if = "ProjectFiltersConfig::is_empty")]
+    pub filter_settings: ProjectFiltersConfig,
     #[serde(skip_serializing_if = "DataScrubbingConfig::is_disabled")]
     pub datascrubbing_settings: DataScrubbingConfig,
     #[serde(skip_serializing_if = "Option::is_none")]

relay-filter/Cargo.toml

@@ -12,6 +12,7 @@ publish = false
 [dependencies]
 ipnetwork = "0.20.0"
 once_cell = { workspace = true }
+indexmap = { workspace = true }
 regex = { workspace = true }
 relay-common = { path = "../relay-common" }
 relay-event-schema = { path = "../relay-event-schema" }