fix conflicts

getsentry · Jan 16, 2025 · df4489e · df4489e
1 parent 3cb1823
commit df4489e
Showing 1 changed file with 36 additions and 9 deletions.
diff --git a/tests/web/rpc/v1/test_endpoint_trace_item_table/test_endpoint_trace_item_table.py b/tests/web/rpc/v1/test_endpoint_trace_item_table/test_endpoint_trace_item_table.py
@@ -1096,9 +1096,18 @@ def test_aggregation_filter_basic(self, setup_teardown: Any) -> None:
         spans_storage = get_storage(StorageKey("eap_spans"))
         msg_timestamp = BASE_TIME - timedelta(minutes=1)
         messages = (
-            [gen_message(msg_timestamp, tags={"kylestag": "val1"}) for i in range(3)]
-            + [gen_message(msg_timestamp, tags={"kylestag": "val2"}) for i in range(12)]
-            + [gen_message(msg_timestamp, tags={"kylestag": "val3"}) for i in range(30)]
+            [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val1"})
+                for i in range(3)
+            ]
+            + [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val2"})
+                for i in range(12)
+            ]
+            + [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val3"})
+                for i in range(30)
+            ]
         )
         write_raw_unprocessed_events(spans_storage, messages)  # type: ignore
 
@@ -1188,9 +1197,18 @@ def test_aggregation_filter_and_or(self, setup_teardown: Any) -> None:
         spans_storage = get_storage(StorageKey("eap_spans"))
         msg_timestamp = BASE_TIME - timedelta(minutes=1)
         messages = (
-            [gen_message(msg_timestamp, tags={"kylestag": "val1"}) for i in range(3)]
-            + [gen_message(msg_timestamp, tags={"kylestag": "val2"}) for i in range(12)]
-            + [gen_message(msg_timestamp, tags={"kylestag": "val3"}) for i in range(30)]
+            [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val1"})
+                for i in range(3)
+            ]
+            + [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val2"})
+                for i in range(12)
+            ]
+            + [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val3"})
+                for i in range(30)
+            ]
         )
         write_raw_unprocessed_events(spans_storage, messages)  # type: ignore
 
@@ -1353,9 +1371,18 @@ def test_bad_aggregation_filter(self, setup_teardown: Any) -> None:
         spans_storage = get_storage(StorageKey("eap_spans"))
         msg_timestamp = BASE_TIME - timedelta(minutes=1)
         messages = (
-            [gen_message(msg_timestamp, tags={"kylestag": "val1"}) for i in range(3)]
-            + [gen_message(msg_timestamp, tags={"kylestag": "val2"}) for i in range(12)]
-            + [gen_message(msg_timestamp, tags={"kylestag": "val3"}) for i in range(30)]
+            [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val1"})
+                for i in range(3)
+            ]
+            + [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val2"})
+                for i in range(12)
+            ]
+            + [
+                gen_span_message(msg_timestamp, tags={"kylestag": "val3"})
+                for i in range(30)
+            ]
         )
         write_raw_unprocessed_events(spans_storage, messages)  # type: ignore