Skip to content

: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.

fix(marketing-analytics): repair cost fallback and sparkline trend queries (#121812)

posthog[bot]5464df2b6c9f
diff --git a/products/marketing_analytics/frontend/adPerformanceMetrics.test.ts b/products/marketing_analytics/frontend/adPerformanceMetrics.test.ts
index 36b7dd22d547..06fc01ffd275 100644
--- a/products/marketing_analytics/frontend/adPerformanceMetrics.test.ts
+++ b/products/marketing_analytics/frontend/adPerformanceMetrics.test.ts
@@ -73,40 +73,53 @@ describe('Ad performance sparklines', () => {
expect(Object.keys(metrics)).not.toContain('trial started')
})
- it.each([false, true])('keeps request filters and current-period dates with precompute=%s', (precomputed) => {
- const query = buildAdPerformanceTrendsQuery(
- {
- kind: NodeKind.MarketingAnalyticsAggregatedQuery,
- properties: [],
- dateRange: { date_from: '-30d', date_to: null },
- compareFilter: { compare: true },
- integrationFilter: { integrationSourceIds: ['source-one'] },
- },
- 'day',
- [],
- [table, { ...table, source_map_id: 'source-two' }],
- 'USD',
- precomputed
- )
- expect(query.series).toHaveLength(5)
- expect(query.dateRange).toEqual({ date_from: '-30d', date_to: null })
- expect(query.compareFilter).toBeUndefined()
- if (precomputed) {
- expect(query.series[0].properties).toContainEqual({
- type: PropertyFilterType.DataWarehouse,
- key: 'source_id',
- operator: PropertyOperator.Exact,
- value: ['source-one'],
- })
- } else {
- expect(query.series.every((series) => 'table_name' in series && series.table_name === table.name)).toBe(
- true
+ it.each([false, true])(
+ 'keeps source filters, drops event filters, and uses current-period dates with precompute=%s',
+ (precomputed) => {
+ const query = buildAdPerformanceTrendsQuery(
+ {
+ kind: NodeKind.MarketingAnalyticsAggregatedQuery,
+ properties: [
+ {
+ type: PropertyFilterType.Event,
+ key: 'browser',
+ operator: PropertyOperator.Exact,
+ value: 'Chrome',
+ },
+ ],
+ filterTestAccounts: true,
+ dateRange: { date_from: '-30d', date_to: null },
+ compareFilter: { compare: true },
+ integrationFilter: { integrationSourceIds: ['source-one'] },
+ },
+ 'day',
+ [],
+ [table, { ...table, source_map_id: 'source-two' }],
+ 'USD',
+ precomputed
)
- expect((query.series[0] as { math_hogql: string }).math_hogql).toContain('convertCurrency')
- expect((query.series[1] as { math_hogql: string }).math_hogql).not.toContain('convertCurrency')
- expect((query.series[3] as { math_hogql: string }).math_hogql).not.toContain('convertCurrency')
+ expect(query.series).toHaveLength(5)
+ expect(query.dateRange).toEqual({ date_from: '-30d', date_to: null })
+ expect(query.compareFilter).toBeUndefined()
+ expect(query.properties).toBeUndefined()
+ expect(query.filterTestAccounts).toBeUndefined()
+ if (precomputed) {
+ expect(query.series[0].properties).toContainEqual({
+ type: PropertyFilterType.DataWarehouse,
+ key: 'source_id',
+ operator: PropertyOperator.Exact,
+ value: ['source-one'],
+ })
+ } else {
+ expect(query.series.every((series) => 'table_name' in series && series.table_name === table.name)).toBe(
+ true
+ )
+ expect((query.series[0] as { math_hogql: string }).math_hogql).toContain('convertCurrency')
+ expect((query.series[1] as { math_hogql: string }).math_hogql).not.toContain('convertCurrency')
+ expect((query.series[3] as { math_hogql: string }).math_hogql).not.toContain('convertCurrency')
+ }
}
- })
+ )
it.each([
[
diff --git a/products/marketing_analytics/frontend/adPerformanceMetrics.ts b/products/marketing_analytics/frontend/adPerformanceMetrics.ts
index 770e3ee078c4..c857cb9ca6f0 100644
--- a/products/marketing_analytics/frontend/adPerformanceMetrics.ts
+++ b/products/marketing_analytics/frontend/adPerformanceMetrics.ts
@@ -114,8 +114,6 @@ export function buildAdPerformanceTrendsQuery(
series,
interval,
dateRange: query.dateRange,
- properties: query.properties,
- filterTestAccounts: query.filterTestAccounts,
trendsFilter: { display: ChartDisplayType.ActionsLineGraph },
tags: query.tags,
}
diff --git a/products/product_analytics/backend/hogql_queries/trends/test/test_marketing_cost_fallback.py b/products/product_analytics/backend/hogql_queries/trends/test/test_marketing_cost_fallback.py
index bc2f7a5d3a96..7bd66a8f1457 100644
--- a/products/product_analytics/backend/hogql_queries/trends/test/test_marketing_cost_fallback.py
+++ b/products/product_analytics/backend/hogql_queries/trends/test/test_marketing_cost_fallback.py
@@ -1,8 +1,9 @@
from collections.abc import Callable, Sequence
from datetime import UTC, datetime
+from typing import Any
import time_machine
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
from django.test import SimpleTestCase
@@ -29,7 +30,9 @@ from products.product_analytics.backend.hogql_queries.trends.trends_query_runner
@time_machine.travel("2025-01-15T12:00:00Z", tick=False)
class TestMarketingCostFallback(SimpleTestCase):
@parameterized.expand([(True, None), (False, None), (True, "-1y"), (False, "-1y")])
- def test_resolved_series_reuse_database_and_exact_trends_periods(self, ready: bool, compare_to: str | None) -> None:
+ def test_resolved_series_get_matching_database_and_exact_trends_periods(
+ self, ready: bool, compare_to: str | None
+ ) -> None:
team = Team(id=17, timezone="America/New_York", base_currency="USD")
user = User(id=3)
precomputed = DataWarehouseNode(
@@ -50,13 +53,23 @@ class TestMarketingCostFallback(SimpleTestCase):
marketingAnalyticsCostFallback=MarketingAnalyticsCostFallback(series=[live], sourceIds=["a"]),
)
original_calculate = TrendsQueryRunner.calculate
+ built: list[tuple[MagicMock, dict[str, Any], list[str]]] = []
+
+ def create_for(**kwargs: Any) -> MagicMock:
+ database = MagicMock()
+ warehouse_modifiers = kwargs["modifiers"].dataWarehouseEventsModifiers or []
+ built.append((database, kwargs, [modifier.table_name for modifier in warehouse_modifiers]))
+ return database
def execute_resolved(runner: TrendsQueryRunner) -> TrendsQueryResponse:
if runner.query.marketingAnalyticsCostFallback is not None:
return original_calculate(runner)
- assert runner.shared_database is database.return_value
+ database = runner.shared_database
series = runner.query.series[0]
assert isinstance(series, DataWarehouseNode)
+ assert next(tables for built_database, _, tables in built if built_database is database) == [
+ series.table_name
+ ]
return TrendsQueryResponse(results=[{"label": series.table_name}])
def resolve(
@@ -69,17 +82,17 @@ class TestMarketingCostFallback(SimpleTestCase):
assert len(date_ranges) == 2
assert date_ranges[0].date_from() == datetime(2025, 1, 10, 5, tzinfo=UTC)
assert date_ranges[1].date_from().year == (2024 if compare_to else 2025)
- assert get_database() is database.return_value
+ assert get_database() is built[0][0]
result = query.model_copy(deep=True)
result.marketingAnalyticsCostFallback = None
result.series = [precomputed if ready else live]
return result
with (
- patch("posthog.hogql_queries.query_runner.Database.create_for") as database,
+ patch("posthog.hogql_queries.query_runner.Database.create_for", side_effect=create_for),
patch(
"posthog.hogql_queries.query_runner.create_default_modifiers_for_team",
- return_value=HogQLQueryModifiers(),
+ side_effect=lambda team, modifiers=None: (modifiers or HogQLQueryModifiers()).model_copy(),
),
patch("posthog.hogql_queries.query_runner.get_instance_setting", return_value=True),
patch(
@@ -89,6 +102,7 @@ class TestMarketingCostFallback(SimpleTestCase):
):
result = TrendsQueryRunner(query=query, team=team, user=user).calculate()
assert result.results[0]["label"] == ("marketing_costs_precomputed" if ready else "source_stats")
- database.assert_called_once()
- assert database.call_args.kwargs["user"] is user
- assert not database.call_args.kwargs.get("bypass_warehouse_access_control", False)
+ assert len(built) == (1 if ready else 2)
+ for _, kwargs, _ in built:
+ assert kwargs["user"] is user
+ assert not kwargs.get("bypass_warehouse_access_control", False)
diff --git a/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py b/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py
index 5837775d2a4d..b45173273a48 100644
--- a/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py
+++ b/products/product_analytics/backend/hogql_queries/trends/trends_query_runner.py
@@ -439,7 +439,9 @@ class TrendsQueryRunner(AnalyticsQueryRunner[TrendsQueryResponse]):
workload=self.workload,
hogql_settings=self.hogql_settings,
)
- runner._shared_database = self._shared_database
+ # The live fallback reads other warehouse tables, so it needs a database built with its own modifiers.
+ if runner.modifiers == self.modifiers:
+ runner._shared_database = self._shared_database
return runner.calculate()
queries = self.to_queries()