From 8e24a2eb778e164a2979f2de8ae972d164d386cc Mon Sep 17 00:00:00 2001
From: Simon Hellmayr <simon.hellmayr@sentry.io>
Date: Tue, 28 Oct 2025 13:06:54 +0100
Subject: [PATCH 1/2] feat(dynamic-sampling): add feature flag for dynamic
 sampling on span first

---
 src/sentry/features/temporary.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index ecc99252e0fd9b..dc65d74a461e13 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -633,6 +633,13 @@ def register_temporary_features(manager: FeatureManager) -> None:
 
     manager.add("projects:project-detail-apple-app-hang-rate", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # fmt: on
+    # Enables generation of dynamic sampling rules based on span data for span first
+    manager.add(
+        "projects:dynamic-sampling-on-span-first",
+        ProjectFeature,
+        FeatureHandlerStrategy.FLAGPOLE,
+        api_expose=False,
+    )
 
     # Partner oauth
     manager.add(

From f785cb3d7e5cd7749bd4018d60a1d2733f8582b1 Mon Sep 17 00:00:00 2001
From: Simon Hellmayr <simon.hellmayr@sentry.io>
Date: Tue, 28 Oct 2025 13:25:42 +0100
Subject: [PATCH 2/2] org feat

---
 src/sentry/features/temporary.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index dc65d74a461e13..8d71236451c809 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -136,6 +136,13 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:dynamic-sampling-custom", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable dynamic sampling minimum sample rate
     manager.add("organizations:dynamic-sampling-minimum-sample-rate", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enables generation of dynamic sampling rules based on span data for span first
+    manager.add(
+        "organizations:dynamic-sampling-on-span-first",
+        OrganizationFeature,
+        FeatureHandlerStrategy.FLAGPOLE,
+        api_expose=False,
+    )
     # Enable logging project config for debugging
     manager.add("organizations:log-project-config", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable archive/escalating issue workflow features in v2
@@ -633,13 +640,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
 
     manager.add("projects:project-detail-apple-app-hang-rate", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # fmt: on
-    # Enables generation of dynamic sampling rules based on span data for span first
-    manager.add(
-        "projects:dynamic-sampling-on-span-first",
-        ProjectFeature,
-        FeatureHandlerStrategy.FLAGPOLE,
-        api_expose=False,
-    )
 
     # Partner oauth
     manager.add(