No need for epm tag spec + typing change

getsentry · Sep 25, 2023 · ba4b7a6 · ba4b7a6
1 parent 7b195f4
commit ba4b7a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/sentry/snuba/metrics/extraction.py b/src/sentry/snuba/metrics/extraction.py
@@ -624,16 +624,12 @@ def apdex_tag_spec(project: Project, argument: Optional[str]) -> List[TagSpec]:
     ]
 
 
-def epm_tag_spec(_1: Project, _2: Optional[str]) -> List[TagSpec]:
-    return []
-
-
 # This is used to map a metric to a function which generates a specification
-_DERIVED_METRICS: Dict[MetricOperationType, TagsSpecsGenerator] = {
+_DERIVED_METRICS: Dict[MetricOperationType, TagsSpecsGenerator | None] = {
     "on_demand_failure_count": failure_tag_spec,
     "on_demand_failure_rate": failure_tag_spec,
     "on_demand_apdex": apdex_tag_spec,
-    "on_demand_epm": epm_tag_spec,
+    "on_demand_epm": None,
 }
 
 

diff --git a/src/sentry/snuba/metrics/fields/snql.py b/src/sentry/snuba/metrics/fields/snql.py
@@ -609,7 +609,12 @@ def histogram_snql_factory(
     )
 
 
-def rate_snql_factory(aggregate_filter, numerator, denominator=1.0, alias=None):
+def rate_snql_factory(
+    aggregate_filter: Function,
+    numerator: float,
+    denominator: float = 1.0,
+    alias: Optional[str] = None,
+):
     return Function(
         "divide",
         [

diff --git a/tests/sentry/snuba/test_extraction.py b/tests/sentry/snuba/test_extraction.py
@@ -8,7 +8,6 @@
     OnDemandMetricSpec,
     apdex_tag_spec,
     cleanup_query,
-    epm_tag_spec,
     failure_tag_spec,
     query_tokens_to_string,
     should_use_on_demand_metrics,
@@ -341,7 +340,7 @@ def test_spec_epm(default_project):
     assert spec.field_to_extract is None
     assert spec.op == "on_demand_epm"
     assert spec.condition == {"name": "event.duration", "op": "gt", "value": 1000.0}
-    assert spec.tags_conditions(default_project) == epm_tag_spec(default_project, "not_used")
+    assert spec.tags_conditions(default_project) == []
 
 
 def test_cleanup_equivalent_specs():