:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(query): attribute api query budget events (#122066)
Jovan Sakovicbc41800bb12b
diff --git a/posthog/hogql_queries/query_runner.py b/posthog/hogql_queries/query_runner.pyindex 262d05780943..47851347a8e9 100644--- a/posthog/hogql_queries/query_runner.py+++ b/posthog/hogql_queries/query_runner.py@@ -157,7 +157,9 @@ from posthog.clickhouse.client.limit import (get_materialized_endpoints_rate_limiter,)from posthog.clickhouse.query_tagging import (+ add_fallback_query_tags,get_query_tag_value,+ get_query_tags,is_api_key_access_method,is_known_product_tag,tag_queries,@@ -548,6 +550,15 @@ def _api_queries_budget_enforcement_enabled(team: Team) -> bool:return False+def _budget_event_product(query: object | None = None) -> str | None:+ """Resolve product fallbacks before execution without changing the live query tags."""+ tags = get_query_tags().model_copy(deep=True)+ if query is not None:+ tags.query = query+ add_fallback_query_tags(tags)+ return str(tags.product) if tags.product else None++def api_queries_budget_enforcement_enabled(team: Team) -> bool:"""Whether the read-byte budget rejects API requests for this team.@@ -581,7 +592,7 @@ def get_api_queries_budget_status(team: Team) -> Optional[BudgetStatus]:return None-def enforce_api_queries_budget(team: Team) -> None:+def enforce_api_queries_budget(team: Team, query: object | None = None) -> None:"""Hourly read budget for api key queries. Observe-only until the org is flagged in;then an exhausted budget is a 429. The query that crosses the line still runs in full,since the budget is debited after the query and the next request is the one refused."""@@ -606,7 +617,7 @@ def enforce_api_queries_budget(team: Team) -> None:if claim_limited_event(str(team.pk)):try:access_method = get_query_tag_value("access_method")- product = get_query_tag_value("product")+ product = _budget_event_product(query)report_team_action(team,"api queries budget limited",@@ -618,7 +629,7 @@ def enforce_api_queries_budget(team: Team) -> None:"remaining_bytes": status.remaining_bytes,"retry_after_seconds": status.retry_after_seconds,"access_method": str(access_method) if access_method else None,- "product": str(product) if product else None,+ "product": product,},)except Exception as e:@@ -3161,7 +3172,7 @@ class QueryRunner(ABC, Generic[Q, R, CR]):return feature.get("limit") if feature else Nonedef _enforce_api_queries_budget(self) -> None:- enforce_api_queries_budget(self.team)+ enforce_api_queries_budget(self.team, self.query)@abstractmethoddef to_query(self) -> ast.SelectQuery | ast.SelectSetQuery:diff --git a/posthog/hogql_queries/test/test_api_queries_budget.py b/posthog/hogql_queries/test/test_api_queries_budget.pyindex d92c885fa3ff..b0422e4cf3b5 100644--- a/posthog/hogql_queries/test/test_api_queries_budget.py+++ b/posthog/hogql_queries/test/test_api_queries_budget.py@@ -9,16 +9,17 @@ from django.utils import timezonefrom parameterized import parameterized-from posthog.schema import HogQLQuery+from posthog.schema import EventsQuery, HogQLQueryfrom posthog.api_queries_budget import API_QUERIES_BUDGET_ERRORS_COUNTER, budget_spec_for, debit, refill_and_read-from posthog.clickhouse.query_tagging import Product, reset_query_tags, tag_queries+from posthog.clickhouse.query_tagging import Product, get_query_tag_value, reset_query_tags, tag_queriesfrom posthog.exceptions import APIQueriesBudgetExceededfrom posthog.hogql_queries.hogql_query_runner import HogQLQueryRunnerfrom posthog.hogql_queries.query_runner import (API_QUERIES_BUDGET_BALANCE_HISTOGRAM,API_QUERIES_BUDGET_LIMITED_COUNTER,get_api_queries_budget_status,+ get_query_runner,)from posthog.models.team.team_event_volume import TeamEventVolume@@ -104,6 +105,27 @@ class TestApiQueriesBudgetEnforcement(BaseTest):assert properties["access_method"] == "personal_api_key"assert properties["product"] == "api"+ @parameterized.expand(+ [+ ("explicit_product", HogQLQuery(query="SELECT 1"), Product.ENDPOINTS, "endpoints"),+ ("current_query", EventsQuery(select=["event"]), None, "product_analytics"),+ ("unattributed_query", HogQLQuery(query="SELECT 1"), None, None),+ ]+ )+ def test_over_budget_event_resolves_product_from_current_query(self, _name, query, product, expected_product):+ self._drain()+ tag_queries(access_method="personal_api_key", product=product)+ try:+ with (+ patch("posthog.hogql_queries.query_runner._api_queries_budget_enforcement_enabled", return_value=False),+ patch("posthog.hogql_queries.query_runner.report_team_action") as report,+ ):+ get_query_runner(query, self.team)._enforce_api_queries_budget()+ assert get_query_tag_value("product") == product+ finally:+ reset_query_tags()+ assert report.call_args.args[2]["product"] == expected_product+def test_event_reporting_failure_does_not_affect_admission(self):self._drain()before = API_QUERIES_BUDGET_ERRORS_COUNTER.labels(op="limited_event")._value.get()