Skip to content

Commit

Permalink
fix(metrics-extraction): Fix extraction iterating over widget columns (
Browse files Browse the repository at this point in the history
…#60974)

### Summary
We split up the iteration over the columns to only iterate over unique
columns, we shouldn't be iterating the widget columns since we get index
out of range
  • Loading branch information
k-fish committed Dec 1, 2023
1 parent 72d1e82 commit ad1ea86
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/sentry/relay/config/metric_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def _is_widget_query_low_cardinality(widget_query: DashboardWidgetQuery, project
return False

try:
for index, column in enumerate(widget_query.columns):
for index, column in enumerate(unique_columns):
count = processed_results["data"][0][unique_columns[index]]
if count > max_cardinality_allowed:
cache.set(cache_key, False, timeout=_get_widget_cardinality_query_ttl())
Expand Down
19 changes: 18 additions & 1 deletion tests/sentry/relay/config/test_metric_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -756,14 +756,31 @@ def test_get_metric_extraction_config_with_high_cardinality(default_project):
["epm()"],
f"transaction.duration:>={duration}",
default_project,
columns=["user.id", "release"],
columns=["user.id", "release", "count()"],
)

config = get_metric_extraction_config(default_project)

assert not config


@django_db_all
@override_options({"on_demand.max_widget_cardinality.count": 1})
def test_get_metric_extraction_config_with_low_cardinality(default_project):
duration = 1000
with Feature({ON_DEMAND_METRICS_WIDGETS: True}):
create_widget(
["epm()"],
f"transaction.duration:>={duration}",
default_project,
columns=["user.id", "release", "count()"],
)

config = get_metric_extraction_config(default_project)

assert config


@django_db_all
@pytest.mark.parametrize("metric", [("epm()"), ("eps()")])
def test_get_metric_extraction_config_with_no_tag_spec(default_project, metric):
Expand Down

0 comments on commit ad1ea86

Please sign in to comment.