Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions src/sentry/options/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
2 changes: 0 additions & 2 deletions src/sentry/relay/globalconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions tests/sentry/api/endpoints/test_relay_globalconfig_v3.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading