feat(discover): Allows insight metrics to be used with the avg function in the discover metrics dataset

src/sentry/search/events/datasets/metrics.py

@@ -65,7 +65,9 @@ def field_alias_converter(self) -> Mapping[str, Callable[[str], SelectType]]:
         }
 
     def resolve_metric(self, value: str) -> int:
-        metric_id = self.builder.resolve_metric_index(constants.METRICS_MAP.get(value, value))
+        # SPAN_METRICS_MAP and METRICS_MAP have some overlapping keys
+        mri_map = constants.SPAN_METRICS_MAP | constants.METRICS_MAP
+        metric_id = self.builder.resolve_metric_index(mri_map.get(value, value))
         if metric_id is None:
             # Maybe this is a custom measurment?
             for measurement in self.builder.custom_measurement_map:
@@ -112,7 +114,8 @@ def function_converter(self) -> Mapping[str, fields.MetricsFunction]:
                     required_args=[
                         fields.MetricArg(
                             "column",
-                            allowed_columns=constants.METRIC_DURATION_COLUMNS,
+                            allowed_columns=constants.SPAN_METRIC_DURATION_COLUMNS
+                            | constants.METRIC_DURATION_COLUMNS,
                         )
                     ],
                     calculated_args=[resolve_metric_id],

tests/sentry/snuba/test_entity_subscriptions.py

@@ -628,12 +628,12 @@ def test_get_entity_subscription_for_insights_queries(self) -> None:
                 ("count()", "span.op:http.client", False),
                 ("count()", "span.description:abc", False),
                 ("performance_score(measurements.score.lcp)", "", False),
+                ("avg(span.self_time)", "", False),
                 # TODO: The following functions are not supported in the discover metrics dataset yet.
                 # Uncomment these as we port them over.
                 # ("spm()", "", False),
                 # ("cache_miss_rate()", "", False),
                 # ("http_response_rate()", "", False),
-                # ("avg(span.self_time)", "", False),
             ]
             for aggregate, query, use_metrics_layer in cases:
                 entity_subscription = get_entity_subscription(

tests/snuba/api/endpoints/test_organization_events_mep.py

@@ -3458,6 +3458,48 @@ def test_filtering_by_org_id_is_not_compatible(self):
         )
         assert response.status_code == 400, response.content
 
+    def test_avg_span_self_time(self):
+        self.store_span_metric(
+            1,
+            timestamp=self.min_ago,
+        )
+
+        self.store_span_metric(
+            3,
+            timestamp=self.min_ago,
+        )
+
+        self.store_span_metric(
+            3,
+            timestamp=self.min_ago,
+        )
+
+        self.store_span_metric(
+            4,
+            timestamp=self.min_ago,
+        )
+
+        self.store_span_metric(
+            5,
+            timestamp=self.min_ago,
+        )
+
+        response = self.do_request(
+            {
+                "field": [
+                    "avg(span.self_time)",
+                ],
+                "query": "",
+                "project": self.project.id,
+                "dataset": "metrics",
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        assert len(data) == 1
+        assert data[0]["avg(span.self_time)"] == 3.2
+
 
 class OrganizationEventsMetricsEnhancedPerformanceEndpointTestWithOnDemandMetrics(
     MetricsEnhancedPerformanceTestCase
@@ -3946,3 +3988,7 @@ def test_timestamp_groupby(self):
     @pytest.mark.xfail(reason="Not implemented")
     def test_on_demand_with_mep(self):
         super().test_on_demand_with_mep()
+
+    @pytest.mark.xfail(reason="Not implemented")
+    def test_avg_span_self_time(self):
+        super().test_avg_span_self_time()