ref(spans): Enable span extraction unconditionally (#5308)

Author: Dav1dde

CHANGELOG.md

@@ -26,6 +26,7 @@
 - Switch default allocator from jemalloc to mimalloc. ([#5239](https://github.com/getsentry/relay/pull/5239))
 - Add internal attributes to aid searching trace metrics. ([#5260](https://github.com/getsentry/relay/pull/5260))
 - Remove sentry.timestamp_nanos for log items. ([#5295](https://github.com/getsentry/relay/pull/5295))
+- Unconditionally enable span extraction. ([#5308](https://github.com/getsentry/relay/pull/5308))
 
 ## 25.10.0
 

relay-dynamic-config/src/defaults.rs

@@ -12,8 +12,6 @@ pub fn add_span_metrics(project_config: &mut ProjectConfig) {
         .metric_extraction
         .get_or_insert_with(MetricExtractionConfig::empty);
 
-    let features = &project_config.features;
-
     if !config.is_supported() || config._span_metrics_extended {
         return;
     }
@@ -28,10 +26,6 @@ pub fn add_span_metrics(project_config: &mut ProjectConfig) {
         tags: vec![],
     });
 
-    if !features.produces_spans() {
-        return;
-    }
-
     config
         .global_groups
         .entry(GroupKey::SpanMetricsCommon)

relay-dynamic-config/src/feature.rs

@@ -8,6 +8,7 @@ pub const GRADUATED_FEATURE_FLAGS: &[Feature] = &[
     Feature::UserReportV2Ingest,
     Feature::IngestUnsampledProfiles,
     Feature::ScrubMongoDbDescriptions,
+    Feature::DeprecatedExtractSpansFromEvent,
 ];
 
 /// Features exposed by project config.
@@ -90,11 +91,6 @@ pub enum Feature {
     /// Serialized as `organizations:continuous-profiling-beta-ingest`.
     #[serde(rename = "organizations:continuous-profiling-beta-ingest")]
     ContinuousProfilingBetaIngest,
-    /// When enabled, spans will be extracted from a transaction.
-    ///
-    /// Serialized as `organizations:indexed-spans-extraction`.
-    #[serde(rename = "organizations:indexed-spans-extraction")]
-    ExtractSpansFromEvent,
     /// Enable log ingestion for our log product (this is not internal logging).
     ///
     /// Serialized as `organizations:ourlogs-ingestion`.
@@ -134,6 +130,10 @@ pub enum Feature {
     #[doc(hidden)]
     #[serde(rename = "projects:span-metrics-extraction-addons")]
     DeprecatedExtractAddonsSpanMetricsFromEvent,
+    /// This feature has graduated and is hard-coded for external Relays.
+    #[doc(hidden)]
+    #[serde(rename = "organizations:indexed-spans-extraction")]
+    DeprecatedExtractSpansFromEvent,
     /// Forward compatibility.
     #[doc(hidden)]
     #[serde(other)]
@@ -154,11 +154,6 @@ impl FeatureSet {
     pub fn has(&self, feature: Feature) -> bool {
         self.0.contains(&feature)
     }
-
-    /// Returns `true` if any spans are produced for this project.
-    pub fn produces_spans(&self) -> bool {
-        self.has(Feature::ExtractSpansFromEvent) || self.has(Feature::StandaloneSpanIngestion)
-    }
 }
 
 impl FromIterator<Feature> for FeatureSet {

relay-server/src/metrics_extraction/event.rs

@@ -1289,11 +1289,4 @@ mod tests {
             "c:spans/count_per_root_project@none"
         );
     }
-
-    #[test]
-    fn only_indexed_spans_enabled() {
-        let metrics = extract_span_metrics([Feature::ExtractSpansFromEvent]).project_metrics;
-        assert_eq!(metrics.len(), 75);
-        assert!(metrics.iter().all(|b| &b.name == "c:spans/usage@none"));
-    }
 }

relay-server/src/services/processor.rs

@@ -1578,7 +1578,7 @@ impl EnvelopeProcessorService {
                 },
                 device_class_synthesis_config: project_info
                     .has_feature(Feature::DeviceClassSynthesis),
-                enrich_spans: project_info.has_feature(Feature::ExtractSpansFromEvent),
+                enrich_spans: true,
                 max_tag_value_length: self
                     .inner
                     .config
@@ -1922,17 +1922,15 @@ impl EnvelopeProcessorService {
                 spans_extracted,
             )?;
 
-            if ctx.project_info.has_feature(Feature::ExtractSpansFromEvent) {
-                spans_extracted = span::extract_from_event(
-                    managed_envelope,
-                    &event,
-                    ctx.global_config,
-                    ctx.config,
-                    server_sample_rate,
-                    event_metrics_extracted,
-                    spans_extracted,
-                );
-            }
+            spans_extracted = span::extract_from_event(
+                managed_envelope,
+                &event,
+                ctx.global_config,
+                ctx.config,
+                server_sample_rate,
+                event_metrics_extracted,
+                spans_extracted,
+            );
         });
 
         event = self

relay-server/src/services/processor/span/processing.rs

@@ -173,16 +173,14 @@ pub async fn process(
 
             extracted_metrics.extend_project_metrics(metrics, Some(sampling_decision));
 
-            if ctx.project_info.config.features.produces_spans() {
-                let bucket = event::create_span_root_counter(
-                    span,
-                    transaction_from_dsc.clone(),
-                    1,
-                    sampling_decision,
-                    project_id,
-                );
-                extracted_metrics.extend_sampling_metrics(bucket, Some(sampling_decision));
-            }
+            let bucket = event::create_span_root_counter(
+                span,
+                transaction_from_dsc.clone(),
+                1,
+                sampling_decision,
+                project_id,
+            );
+            extracted_metrics.extend_sampling_metrics(bucket, Some(sampling_decision));
 
             item.set_metrics_extracted(true);
         }

relay-server/src/services/projects/cache/project.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use relay_config::Config;
-use relay_dynamic_config::Feature;
 use relay_quotas::{CachedRateLimits, DataCategory, MetricNamespaceScoping, RateLimits};
 use relay_sampling::evaluation::ReservoirCounters;
 
@@ -87,17 +86,11 @@ impl<'a> Project<'a> {
             .compute(envelope.envelope_mut(), &scoping)
             .await?;
 
-        let check_nested_spans = state
-            .as_ref()
-            .is_some_and(|s| s.has_feature(Feature::ExtractSpansFromEvent));
-
         // If we can extract spans from the event, we want to try and count the number of nested
         // spans to correctly emit negative outcomes in case the transaction itself is dropped.
-        if check_nested_spans {
-            relay_statsd::metric!(timer(RelayTimers::CheckNestedSpans), {
-                sync_spans_to_enforcement(&envelope, &mut enforcement);
-            });
-        }
+        relay_statsd::metric!(timer(RelayTimers::CheckNestedSpans), {
+            sync_spans_to_enforcement(&envelope, &mut enforcement);
+        });
 
         enforcement.apply_with_outcomes(&mut envelope);
 
@@ -226,9 +219,6 @@ mod tests {
         let project = create_project(
             &config,
             Some(json!({
-                "features": [
-                    "organizations:indexed-spans-extraction"
-                ],
                 "quotas": [{
                    "id": "foo",
                    "categories": ["transaction"],

tests/integration/fixtures/processing.py

@@ -305,19 +305,25 @@ def assert_rate_limited(
         timeout=1,
         ignore_other=False,
     ):
+        expected_categories = (
+            {category_value(category) for category in categories}
+            if categories
+            else set()
+        )
         if categories is None:
             outcome = self.get_outcome(timeout=timeout)
             assert isinstance(outcome["category"], int)
             outcomes = [outcome]
         else:
             outcomes = self.get_outcomes(timeout=timeout)
-            expected = {category_value(category) for category in categories}
             actual = {outcome["category"] for outcome in outcomes}
             if ignore_other:
                 actual = actual & set(categories)
-            assert actual == expected, (actual, expected)
+            assert actual == expected_categories, (actual, expected_categories)
 
         for outcome in outcomes:
+            if ignore_other and outcome["category"] not in expected_categories:
+                continue
             assert outcome["outcome"] == 2, outcome
             assert outcome["reason"] == reason, outcome["reason"]
             if key_id is not None:

tests/integration/test_attachments.py

@@ -504,7 +504,6 @@ def test_event_with_attachment(
     relay_with_processing,
     attachments_consumer,
     transactions_consumer,
-    outcomes_consumer,
 ):
     project_id = 42
     event_id = "515539018c9b4260a6f999572f1661ee"
@@ -513,7 +512,6 @@ def test_event_with_attachment(
     relay = relay_with_processing()
     attachments_consumer = attachments_consumer()
     transactions_consumer = transactions_consumer()
-    outcomes_consumer = outcomes_consumer()
 
     # event attachments are always sent as chunks, and added to events
     envelope = Envelope(headers=[["event_id", event_id]])

tests/integration/test_filters.py

@@ -629,4 +629,8 @@ def test_filters_are_applied_to_profiles(
         profile, _ = profiles_consumer.get_profile()
         profile = json.loads(profile["payload"])
         assert profile["release"] == "[email protected]"
-        outcomes_consumer.assert_empty()
+        assert [
+            outcome
+            for outcome in outcomes_consumer.get_outcomes()
+            if outcome["category"] == data_category
+        ] == []