From 73d80f3ad57b68eb8bbeeb31920b429f55fc5d32 Mon Sep 17 00:00:00 2001
From: David Herberth <david.herberth@sentry.io>
Date: Mon, 13 Apr 2026 09:56:55 +0200
Subject: [PATCH] ref(cardinality): Remove cardinality limiter options

---
 src/sentry/options/defaults.py                | 37 -------------------
 src/sentry/relay/globalconfig.py              |  2 -
 .../endpoints/test_relay_globalconfig_v3.py   |  2 -
 3 files changed, 41 deletions(-)

diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index be4bdfc2c5b0..e2b8c22e2482 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -1491,43 +1491,6 @@
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-# Killswitch for the Relay cardinality limiter, one of `enabled`, `disabled`, `passive`.
-# In `passive` mode Relay's cardinality limiter is active but it does not enforce the limits.
-register(
-    "relay.cardinality-limiter.mode",
-    default="disabled",
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-# Override to set a list of limits into passive mode by organization.
-#
-# In passive mode Relay's cardinality limiter is active but it does not enforce the limits.
-#
-# Example: `{'1': ["transactions"]}`
-# Forces the `transactions` cardinality limit into passive mode for the organization with id `1` (Sentry).
-register(
-    "relay.cardinality-limiter.passive-limits-by-org",
-    default={},
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-# Sample rate for Cardinality Limiter Sentry errors.
-#
-# Rate needs to be between `0.0` and `1.0`.
-# If set to `1.0` all cardinality limiter rejections will be logged as a Sentry error.
-register(
-    "relay.cardinality-limiter.error-sample-rate",
-    default=0.00,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-# List of additional cardinality limits and selectors.
-#
-# ```
-# {
-#   "rollout_rate": 0.001,
-#   "limit": { .. Cardinality Limit .. }
-# }
-# ```
-register("relay.cardinality-limiter.limits", default=[], flags=FLAG_AUTOMATOR_MODIFIABLE)
-
 # Controls the encoding used in Relay for encoding distributions and sets
 # when writing to Kafka.
 #
diff --git a/src/sentry/relay/globalconfig.py b/src/sentry/relay/globalconfig.py
index ab201e09e284..01c3b3e3de8e 100644
--- a/src/sentry/relay/globalconfig.py
+++ b/src/sentry/relay/globalconfig.py
@@ -16,8 +16,6 @@
     "profiling.profile_metrics.unsampled_profiles.sample_rate",
     "profiling.profile_metrics.unsampled_profiles.enabled",
     "relay.span-usage-metric",
-    "relay.cardinality-limiter.mode",
-    "relay.cardinality-limiter.error-sample-rate",
     "relay.eap-outcomes.rollout-rate",
     "relay.eap-span-outcomes.rollout-rate",
     "relay.metric-bucket-set-encodings",
diff --git a/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py b/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
index 7245e4dee7c5..1d8630fb9374 100644
--- a/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
+++ b/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
@@ -35,12 +35,10 @@ def inner(version, global_):
 @override_options(
     {
         # Set options to Relay's non-default values to avoid Relay skipping deserialization
-        "relay.cardinality-limiter.error-sample-rate": 1.0,
         "profiling.profile_metrics.unsampled_profiles.enabled": True,
         "profiling.profile_metrics.unsampled_profiles.platforms": ["fake-platform"],
         "profiling.profile_metrics.unsampled_profiles.sample_rate": 1.0,
         "relay.span-usage-metric": True,
-        "relay.cardinality-limiter.mode": "passive",
         "relay.sessions-eap.rollout-rate": 1.0,
         "relay.objectstore-attachments.sample-rate": 1.0,
         "relay.kafka.span-v2.sample-rate": 1.0,