Skip to content

Commit 150a23e

Browse files
authored
chore(flags): Remove GA-graduated mep-use-default-tags flag (#108774)
Remove `mep-use-default-tags` feature flag — enabled at 100% with no conditions. The `use_default_tags` property in MetricsQueryBuilder now always returns True for non-spans queries.
1 parent ef32114 commit 150a23e

File tree

4 files changed

+25
-37
lines changed

4 files changed

+25
-37
lines changed

src/sentry/features/temporary.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
172172
manager.add("organizations:invite-members", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
173173
# Enable rate limits for inviting members.
174174
manager.add("organizations:invite-members-rate-limits", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=False)
175-
manager.add("organizations:mep-use-default-tags", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
176175
# Enable flamegraph visualization for MetricKit hang diagnostic stack traces
177176
manager.add("organizations:metrickit-flamegraph", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
178177
# Enable Session Stats down to a minute resolution

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
Request,
2828
)
2929

30-
from sentry import features
3130
from sentry.api.event_search import SearchFilter
3231
from sentry.exceptions import IncompatibleMetricsQuery, InvalidSearchQuery
3332
from sentry.models.dashboard_widget import DashboardWidgetQueryOnDemand
@@ -119,7 +118,6 @@ def __init__(
119118
self.percentiles: list[CurriedFunction] = []
120119
self.metric_ids: set[int] = set()
121120
self._indexer_cache: dict[str, int | None] = {}
122-
self._use_default_tags: bool | None = None
123121
self._has_nullable: bool = False
124122
self._is_spans_metrics_query_cache: bool | None = None
125123
# always true if this is being called
@@ -158,14 +156,7 @@ def load_config(self) -> DatasetConfig:
158156
def use_default_tags(self) -> bool:
159157
if self.is_spans_metrics_query:
160158
return False
161-
if self._use_default_tags is None:
162-
if self.params.organization is not None:
163-
self._use_default_tags = features.has(
164-
"organizations:mep-use-default-tags", self.params.organization, actor=None
165-
)
166-
else:
167-
self._use_default_tags = False
168-
return self._use_default_tags
159+
return True
169160

170161
def are_columns_resolved(self) -> bool:
171162
# If we have an on demand spec, we want to mark the columns as resolved, since we are not running the

tests/sentry/search/events/builder/test_metrics.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2600,20 +2600,19 @@ def test_run_top_timeseries_query_with_on_demand_columns(self) -> None:
26002600
assert spec_map[field]
26012601
assert spec_map[field_two]
26022602

2603-
mep_query = TopMetricsQueryBuilder(
2604-
Dataset.PerformanceMetrics,
2605-
self.params,
2606-
3600 * 24,
2607-
[{"customtag1": "div > text"}, {"customtag2": "red"}],
2608-
query="",
2609-
selected_columns=groupbys,
2610-
timeseries_columns=[field, field_two],
2611-
config=QueryBuilderConfig(
2612-
on_demand_metrics_enabled=False,
2613-
),
2614-
)
2615-
2616-
assert not mep_query._on_demand_metric_spec_map
2603+
with pytest.raises(IncompatibleMetricsQuery):
2604+
TopMetricsQueryBuilder(
2605+
Dataset.PerformanceMetrics,
2606+
self.params,
2607+
3600 * 24,
2608+
[{"customtag1": "div > text"}, {"customtag2": "red"}],
2609+
query="",
2610+
selected_columns=groupbys,
2611+
timeseries_columns=[field, field_two],
2612+
config=QueryBuilderConfig(
2613+
on_demand_metrics_enabled=False,
2614+
),
2615+
)
26172616
result = query.run_query("test_query")
26182617

26192618
assert result["data"]

tests/snuba/api/endpoints/test_organization_events_mep.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3340,18 +3340,17 @@ def test_on_demand_with_mep(self) -> None:
33403340
transaction_data["tags"].append(("faketag", "foo"))
33413341
self.store_event(transaction_data, self.project.id)
33423342

3343-
with self.feature({"organizations:mep-use-default-tags": True}):
3344-
response = self.do_request(
3345-
{
3346-
"field": [
3347-
"faketag",
3348-
"count()",
3349-
],
3350-
"query": "event.type:transaction",
3351-
"dataset": "metricsEnhanced",
3352-
"per_page": 50,
3353-
}
3354-
)
3343+
response = self.do_request(
3344+
{
3345+
"field": [
3346+
"faketag",
3347+
"count()",
3348+
],
3349+
"query": "event.type:transaction",
3350+
"dataset": "metricsEnhanced",
3351+
"per_page": 50,
3352+
}
3353+
)
33553354
assert response.status_code == 200, response.content
33563355
assert len(response.data["data"]) == 1
33573356
data = response.data["data"]

0 commit comments

Comments
 (0)