Skip to content

Commit de1e19f

Browse files
authored
ref(cardinality): Remove cardinality limiter options (#112772)
1 parent 3f1e93a commit de1e19f

File tree

3 files changed

+0
-41
lines changed

3 files changed

+0
-41
lines changed

src/sentry/options/defaults.py

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,43 +1491,6 @@
14911491
flags=FLAG_AUTOMATOR_MODIFIABLE,
14921492
)
14931493

1494-
# Killswitch for the Relay cardinality limiter, one of `enabled`, `disabled`, `passive`.
1495-
# In `passive` mode Relay's cardinality limiter is active but it does not enforce the limits.
1496-
register(
1497-
"relay.cardinality-limiter.mode",
1498-
default="disabled",
1499-
flags=FLAG_AUTOMATOR_MODIFIABLE,
1500-
)
1501-
# Override to set a list of limits into passive mode by organization.
1502-
#
1503-
# In passive mode Relay's cardinality limiter is active but it does not enforce the limits.
1504-
#
1505-
# Example: `{'1': ["transactions"]}`
1506-
# Forces the `transactions` cardinality limit into passive mode for the organization with id `1` (Sentry).
1507-
register(
1508-
"relay.cardinality-limiter.passive-limits-by-org",
1509-
default={},
1510-
flags=FLAG_AUTOMATOR_MODIFIABLE,
1511-
)
1512-
# Sample rate for Cardinality Limiter Sentry errors.
1513-
#
1514-
# Rate needs to be between `0.0` and `1.0`.
1515-
# If set to `1.0` all cardinality limiter rejections will be logged as a Sentry error.
1516-
register(
1517-
"relay.cardinality-limiter.error-sample-rate",
1518-
default=0.00,
1519-
flags=FLAG_AUTOMATOR_MODIFIABLE,
1520-
)
1521-
# List of additional cardinality limits and selectors.
1522-
#
1523-
# ```
1524-
# {
1525-
# "rollout_rate": 0.001,
1526-
# "limit": { .. Cardinality Limit .. }
1527-
# }
1528-
# ```
1529-
register("relay.cardinality-limiter.limits", default=[], flags=FLAG_AUTOMATOR_MODIFIABLE)
1530-
15311494
# Controls the encoding used in Relay for encoding distributions and sets
15321495
# when writing to Kafka.
15331496
#

src/sentry/relay/globalconfig.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
"profiling.profile_metrics.unsampled_profiles.sample_rate",
1717
"profiling.profile_metrics.unsampled_profiles.enabled",
1818
"relay.span-usage-metric",
19-
"relay.cardinality-limiter.mode",
20-
"relay.cardinality-limiter.error-sample-rate",
2119
"relay.eap-outcomes.rollout-rate",
2220
"relay.eap-span-outcomes.rollout-rate",
2321
"relay.metric-bucket-set-encodings",

tests/sentry/api/endpoints/test_relay_globalconfig_v3.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ def inner(version, global_):
3535
@override_options(
3636
{
3737
# Set options to Relay's non-default values to avoid Relay skipping deserialization
38-
"relay.cardinality-limiter.error-sample-rate": 1.0,
3938
"profiling.profile_metrics.unsampled_profiles.enabled": True,
4039
"profiling.profile_metrics.unsampled_profiles.platforms": ["fake-platform"],
4140
"profiling.profile_metrics.unsampled_profiles.sample_rate": 1.0,
4241
"relay.span-usage-metric": True,
43-
"relay.cardinality-limiter.mode": "passive",
4442
"relay.sessions-eap.rollout-rate": 1.0,
4543
"relay.objectstore-attachments.sample-rate": 1.0,
4644
"relay.kafka.span-v2.sample-rate": 1.0,

0 commit comments

Comments
 (0)