diff --git a/requirements-base.txt b/requirements-base.txt index 4941925478c800..2eeabb66880347 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -66,7 +66,7 @@ sentry-arroyo>=2.16.5 sentry-kafka-schemas>=0.1.68 sentry-ophio==0.2.7 sentry-redis-tools>=0.1.7 -sentry-relay>=0.8.56 +sentry-relay>=0.8.57 sentry-sdk==2.0.0rc3 snuba-sdk>=2.0.32 simplejson>=3.17.6 diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt index 30c9cd51a0ed2f..4a1e3f91029391 100644 --- a/requirements-dev-frozen.txt +++ b/requirements-dev-frozen.txt @@ -183,7 +183,7 @@ sentry-forked-djangorestframework-stubs==3.14.5.post1 sentry-kafka-schemas==0.1.68 sentry-ophio==0.2.7 sentry-redis-tools==0.1.7 -sentry-relay==0.8.56 +sentry-relay==0.8.57 sentry-sdk==2.0.0rc3 sentry-usage-accountant==0.0.10 simplejson==3.17.6 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 418dabca71c40f..06a8b2e5317036 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -123,7 +123,7 @@ sentry-arroyo==2.16.5 sentry-kafka-schemas==0.1.68 sentry-ophio==0.2.7 sentry-redis-tools==0.1.7 -sentry-relay==0.8.56 +sentry-relay==0.8.57 sentry-sdk==2.0.0rc3 sentry-usage-accountant==0.0.10 simplejson==3.17.6 diff --git a/src/sentry/relay/config/__init__.py b/src/sentry/relay/config/__init__.py index 52eac740564b78..c0231f2ae2c691 100644 --- a/src/sentry/relay/config/__init__.py +++ b/src/sentry/relay/config/__init__.py @@ -52,27 +52,30 @@ from .measurements import CUSTOM_MEASUREMENT_LIMIT -#: These features will be listed in the project config +#: These features will be listed in the project config. +# +# NOTE: These features must be sorted or the tests will fail! EXPOSABLE_FEATURES = [ - "projects:extract-transaction-from-segment-span", - "projects:profiling-ingest-unsampled-profiles", - "projects:span-metrics-extraction", - "projects:span-metrics-extraction-ga-modules", - "projects:span-metrics-extraction-all-modules", - "projects:span-metrics-extraction-resource", - "organizations:transaction-name-mark-scrubbed-as-sanitized", - "organizations:transaction-name-normalize", + "organizations:continuous-profiling", + "organizations:custom-metrics", + "organizations:device-class-synthesis", + "organizations:metric-meta", "organizations:profiling", - "organizations:session-replay", "organizations:session-replay-combined-envelope-items", - "organizations:user-feedback-ingest", "organizations:session-replay-recording-scrubbing", - "organizations:device-class-synthesis", - "organizations:custom-metrics", - "organizations:metric-meta", + "organizations:session-replay-video", + "organizations:session-replay", "organizations:standalone-span-ingestion", + "organizations:transaction-name-mark-scrubbed-as-sanitized", + "organizations:transaction-name-normalize", + "organizations:user-feedback-ingest", "projects:discard-transaction", - "organizations:continuous-profiling", + "projects:extract-transaction-from-segment-span", + "projects:profiling-ingest-unsampled-profiles", + "projects:span-metrics-extraction-all-modules", + "projects:span-metrics-extraction-ga-modules", + "projects:span-metrics-extraction-resource", + "projects:span-metrics-extraction", ] EXTRACT_METRICS_VERSION = 1 diff --git a/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py b/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py index d496fa854cf52c..8ae60425eb7f3a 100644 --- a/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py +++ b/tests/sentry/api/endpoints/test_relay_globalconfig_v3.py @@ -36,6 +36,7 @@ def test_global_config(): # Set options to Relay's non-default values to avoid Relay skipping deserialization config["options"]["relay.cardinality-limiter.error-sample-rate"] = 1.0 config["options"]["relay.metric-stats.rollout-rate"] = 0.5 + config["options"]["feedback.ingest-topic.rollout-rate"] = 0.5 config["options"]["profiling.profile_metrics.unsampled_profiles.enabled"] = True config["options"]["profiling.profile_metrics.unsampled_profiles.platforms"] = ["fake-platform"] config["options"]["profiling.profile_metrics.unsampled_profiles.sample_rate"] = 1.0 diff --git a/tests/sentry/relay/snapshots/test_config/test_get_project_config/full_config/REGION.pysnap b/tests/sentry/relay/snapshots/test_config/test_get_project_config/full_config/REGION.pysnap index dd54478c69ab92..3a36de8db94cc1 100644 --- a/tests/sentry/relay/snapshots/test_config/test_get_project_config/full_config/REGION.pysnap +++ b/tests/sentry/relay/snapshots/test_config/test_get_project_config/full_config/REGION.pysnap @@ -1,6 +1,4 @@ --- -created: '2024-04-15T14:23:08.500844+00:00' -creator: sentry source: tests/sentry/relay/test_config.py --- config: @@ -21,6 +19,7 @@ config: scrubDefaults: true sensitiveFields: [] features: + - organizations:session-replay-video - organizations:transaction-name-mark-scrubbed-as-sanitized - organizations:transaction-name-normalize filterSettings: diff --git a/tests/sentry/relay/snapshots/test_config/test_get_project_config/slim_config/REGION.pysnap b/tests/sentry/relay/snapshots/test_config/test_get_project_config/slim_config/REGION.pysnap index 77143764fb8036..bcb86eb926530d 100644 --- a/tests/sentry/relay/snapshots/test_config/test_get_project_config/slim_config/REGION.pysnap +++ b/tests/sentry/relay/snapshots/test_config/test_get_project_config/slim_config/REGION.pysnap @@ -1,6 +1,4 @@ --- -created: '2023-09-15T07:41:53.684068Z' -creator: sentry source: tests/sentry/relay/test_config.py --- config: @@ -12,6 +10,7 @@ config: scrubDefaults: true sensitiveFields: [] features: + - organizations:session-replay-video - organizations:transaction-name-mark-scrubbed-as-sanitized - organizations:transaction-name-normalize piiConfig: