Merge branch 'master' into ref/envelope-security-item

* master:
  ref(quotas): Remove support for legacy quotas (#616)
  feat(server): Implement an HTTP outcomes producer (#592)

Author: jan-auer

CHANGELOG.md

@@ -19,12 +19,14 @@ We have switched to [CalVer](https://calver.org/)! Relay's version is always in
 
 **Internal**:
 
+- Add support for Outcomes generation in non processing relays.([#592](https://github.com/getsentry/relay/pull/592))
 - Ignore non-Rust folders for faster rebuilding and testing. ([#578](https://github.com/getsentry/relay/pull/578))
 - Invalid session payloads are now logged for SDK debugging. ([#584](https://github.com/getsentry/relay/pull/584), [#591](https://github.com/getsentry/relay/pull/591))
 - Remove unused `rev` from project state. ([#586](https://github.com/getsentry/relay/pull/586))
 - Add an outcome endpoint for trusted Relays. ([#589](https://github.com/getsentry/relay/pull/589))
 - Emit outcomes for event payloads submitted in attachment files. ([#609](https://github.com/getsentry/relay/pull/609))
 - Split envelopes that contain sessions and other items and ingest them independently. ([#610](https://github.com/getsentry/relay/pull/610))
+- Removed support for legacy per-key quotas. ([#616](https://github.com/getsentry/relay/pull/615))
 
 ## 0.5.9
 

relay-config/src/config.rs

@@ -351,9 +351,6 @@ pub struct Relay {
     pub tls_identity_path: Option<PathBuf>,
     /// Password for the PKCS12 archive.
     pub tls_identity_password: Option<String>,
-    /// Controls whether outcomes will be emitted when processing is disabled.
-    /// Processing relays always emit outcomes (for backwards compatibility).
-    pub emit_outcomes: bool,
 }
 
 impl Default for Relay {
@@ -366,7 +363,6 @@ impl Default for Relay {
             tls_port: None,
             tls_identity_path: None,
             tls_identity_password: None,
-            emit_outcomes: false,
         }
     }
 }
@@ -710,6 +706,31 @@ impl Default for Processing {
     }
 }
 
+/// Outcome generation specific configuration values.
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(default)]
+pub struct Outcomes {
+    /// Controls whether outcomes will be emitted when processing is disabled.
+    /// Processing relays always emit outcomes (for backwards compatibility).
+    pub emit_outcomes: bool,
+    /// The maximum number of outcomes that are batched before being sent
+    /// via http to the upstream (only applies to non processing relays)
+    pub batch_size: usize,
+    /// The maximum time interval (in milliseconds) that an outcome may be batched
+    /// via http to the upstream (only applies to non processing relays)
+    pub batch_interval: u64,
+}
+
+impl Default for Outcomes {
+    fn default() -> Self {
+        Outcomes {
+            emit_outcomes: false,
+            batch_size: 1000,
+            batch_interval: 500,
+        }
+    }
+}
+
 /// Minimal version of a config for dumping out.
 #[derive(Serialize, Deserialize, Debug, Default)]
 pub struct MinimalConfig {
@@ -757,6 +778,8 @@ struct ConfigValues {
     sentry: Sentry,
     #[serde(default)]
     processing: Processing,
+    #[serde(default)]
+    outcomes: Outcomes,
 }
 
 impl ConfigObject for ConfigValues {
@@ -838,7 +861,7 @@ impl Config {
                 "true" | "1" => processing.enabled = true,
                 "false" | "0" | "" => processing.enabled = false,
                 _ => {
-                    return Err(ConfigError::new(ConfigErrorKind::InvalidValue).field("processing"))
+                    return Err(ConfigError::new(ConfigErrorKind::InvalidValue).field("processing"));
                 }
             }
         }
@@ -1044,7 +1067,17 @@ impl Config {
 
     /// Returns the emit_outcomes flag
     pub fn emit_outcomes(&self) -> bool {
-        self.values.relay.emit_outcomes
+        self.values.outcomes.emit_outcomes
+    }
+
+    /// Returns the maximum number of outcomes that are batched before being sent
+    pub fn outcome_batch_size(&self) -> usize {
+        self.values.outcomes.batch_size
+    }
+
+    /// Returns the maximum interval that an outcome may be batched
+    pub fn outcome_batch_interval(&self) -> Duration {
+        Duration::from_millis(self.values.outcomes.batch_interval)
     }
 
     /// Returns the log level.

relay-quotas/Cargo.toml

@@ -17,7 +17,6 @@ redis = [
     "relay-redis/impl",
     "sentry",
 ]
-legacy = []
 
 [dependencies]
 failure = { version = "0.1.5", optional = true }

relay-quotas/src/legacy.rs

@@ -12,9 +12,6 @@ mod rate_limit;
 pub use self::quota::*;
 pub use self::rate_limit::*;
 
-#[cfg(feature = "legacy")]
-pub mod legacy;
-
 #[cfg(feature = "redis")]
 mod redis;
 #[cfg(feature = "redis")]

relay-quotas/src/lib.rs

@@ -45,7 +45,7 @@ relay-common = { path = "../relay-common" }
 relay-config = { path = "../relay-config" }
 relay-filter = { path = "../relay-filter" }
 relay-general = { path = "../relay-general" }
-relay-quotas = { path = "../relay-quotas", features = ["legacy"] }
+relay-quotas = { path = "../relay-quotas" }
 relay-redis = { path = "../relay-redis" }
 rmp-serde = "0.14.3"
 sentry = "0.18.0"

relay-server/Cargo.toml

@@ -497,15 +497,7 @@ impl EventProcessor {
             None => return Ok(()),
         };
 
-        let public_key = envelope.meta().public_key();
-        let quotas = if !state.config.quotas.is_empty() {
-            state.config.quotas.as_slice()
-        } else if let Some(ref key_config) = state.get_public_key_config(public_key) {
-            key_config.legacy_quotas.as_slice()
-        } else {
-            &[]
-        };
-
+        let quotas = state.config.quotas.as_slice();
         if quotas.is_empty() {
             return Ok(());
         }