test(relay): Use normalize_project_config (#70230)

Bump relay library version and use `normalize_project_config` instead of
`validate_project_config` for more flexibility.

Author: jjbayer

requirements-base.txt

@@ -66,7 +66,7 @@ sentry-arroyo>=2.16.5
 sentry-kafka-schemas>=0.1.79
 sentry-ophio==0.2.7
 sentry-redis-tools>=0.1.7
-sentry-relay>=0.8.58
+sentry-relay>=0.8.60
 sentry-sdk==2.0.0
 snuba-sdk>=2.0.32
 simplejson>=3.17.6

requirements-dev-frozen.txt

@@ -183,7 +183,7 @@ sentry-forked-djangorestframework-stubs==3.14.5.post1
 sentry-kafka-schemas==0.1.79
 sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
-sentry-relay==0.8.58
+sentry-relay==0.8.60
 sentry-sdk==2.0.0
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6

requirements-frozen.txt

@@ -123,7 +123,7 @@ sentry-arroyo==2.16.5
 sentry-kafka-schemas==0.1.79
 sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
-sentry-relay==0.8.58
+sentry-relay==0.8.60
 sentry-sdk==2.0.0
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6

src/sentry/testutils/pytest/fixtures.py

@@ -262,7 +262,6 @@ def dyn_sampling_data():
     # return a function that returns fresh config so we don't accidentally get tests interfering with each other
     def inner(active=True):
         return {
-            "mode": "total",
             "rules": [
                 {
                     "sampleRate": 0.7,

tests/sentry/api/endpoints/test_relay_globalconfig_v3.py

@@ -5,6 +5,7 @@
 from sentry_relay.processing import normalize_global_config
 
 from sentry.relay.globalconfig import get_global_config
+from sentry.testutils.helpers.options import override_options
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.utils import json
 
@@ -31,24 +32,39 @@ def inner(version, global_):
 
 
 @pytest.mark.django_db
+@override_options(
+    {
+        # Set options to Relay's non-default values to avoid Relay skipping deserialization
+        "relay.cardinality-limiter.error-sample-rate": 1.0,
+        "relay.metric-stats.rollout-rate": 0.5,
+        "feedback.ingest-topic.rollout-rate": 0.5,
+        "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",
+        "profiling.generic_metrics.functions_ingestion.enabled": True,
+        "feedback.ingest-inline-attachments": True,
+        "relay.disable_normalization.processing": True,
+        "relay.force_full_normalization": True,
+        "relay.metric-bucket-distribution-encodings": {
+            "custom": "array",
+            "metric_stats": "array",
+            "profiles": "array",
+            "spans": "array",
+            "transactions": "array",
+        },
+        "relay.metric-bucket-set-encodings": {
+            "custom": "base64",
+            "metric_stats": "base64",
+            "profiles": "base64",
+            "spans": "base64",
+            "transactions": "base64",
+        },
+    }
+)
 def test_global_config():
     config = get_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
-
-    config["options"]["relay.span-usage-metric"] = True
-    config["options"]["relay.cardinality-limiter.mode"] = "passive"
-
-    config["options"]["profiling.generic_metrics.functions_ingestion.enabled"] = True
-
-    # Default coming from options `{}` is removed because empty in librelay
-    del config["options"]["relay.metric-bucket-distribution-encodings"]
-    del config["options"]["relay.metric-bucket-set-encodings"]
 
     normalized = normalize_global_config(config)
     assert normalized == config

tests/sentry/dynamic_sampling/test_generate_rules.py

@@ -3,7 +3,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from sentry_relay.processing import validate_project_config
+from sentry_relay.processing import normalize_project_config
 
 from sentry.constants import HEALTH_CHECK_GLOBS
 from sentry.discover.models import TeamKeyTransaction
@@ -25,7 +25,6 @@
 from sentry.testutils.helpers import Feature
 from sentry.testutils.helpers.datetime import freeze_time
 from sentry.testutils.pytest.fixtures import django_db_all
-from sentry.utils import json
 
 
 @pytest.fixture
@@ -78,10 +77,9 @@ def _validate_rules(project):
         "sampling": {
             "version": 2,
             "rules": rules,
-            "mode": "total",
         },
     }
-    validate_project_config(json.dumps(project_config), strict=True)
+    assert normalize_project_config(project_config) == project_config
 
 
 @patch("sentry.dynamic_sampling.rules.base.sentry_sdk")

tests/sentry/relay/test_config.py

@@ -5,7 +5,7 @@
 from unittest.mock import ANY, patch
 
 import pytest
-from sentry_relay.processing import validate_project_config
+from sentry_relay.processing import normalize_project_config
 
 from sentry.constants import HEALTH_CHECK_GLOBS, ObjectStatus
 from sentry.discover.models import TeamKeyTransaction
@@ -29,7 +29,6 @@
 from sentry.testutils.helpers.options import override_options
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.testutils.silo import region_silo_test
-from sentry.utils import json
 from sentry.utils.safe import get_path
 
 PII_CONFIG = """
@@ -95,7 +94,7 @@ def _validate_project_config(config):
     if features := config.get("features"):
         config["features"] = sorted(features)
 
-    validate_project_config(json.dumps(config), strict=True)
+    assert normalize_project_config(config) == config
 
 
 @django_db_all
@@ -707,7 +706,7 @@ def test_alert_metric_extraction_rules_empty(default_project):
 
     with Feature(features):
         config = get_project_config(default_project).to_dict()["config"]
-        validate_project_config(json.dumps(config), strict=False)
+        _validate_project_config(config)
         assert "metricExtraction" not in config
 
 
@@ -737,7 +736,7 @@ def test_alert_metric_extraction_rules(default_project, factories):
 
     with Feature(features):
         config = get_project_config(default_project).to_dict()["config"]
-        validate_project_config(json.dumps(config), strict=False)
+
         assert config["metricExtraction"] == {
             "version": 3,
             "metrics": [
@@ -751,6 +750,13 @@ def test_alert_metric_extraction_rules(default_project, factories):
             ],
         }
 
+        normalized = normalize_project_config(config)
+        del normalized["metricExtraction"]["conditionalTagsExtended"]
+        del normalized["metricExtraction"]["spanMetricsExtended"]
+        del config["metricExtraction"]["metrics"][0]["field"]
+
+        assert normalized["metricExtraction"] == config["metricExtraction"]
+
 
 @django_db_all
 def test_performance_calculate_score(default_project):
@@ -760,7 +766,7 @@ def test_performance_calculate_score(default_project):
     for profile in config["performanceScore"]["profiles"]:
         profile["version"] = "1"
 
-    validate_project_config(json.dumps(config), strict=True)
+    assert normalize_project_config(config) == config
     performance_score = config["performanceScore"]["profiles"]
     assert performance_score[0] == {
         "name": "Chrome",