Merge branch 'master' into feat/span-rollout-sample-rate

* master:
  test(spanv2): Slightly increase timeout to reduce flakes (#5100)
  fix(genai): Use correct pii maybe, not false (#5099)
  ref(metric-stats): Purges metric stats from the codebase (#5097)
  ref(ourlogs): Removes support for the envelope otel log item type (#5082)

Author: jan-auer

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 **Breaking Changes**:
 
+- Removes support for the deprecated and early alpha only otel log item type. ([#5082](https://github.com/getsentry/relay/pull/5082))
 - Only check for local project configs in static mode. ([#5057](https://github.com/getsentry/relay/pull/5057))
 
 **Features**:
@@ -17,6 +18,7 @@
 - Improved PII Scrubbing for attributes / logs ([#5061](https://github.com/getsentry/relay/pull/5061)))
 - Introduces a project scope sampling rule type. ([#5077](https://github.com/getsentry/relay/pull/5077)))
 - Produce transactions on `transactions` Kafka topic, even if they have attachments. ([#5081](https://github.com/getsentry/relay/pull/5081))
+- Removes metric stats from the codebase. ([#5097](https://github.com/getsentry/relay/pull/5097))
 - Add option gating Snuba publishing to ingest-replay-events for Replays. ([#5088](https://github.com/getsentry/relay/pull/5088))
 
 ## 25.8.0

Cargo.lock

@@ -114,10 +114,6 @@ pub enum MetricNamespace {
     Spans,
     /// User-defined metrics directly sent by SDKs and applications.
     Custom,
-    /// Metric stats.
-    ///
-    /// Metrics about metrics.
-    Stats,
     /// An unknown and unsupported metric.
     ///
     /// Metrics that Relay either doesn't know or recognize the namespace of will be dropped before
@@ -132,30 +128,23 @@ pub enum MetricNamespace {
 
 impl MetricNamespace {
     /// Returns all namespaces/variants of this enum.
-    pub fn all() -> [Self; 6] {
+    pub fn all() -> [Self; 5] {
         [
             Self::Sessions,
             Self::Transactions,
             Self::Spans,
             Self::Custom,
-            Self::Stats,
             Self::Unsupported,
         ]
     }
 
-    /// Returns `true` if metric stats are enabled for this namespace.
-    pub fn has_metric_stats(&self) -> bool {
-        matches!(self, Self::Custom)
-    }
-
     /// Returns the string representation for this metric type.
     pub fn as_str(&self) -> &'static str {
         match self {
             Self::Sessions => "sessions",
             Self::Transactions => "transactions",
             Self::Spans => "spans",
             Self::Custom => "custom",
-            Self::Stats => "metric_stats",
             Self::Unsupported => "unsupported",
         }
     }
@@ -170,7 +159,6 @@ impl std::str::FromStr for MetricNamespace {
             "transactions" => Ok(Self::Transactions),
             "spans" => Ok(Self::Spans),
             "custom" => Ok(Self::Custom),
-            "metric_stats" => Ok(Self::Stats),
             _ => Ok(Self::Unsupported),
         }
     }

relay-base-schema/src/metrics/mri.rs

@@ -178,8 +178,6 @@ pub enum AppFeature {
     MetricsSessions,
     /// Metrics in the custom namespace.
     MetricsCustom,
-    /// Metrics in the `metric_stats` namespace.
-    MetricsStats,
     /// Metrics in the unsupported namespace.
     ///
     /// This is usually not emitted, since metrics in the unsupported
@@ -206,7 +204,6 @@ impl AppFeature {
             Self::MetricsSpans => "metrics_spans",
             Self::MetricsSessions => "metrics_sessions",
             Self::MetricsCustom => "metrics_custom",
-            Self::MetricsStats => "metrics_metric_stats",
             Self::MetricsUnsupported => "metrics_unsupported",
             Self::Profiles => "profiles",
         }

relay-cogs/src/lib.rs

@@ -575,23 +575,6 @@ impl Default for Metrics {
     }
 }
 
-/// Controls processing of Sentry metrics and metric metadata.
-#[derive(Serialize, Deserialize, Debug, Default)]
-#[serde(default)]
-pub struct SentryMetrics {
-    /// Whether metric stats are collected and emitted.
-    ///
-    /// Metric stats are always collected and emitted when processing
-    /// is enabled.
-    ///
-    /// This option is required for running multiple trusted Relays in a chain
-    /// and you want the metric stats to be collected and forwarded from
-    /// the first Relay in the chain.
-    ///
-    /// Defaults to `false`.
-    pub metric_stats_enabled: bool,
-}
-
 /// Controls various limits
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(default)]
@@ -1622,8 +1605,6 @@ struct ConfigValues {
     #[serde(default)]
     metrics: Metrics,
     #[serde(default)]
-    sentry_metrics: SentryMetrics,
-    #[serde(default)]
     sentry: relay_log::SentryConfig,
     #[serde(default)]
     processing: Processing,
@@ -2375,14 +2356,6 @@ impl Config {
         self.values.limits.max_metric_buckets_size.as_bytes()
     }
 
-    /// Whether metric stats are collected and emitted.
-    ///
-    /// Metric stats are always collected and emitted when processing
-    /// is enabled.
-    pub fn metric_stats_enabled(&self) -> bool {
-        self.values.sentry_metrics.metric_stats_enabled || self.values.processing.enabled
-    }
-
     /// Returns the maximum payload size for general API requests.
     pub fn max_api_payload_size(&self) -> usize {
         self.values.limits.max_api_payload_size.as_bytes()

relay-config/src/config.rs

@@ -147,17 +147,6 @@ pub struct Options {
     )]
     pub metric_bucket_dist_encodings: BucketEncodings,
 
-    /// Rollout rate for metric stats.
-    ///
-    /// Rate needs to be between `0.0` and `1.0`.
-    /// If set to `1.0` all organizations will have metric stats enabled.
-    #[serde(
-        rename = "relay.metric-stats.rollout-rate",
-        deserialize_with = "default_on_error",
-        skip_serializing_if = "is_default"
-    )]
-    pub metric_stats_rollout_rate: f32,
-
     /// Overall sampling of span extraction.
     ///
     /// This number represents the fraction of transactions for which
@@ -220,7 +209,6 @@ pub struct BucketEncodings {
     spans: BucketEncoding,
     profiles: BucketEncoding,
     custom: BucketEncoding,
-    metric_stats: BucketEncoding,
 }
 
 impl BucketEncodings {
@@ -230,7 +218,6 @@ impl BucketEncodings {
             MetricNamespace::Transactions => self.transactions,
             MetricNamespace::Spans => self.spans,
             MetricNamespace::Custom => self.custom,
-            MetricNamespace::Stats => self.metric_stats,
             // Always force the legacy encoding for sessions,
             // sessions are not part of the generic metrics platform with different
             // consumer which are not (yet) updated to support the new data.
@@ -266,7 +253,6 @@ where
                 spans: encoding,
                 profiles: encoding,
                 custom: encoding,
-                metric_stats: encoding,
             })
         }
 
@@ -470,7 +456,6 @@ mod tests {
                 spans: BucketEncoding::Legacy,
                 profiles: BucketEncoding::Legacy,
                 custom: BucketEncoding::Legacy,
-                metric_stats: BucketEncoding::Legacy,
             }
         );
         assert_eq!(
@@ -480,7 +465,6 @@ mod tests {
                 spans: BucketEncoding::Zstd,
                 profiles: BucketEncoding::Zstd,
                 custom: BucketEncoding::Zstd,
-                metric_stats: BucketEncoding::Zstd,
             }
         );
     }
@@ -492,7 +476,6 @@ mod tests {
             spans: BucketEncoding::Zstd,
             profiles: BucketEncoding::Base64,
             custom: BucketEncoding::Zstd,
-            metric_stats: BucketEncoding::Base64,
         };
         let s = serde_json::to_string(&original).unwrap();
         let s = format!(

relay-dynamic-config/src/global.rs

@@ -625,7 +625,7 @@ pub struct SpanData {
     pub gen_ai_tool_name: Annotated<Value>,
 
     /// The name of the operation being performed.
-    #[metastructure(field = "gen_ai.operation.name", pii = "false")]
+    #[metastructure(field = "gen_ai.operation.name", pii = "maybe")]
     pub gen_ai_operation_name: Annotated<String>,
 
     /// The client's browser name.

relay-event-schema/src/protocol/span.rs

@@ -41,7 +41,6 @@ fn to_app_feature(ns: MetricNamespace) -> AppFeature {
         MetricNamespace::Transactions => AppFeature::MetricsTransactions,
         MetricNamespace::Spans => AppFeature::MetricsSpans,
         MetricNamespace::Custom => AppFeature::MetricsCustom,
-        MetricNamespace::Stats => AppFeature::MetricsStats,
         MetricNamespace::Unsupported => AppFeature::MetricsUnsupported,
     }
 }

relay-metrics/src/cogs.rs

@@ -23,8 +23,6 @@ pub struct ByNamespace<T> {
     pub spans: T,
     /// Value for the [`MetricNamespace::Custom`] namespace.
     pub custom: T,
-    /// Value for the [`MetricNamespace::Stats`] namespace.
-    pub stats: T,
     /// Value for the [`MetricNamespace::Unsupported`] namespace.
     pub unsupported: T,
 }
@@ -37,7 +35,6 @@ impl<T> ByNamespace<T> {
             MetricNamespace::Transactions => &self.transactions,
             MetricNamespace::Spans => &self.spans,
             MetricNamespace::Custom => &self.custom,
-            MetricNamespace::Stats => &self.stats,
             MetricNamespace::Unsupported => &self.unsupported,
         }
     }
@@ -49,23 +46,21 @@ impl<T> ByNamespace<T> {
             MetricNamespace::Transactions => &mut self.transactions,
             MetricNamespace::Spans => &mut self.spans,
             MetricNamespace::Custom => &mut self.custom,
-            MetricNamespace::Stats => &mut self.stats,
             MetricNamespace::Unsupported => &mut self.unsupported,
         }
     }
 }
 
 impl<T> IntoIterator for ByNamespace<T> {
     type Item = (MetricNamespace, T);
-    type IntoIter = std::array::IntoIter<(MetricNamespace, T), 6>;
+    type IntoIter = std::array::IntoIter<(MetricNamespace, T), 5>;
 
     fn into_iter(self) -> Self::IntoIter {
         let Self {
             sessions,
             transactions,
             spans,
             custom,
-            stats,
             unsupported,
         } = self;
 
@@ -74,7 +69,6 @@ impl<T> IntoIterator for ByNamespace<T> {
             (MetricNamespace::Transactions, transactions),
             (MetricNamespace::Spans, spans),
             (MetricNamespace::Custom, custom),
-            (MetricNamespace::Stats, stats),
             (MetricNamespace::Unsupported, unsupported),
         ]
         .into_iter()
@@ -118,15 +112,13 @@ macro_rules! impl_op {
                     transactions,
                     spans,
                     custom,
-                    stats,
                     unsupported,
                 } = self;
 
                 $op::$opfn(sessions, rhs.sessions);
                 $op::$opfn(transactions, rhs.transactions);
                 $op::$opfn(spans, rhs.spans);
                 $op::$opfn(custom, rhs.custom);
-                $op::$opfn(stats, rhs.stats);
                 $op::$opfn(unsupported, rhs.unsupported);
             }
         }

relay-metrics/src/utils.rs

@@ -16,11 +16,6 @@ workspace = true
 chrono = { workspace = true }
 hex = { workspace = true }
 once_cell = { workspace = true }
-opentelemetry-proto = { workspace = true, features = [
-  "gen-tonic",
-  "with-serde",
-  "logs",
-] }
 relay-event-schema = { workspace = true }
 relay-protocol = { workspace = true }
 relay-common = { workspace = true }