feat(tracemetrics): Bypass metric field validation for equations

Author: narsaynorath

src/sentry/explore/endpoints/serializers.py

@@ -4,6 +4,7 @@
 from rest_framework.serializers import ListField
 
 from sentry.constants import ALL_ACCESS_PROJECTS
+from sentry.discover.arithmetic import is_equation
 from sentry.explore.models import ExploreSavedQueryDataset
 from sentry.utils.dates import parse_stats_period, validate_interval
 
@@ -222,9 +223,16 @@ def validate(self, data):
                     raise serializers.ValidationError(
                         "Metric field is only allowed for metrics dataset"
                     )
-                if data["dataset"] == "metrics" and "metric" not in q:
+
+                # the metrics field is only required for non-equation queries
+                has_equations = any(
+                    is_equation(y_axis)
+                    for aggregate_field in q.get("aggregateField", [])
+                    for y_axis in aggregate_field.get("yAxes", [])
+                )
+                if data["dataset"] == "metrics" and not has_equations and "metric" not in q:
                     raise serializers.ValidationError(
-                        "Metric field is required for metrics dataset"
+                        "Metric field is required for non-equation queries on the metrics dataset"
                     )
                 inner_query = {}
                 for key in inner_query_keys:

tests/sentry/explore/endpoints/test_explore_saved_queries.py

@@ -1391,3 +1391,25 @@ def test_post_with_empty_query_is_rejected(self) -> None:
                 },
             )
         assert response.status_code == 400
+
+    def test_post_with_equation_is_accepted(self) -> None:
+        with self.feature(self.features):
+            response = self.client.post(
+                self.url,
+                {
+                    "name": "Equation query",
+                    "projects": self.project_ids,
+                    "dataset": "metrics",
+                    "query": [
+                        {
+                            "aggregateField": [{"yAxes": ["equation|A + B"], "chartType": 1}],
+                            "mode": "samples",
+                            "fields": ["A", "B"],
+                            "orderby": "-timestamp",
+                        },
+                    ],
+                },
+            )
+        assert response.status_code == 201, response.content
+        data = response.data
+        assert data["query"][0].get("metric") is None