Skip to content

Commit 2484e7d

Browse files
wedamijaclaude
andcommitted
chore(flags): Remove GA-graduated mep-use-default-tags flag
Remove mep-use-default-tags feature flag — enabled at 100% with no conditions. The use_default_tags property now always returns True for non-spans queries. Note: Other flags from the original batch (performance-queries-mongodb-extraction, relay-otlp-traces-endpoint, relay-otel-logs-endpoint, span-v2-otlp-processing) were restored because they are in EXPOSABLE_FEATURES and must not be removed yet. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fe09080 commit 2484e7d

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

src/sentry/features/temporary.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
184184
# Enable Large HTTP Payload Detector Improvements
185185
manager.add("organizations:large-http-payload-detector-improvements", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
186186
manager.add("organizations:mep-rollout-flag", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
187-
manager.add("organizations:mep-use-default-tags", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
188187
# Migrate Orgs to new Azure DevOps Integration
189188
manager.add("organizations:migrate-azure-devops-integration", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
190189
# 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
@@ -122,7 +121,6 @@ def __init__(
122121
self.metrics_layer_functions: list[CurriedFunction] = []
123122
self.metric_ids: set[int] = set()
124123
self._indexer_cache: dict[str, int | None] = {}
125-
self._use_default_tags: bool | None = None
126124
self._has_nullable: bool = False
127125
self._is_spans_metrics_query_cache: bool | None = None
128126
self._is_unsupported_metrics_layer_query_cache: bool | None = None
@@ -165,14 +163,7 @@ def load_config(self) -> DatasetConfig:
165163
def use_default_tags(self) -> bool:
166164
if self.is_spans_metrics_query:
167165
return False
168-
if self._use_default_tags is None:
169-
if self.params.organization is not None:
170-
self._use_default_tags = features.has(
171-
"organizations:mep-use-default-tags", self.params.organization, actor=None
172-
)
173-
else:
174-
self._use_default_tags = False
175-
return self._use_default_tags
166+
return True
176167

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

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)