chore(eap): Require operator for if combinators (#97006)

- Now that the frontend change is merged we're no longer using if
combinators without an operator. Require that argument so that we don't
get more usage

---------

Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com>

Author: wmak

src/sentry/search/eap/spans/aggregates.py

@@ -179,7 +179,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -202,7 +201,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -225,7 +223,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -248,7 +245,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -271,7 +267,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -294,7 +289,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -317,7 +311,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -340,7 +333,6 @@ def resolve_bounded_sample(args: ResolvedArguments) -> tuple[AttributeKey, Trace
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),

src/sentry/search/eap/spans/formulas.py

@@ -1069,7 +1069,6 @@ def user_misery(args: ResolvedArguments, settings: ResolverSettings) -> Column.B
         arguments=[
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),
@@ -1162,7 +1161,6 @@ def user_misery(args: ResolvedArguments, settings: ResolverSettings) -> Column.B
             ),
             AttributeArgumentDefinition(attribute_types={"string", "boolean"}),
             ValueArgumentDefinition(
-                default_arg="equals",
                 argument_types={"string"},
                 validator=literal_validator(["equals", "notEquals"]),
             ),

tests/snuba/api/endpoints/test_organization_events_span_indexed.py

@@ -1996,7 +1996,7 @@ def test_p75_if(self) -> None:
 
         response = self.do_request(
             {
-                "field": ["p75_if(span.duration, is_transaction, true)"],
+                "field": ["p75_if(span.duration, is_transaction, equals, true)"],
                 "query": "",
                 "project": self.project.id,
                 "dataset": "spans",
@@ -2009,12 +2009,15 @@ def test_p75_if(self) -> None:
         assert len(data) == 1
         assert data == [
             {
-                "p75_if(span.duration, is_transaction, true)": 3000,
+                "p75_if(span.duration, is_transaction, equals, true)": 3000,
             },
         ]
+
         assert meta["dataset"] == "spans"
-        assert meta["units"] == {"p75_if(span.duration, is_transaction, true)": "millisecond"}
-        assert meta["fields"] == {"p75_if(span.duration, is_transaction, true)": "duration"}
+        assert meta["units"] == {
+            "p75_if(span.duration, is_transaction, equals, true)": "millisecond"
+        }
+        assert meta["fields"] == {"p75_if(span.duration, is_transaction, equals, true)": "duration"}
 
     def test_is_transaction(self) -> None:
         self.store_spans(
@@ -2666,7 +2669,7 @@ def test_failure_rate_if(self) -> None:
 
         response = self.do_request(
             {
-                "field": ["failure_rate_if(is_transaction, true)"],
+                "field": ["failure_rate_if(is_transaction, equals, true)"],
                 "project": self.project.id,
                 "dataset": "spans",
             }
@@ -2676,13 +2679,13 @@ def test_failure_rate_if(self) -> None:
         data = response.data["data"]
         meta = response.data["meta"]
         assert len(data) == 1
-        assert data[0]["failure_rate_if(is_transaction, true)"] == 0.25
+        assert data[0]["failure_rate_if(is_transaction, equals, true)"] == 0.25
         assert meta["dataset"] == "spans"
         assert meta["fields"] == {
-            "failure_rate_if(is_transaction, true)": "percentage",
+            "failure_rate_if(is_transaction, equals, true)": "percentage",
         }
         assert meta["units"] == {
-            "failure_rate_if(is_transaction, true)": None,
+            "failure_rate_if(is_transaction, equals, true)": None,
         }
 
     def test_count_op(self) -> None:
@@ -2750,8 +2753,8 @@ def test_avg_if(self) -> None:
         response = self.do_request(
             {
                 "field": [
-                    "avg_if(span.duration, span.op, queue.process)",
-                    "avg_if(span.duration, span.op, queue.publish)",
+                    "avg_if(span.duration, span.op, equals, queue.process)",
+                    "avg_if(span.duration, span.op, equals, queue.publish)",
                 ],
                 "project": self.project.id,
                 "dataset": "spans",
@@ -2762,8 +2765,8 @@ def test_avg_if(self) -> None:
         data = response.data["data"]
         meta = response.data["meta"]
         assert len(data) == 1
-        assert data[0]["avg_if(span.duration, span.op, queue.process)"] == 1500.0
-        assert data[0]["avg_if(span.duration, span.op, queue.publish)"] == 3000.0
+        assert data[0]["avg_if(span.duration, span.op, equals, queue.process)"] == 1500.0
+        assert data[0]["avg_if(span.duration, span.op, equals, queue.publish)"] == 3000.0
         assert meta["dataset"] == "spans"
 
     def test_avg_compare(self) -> None:
@@ -2818,7 +2821,7 @@ def test_avg_if_invalid_param(self) -> None:
         response = self.do_request(
             {
                 "field": [
-                    "avg_if(span.duration, span.duration, queue.process)",
+                    "avg_if(span.duration, span.duration, equals, queue.process)",
                 ],
                 "project": self.project.id,
                 "dataset": "spans",
@@ -3107,8 +3110,8 @@ def test_division_if(self) -> None:
         response = self.do_request(
             {
                 "field": [
-                    "division_if(mobile.slow_frames,mobile.total_frames,browser.name,Chrome)",
-                    "division_if(mobile.slow_frames,mobile.total_frames,browser.name,Firefox)",
+                    "division_if(mobile.slow_frames,mobile.total_frames,browser.name,equals,Chrome)",
+                    "division_if(mobile.slow_frames,mobile.total_frames,browser.name,equals,Firefox)",
                 ],
                 "project": self.project.id,
                 "dataset": "spans",
@@ -3120,17 +3123,21 @@ def test_division_if(self) -> None:
         meta = response.data["meta"]
         assert len(data) == 1
         assert (
-            data[0]["division_if(mobile.slow_frames,mobile.total_frames,browser.name,Chrome)"]
+            data[0][
+                "division_if(mobile.slow_frames,mobile.total_frames,browser.name,equals,Chrome)"
+            ]
             == 10 / 100
         )
         assert (
-            data[0]["division_if(mobile.slow_frames,mobile.total_frames,browser.name,Firefox)"]
+            data[0][
+                "division_if(mobile.slow_frames,mobile.total_frames,browser.name,equals,Firefox)"
+            ]
             == 50 / 100
         )
         assert meta["dataset"] == "spans"
         assert meta["fields"] == {
-            "division_if(mobile.slow_frames,mobile.total_frames,browser.name,Chrome)": "percentage",
-            "division_if(mobile.slow_frames,mobile.total_frames,browser.name,Firefox)": "percentage",
+            "division_if(mobile.slow_frames,mobile.total_frames,browser.name,equals,Chrome)": "percentage",
+            "division_if(mobile.slow_frames,mobile.total_frames,browser.name,equals,Firefox)": "percentage",
         }
 
     def test_total_performance_score(self) -> None:
@@ -4504,7 +4511,8 @@ def test_typed_attributes_with_colons(self) -> None:
             },
         ]
 
-    def test_count_if_two_args(self) -> None:
+    def test_count_if_two_args(self):
+        """count_if should have an operator"""
         self.store_spans(
             [
                 self.create_span({"sentry_tags": {"release": "foo"}}),
@@ -4525,13 +4533,7 @@ def test_count_if_two_args(self) -> None:
                 "dataset": "spans",
             }
         )
-        assert response.status_code == 200, response.content
-        data = response.data["data"]
-        meta = response.data["meta"]
-
-        assert len(data) == 1
-        assert data[0]["count_if(release,foo)"] == 1
-        assert meta["dataset"] == "spans"
+        assert response.status_code == 400, response.content
 
     def test_span_ops_breakdown(self) -> None:
         self.store_spans(