Browse Source

ref(starfish): Rename span.domain_array to span.domain (#57028)

- This changes the span.domain field to match the span.domain_array
- Leaves span.domain_array around until the frontend updates
William Mak 1 year ago
parent
commit
d829c1f48a

+ 2 - 1
src/sentry/search/events/constants.py

@@ -43,7 +43,8 @@ HTTP_STATUS_CODE_ALIAS = "http.status_code"
 DEVICE_CLASS_ALIAS = "device.class"
 TOTAL_SPAN_DURATION_ALIAS = "total.span_duration"
 SPAN_MODULE_ALIAS = "span.module"
-SPAN_DOMAIN_ALIAS = "span.domain_array"
+SPAN_DOMAIN_ALIAS = "span.domain"
+SPAN_DOMAIN_ARRAY_ALIAS = "span.domain_array"
 SPAN_DOMAIN_SEPARATOR = ","
 UNIQUE_SPAN_DOMAIN_ALIAS = "unique.span_domains"
 

+ 1 - 0
src/sentry/search/events/datasets/spans_metrics.py

@@ -28,6 +28,7 @@ class SpansMetricsDatasetConfig(DatasetConfig):
     ) -> Mapping[str, Callable[[SearchFilter], Optional[WhereType]]]:
         return {
             constants.SPAN_DOMAIN_ALIAS: self._span_domain_filter_converter,
+            constants.SPAN_DOMAIN_ARRAY_ALIAS: self._span_domain_filter_converter,
         }
 
     @property

+ 19 - 19
tests/snuba/api/endpoints/test_organization_events_span_metrics.py

@@ -626,7 +626,7 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         )
         response = self.do_request(
             {
-                "field": ["span.domain_array", "p75(span.self_time)"],
+                "field": ["span.domain", "p75(span.self_time)"],
                 "query": "",
                 "project": self.project.id,
                 "orderby": ["-p75(span.self_time)"],
@@ -637,10 +637,10 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         data = response.data["data"]
         meta = response.data["meta"]
         assert len(data) == 2
-        assert data[0]["span.domain_array"] == ["sentry_table1"]
-        assert data[1]["span.domain_array"] == ["sentry_table1", "sentry_table2"]
+        assert data[0]["span.domain"] == ["sentry_table1"]
+        assert data[1]["span.domain"] == ["sentry_table1", "sentry_table2"]
         assert meta["dataset"] == "spansMetrics"
-        assert meta["fields"]["span.domain_array"] == "array"
+        assert meta["fields"]["span.domain"] == "array"
 
     def test_span_domain_array_filter(self):
         self.store_span_metric(
@@ -657,8 +657,8 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         )
         response = self.do_request(
             {
-                "field": ["span.domain_array", "p75(span.self_time)"],
-                "query": "span.domain_array:sentry_table2",
+                "field": ["span.domain", "p75(span.self_time)"],
+                "query": "span.domain:sentry_table2",
                 "project": self.project.id,
                 "dataset": "spansMetrics",
             }
@@ -667,9 +667,9 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         data = response.data["data"]
         meta = response.data["meta"]
         assert len(data) == 1
-        assert data[0]["span.domain_array"] == ["sentry_table1", "sentry_table2"]
+        assert data[0]["span.domain"] == ["sentry_table1", "sentry_table2"]
         assert meta["dataset"] == "spansMetrics"
-        assert meta["fields"]["span.domain_array"] == "array"
+        assert meta["fields"]["span.domain"] == "array"
 
     def test_span_domain_array_filter_wildcard(self):
         self.store_span_metric(
@@ -687,8 +687,8 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         for query in ["sentry*2", "*table2", "sentry_table2*"]:
             response = self.do_request(
                 {
-                    "field": ["span.domain_array", "p75(span.self_time)"],
-                    "query": f"span.domain_array:{query}",
+                    "field": ["span.domain", "p75(span.self_time)"],
+                    "query": f"span.domain:{query}",
                     "project": self.project.id,
                     "dataset": "spansMetrics",
                 }
@@ -697,9 +697,9 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
             data = response.data["data"]
             meta = response.data["meta"]
             assert len(data) == 1, query
-            assert data[0]["span.domain_array"] == ["sentry_table1", "sentry_table2"], query
+            assert data[0]["span.domain"] == ["sentry_table1", "sentry_table2"], query
             assert meta["dataset"] == "spansMetrics", query
-            assert meta["fields"]["span.domain_array"] == "array"
+            assert meta["fields"]["span.domain"] == "array"
 
     def test_span_domain_array_has_filter(self):
         self.store_span_metric(
@@ -716,8 +716,8 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         )
         response = self.do_request(
             {
-                "field": ["span.domain_array", "p75(span.self_time)"],
-                "query": "has:span.domain_array",
+                "field": ["span.domain", "p75(span.self_time)"],
+                "query": "has:span.domain",
                 "project": self.project.id,
                 "dataset": "spansMetrics",
             }
@@ -726,12 +726,12 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         data = response.data["data"]
         meta = response.data["meta"]
         assert len(data) == 1
-        assert data[0]["span.domain_array"] == ["sentry_table1", "sentry_table2"]
+        assert data[0]["span.domain"] == ["sentry_table1", "sentry_table2"]
         assert meta["dataset"] == "spansMetrics"
         response = self.do_request(
             {
-                "field": ["span.domain_array", "p75(span.self_time)"],
-                "query": "!has:span.domain_array",
+                "field": ["span.domain", "p75(span.self_time)"],
+                "query": "!has:span.domain",
                 "project": self.project.id,
                 "dataset": "spansMetrics",
             }
@@ -741,7 +741,7 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         meta = response.data["meta"]
         assert len(data) == 1
         assert meta["dataset"] == "spansMetrics"
-        assert meta["fields"]["span.domain_array"] == "array"
+        assert meta["fields"]["span.domain"] == "array"
 
     def test_unique_values_span_domain(self):
         self.store_span_metric(
@@ -790,7 +790,7 @@ class OrganizationEventsMetricsEnhancedPerformanceEndpointTest(MetricsEnhancedPe
         response = self.do_request(
             {
                 "field": ["unique.span_domains", "count()"],
-                "query": "span.domain_array:sentry_tab*",
+                "query": "span.domain:sentry_tab*",
                 "orderby": "unique.span_domains",
                 "project": self.project.id,
                 "dataset": "spansMetrics",