chore(contexts): Remove default-trace-ID option

Shipped this a week ago and have seen no problems. 👍

Author: thetruecpaul

CHANGELOG.md

@@ -19,6 +19,7 @@
 - Bump `sentry-conventions` to 0.6.0-4. ([#5944](https://github.com/getsentry/relay/pull/5944))
 - Enable compression for forwarded uploads. ([#5965](https://github.com/getsentry/relay/pull/5965))
 - Change the default partitioning for the envelope buffer from semantic to round-robin. ([#5967](https://github.com/getsentry/relay/pull/5967))
+- Remove option gating default-trace-ID behavior. ([#5979](https://github.com/getsentry/relay/pull/5979))
 
 ## 26.4.2
 

relay-cabi/src/processing.rs

@@ -274,7 +274,6 @@ pub unsafe extern "C" fn relay_store_normalizer_normalize_event(
         span_allowed_hosts: &[],              // only supported in relay
         span_op_defaults: Default::default(), // only supported in relay
         performance_issues_spans: Default::default(),
-        derive_trace_id: Default::default(),
     };
     normalize_event(&mut event, &normalization_config);
 

relay-conventions/sentry-conventions

@@ -95,9 +95,6 @@ pub enum Feature {
     /// Upload non-prosperodmp playstation attachments via the upload endpoint.
     #[serde(rename = "projects:relay-playstation-uploads")]
     PlaystationUploads,
-    /// Add a random trace ID to events that lack one.
-    #[serde(rename = "organizations:relay-default-trace-id")]
-    AddDefaultTraceID,
     /// Enable experimental expansion of the unreal report in the endpoint rather than in the
     /// processor. Only enable for organizations with sufficient attachment quota.
     #[serde(rename = "organizations:relay-unreal-endpoint-expansion")]

relay-crash/sentry-native

@@ -168,9 +168,6 @@ pub struct NormalizationConfig<'a> {
 
     /// Set a flag to enable performance issue detection on spans.
     pub performance_issues_spans: bool,
-
-    /// Should add a random trace ID to events that lack one.
-    pub derive_trace_id: bool,
 }
 
 impl Default for NormalizationConfig<'_> {
@@ -205,7 +202,6 @@ impl Default for NormalizationConfig<'_> {
             span_allowed_hosts: Default::default(),
             span_op_defaults: Default::default(),
             performance_issues_spans: Default::default(),
-            derive_trace_id: Default::default(),
         }
     }
 }
@@ -1360,10 +1356,8 @@ fn normalize_contexts(
     event_id: Uuid,
     config: &NormalizationConfig,
 ) {
-    if config.derive_trace_id {
-        // We will always need a TraceContext.
-        let _ = contexts.get_or_insert_with(Contexts::new);
-    }
+    // We will always need a TraceContext.
+    let _ = contexts.get_or_insert_with(Contexts::new);
 
     let _ = processor::apply(contexts, |contexts, _meta| {
         // Reprocessing context sent from SDKs must not be accepted, it is a Sentry-internal
@@ -1374,7 +1368,7 @@ fn normalize_contexts(
         // We need a TraceId to ingest the event into EAP.
         // If the event lacks a TraceContext, add a random one.
 
-        if config.derive_trace_id && !contexts.contains::<TraceContext>() {
+        if !contexts.contains::<TraceContext>() {
             contexts.add(TraceContext::random(event_id))
         }
 
@@ -4958,7 +4952,6 @@ mod tests {
             &mut Meta::default(),
             &NormalizationConfig {
                 performance_score: Some(&performance_score),
-                derive_trace_id: true,
                 ..Default::default()
             },
         );

relay-dynamic-config/src/feature.rs

@@ -301,7 +301,6 @@ pub fn normalize(
             performance_issues_spans: ctx
                 .project_info
                 .has_feature(Feature::PerformanceIssuesSpans),
-            derive_trace_id: project_info.has_feature(Feature::AddDefaultTraceID),
         };
 
         metric!(timer(RelayTimers::EventProcessingNormalization), {