Merge branch 'master' into ref/startup

* master:
  build: Upgrade sentry SDK to 0.30.0 (#1883)
  chore(metrics): Remove satisfaction thresholds (#1881)
  feat(profiling): Add javascript platform (#1876)
  fix(replays): Enforce rate limits (#1877)

Author: jan-auer

CHANGELOG.md

@@ -7,6 +7,11 @@
 - Protocol validation for source map image type. ([#1869](https://github.com/getsentry/relay/pull/1869))
 - Strip quotes from client hint values. ([#1874](https://github.com/getsentry/relay/pull/1874))
 - Add PHP support for profiling. ([#1871](https://github.com/getsentry/relay/pull/1871))
+- Add Javascript support for profiling. ([#1876](https://github.com/getsentry/relay/pull/1876))
+
+**Bug Fixes**:
+
+- Enforce rate limits for session replays. ([#1877](https://github.com/getsentry/relay/pull/1877))
 
 **Internal**:
 

Cargo.lock

@@ -17,7 +17,7 @@ once_cell = "1.13.1"
 parking_lot = "0.12.1"
 regex = "1.5.5"
 schemars = { version = "0.8.1", features = ["uuid1", "chrono"], optional = true }
-sentry-types = "0.20.0"
+sentry-types = "0.30.0"
 serde = { version = "1.0.114", features = ["derive"] }
 thiserror = "1.0.38"
 uuid = { version = "1.3.0", features = ["serde", "v4", "v5"] }

relay-common/Cargo.toml

@@ -1,6 +1,6 @@
 //! Dynamic configuration for metrics extraction from sessions and transactions.
 
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeSet;
 
 use relay_sampling::RuleCondition;
 use serde::{Deserialize, Serialize};
@@ -64,39 +64,6 @@ impl SessionMetricsConfig {
     }
 }
 
-/// The metric to which the user satisfaction threshold is applied.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum SatisfactionMetric {
-    /// Apply to transaction duration.
-    Duration,
-    /// Apply to LCP.
-    Lcp,
-    /// Catch-all variant for forward compatibility.
-    #[serde(other)]
-    Unknown,
-}
-
-/// Configuration for a single threshold.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SatisfactionThreshold {
-    /// What metric to apply the threshold to.
-    pub metric: SatisfactionMetric,
-    /// Value of the threshold.
-    pub threshold: f64,
-}
-
-/// Configuration for applying the user satisfaction threshold.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SatisfactionConfig {
-    /// The project-wide threshold to apply.
-    pub project_threshold: SatisfactionThreshold,
-    /// Transaction-specific overrides of the project-wide threshold.
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub transaction_thresholds: BTreeMap<String, SatisfactionThreshold>,
-}
-
 /// Configuration for extracting custom measurements from transaction payloads.
 #[derive(Default, Debug, Clone, Serialize, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
@@ -139,8 +106,6 @@ pub struct TransactionMetricsConfig {
     pub extract_metrics: BTreeSet<String>,
     /// Custom event tags that are transferred from the transaction to metrics.
     pub extract_custom_tags: BTreeSet<String>,
-    /// Config for determining user satisfaction (satisfied / tolerated / frustrated)
-    pub satisfaction_thresholds: Option<SatisfactionConfig>,
     /// Deprecated in favor of top-level config field. Still here to be forwarded to external relays.
     pub custom_measurements: CustomMeasurementConfig,
     /// Defines whether URL transactions should be considered low cardinality.

relay-dynamic-config/src/metrics.rs

@@ -16,8 +16,8 @@ console = { version = "0.15.5", optional = true }
 env_logger = { version = "0.10.0", optional = true }
 log = { version = "0.4.11", features = ["serde"] }
 relay-crash = { path = "../relay-crash", optional = true }
-sentry = { version = "0.29.3", features = ["debug-images", "log"], optional = true }
-sentry-core = { version = "0.29.3" }
+sentry = { version = "0.30.0", features = ["debug-images", "log"], optional = true }
+sentry-core = { version = "0.30.0" }
 serde = { version = "1.0.114", features = ["derive"], optional = true }
 serde_json = { version = "1.0.55", optional = true }
 

relay-log/Cargo.toml

@@ -119,6 +119,7 @@ pub use crate::outcomes::discard_reason;
 enum Platform {
     Android,
     Cocoa,
+    Javascript,
     Node,
     Php,
     Python,

relay-profiling/src/lib.rs

@@ -175,7 +175,9 @@ impl SampleProfile {
                     && self.device.manufacturer.is_some()
                     && self.device.model.is_some()
             }
-            Platform::Python | Platform::Node | Platform::Php => self.runtime.is_some(),
+            Platform::Python | Platform::Javascript | Platform::Node | Platform::Php => {
+                self.runtime.is_some()
+            }
             _ => true,
         }
     }

relay-profiling/src/sample.rs

@@ -85,7 +85,11 @@ pub struct PartialDsn {
 impl PartialDsn {
     /// Ensures a valid public key and project ID in the DSN.
     fn from_dsn(dsn: Dsn) -> Result<Self, ParseDsnError> {
-        let project_id = dsn.project_id().value();
+        let project_id = dsn
+            .project_id()
+            .value()
+            .parse()
+            .map_err(|_| ParseDsnError::NoProjectId)?;
 
         let public_key = dsn
             .public_key()
@@ -98,7 +102,7 @@ impl PartialDsn {
             host: dsn.host().to_owned(),
             port: dsn.port(),
             path: dsn.path().to_owned(),
-            project_id: Some(ProjectId::new(project_id)),
+            project_id: Some(project_id),
         })
     }