Skip to content

fix(analytics): use rolling 7-day window for WAU calculation #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saddlepaddle merged 1 commit into from
Dec 23, 2025
Merged

fix(analytics): use rolling 7-day window for WAU calculation #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/admin/src/app/(dashboard)/components/WAUTrendChart/WAUTrendChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type { ReactNode } from "react";
import { Area, AreaChart, XAxis, YAxis } from "recharts";

interface WAUData {
week: string;
date: string;
count: number;
}

Expand Down Expand Up @@ -74,7 +74,7 @@ export function WAUTrendChart({
<ChartContainer config={chartConfig} className="h-[200px] w-full">
<AreaChart data={data} margin={{ left: 0, right: 0 }}>
<XAxis
dataKey="week"
dataKey="date"
tickLine={false}
axisLine={false}
tickFormatter={(v) =>
Expand Down
74 changes: 45 additions & 29 deletions packages/trpc/src/router/analytics/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,41 +105,57 @@ export const analyticsRouter = {
)
.query(async ({ input }) => {
const days = input?.days ?? 30;
const numWeeks = Math.ceil(days / 7);
const lookbackDays = days + 7; // Extra 7 days to cover rolling windows

// Calculate WAU for each week
const weeklyData: { week: string; count: number }[] = [];

for (let i = numWeeks - 1; i >= 0; i--) {
const weekEnd = i * 7;
const weekStart = weekEnd + 7;

// Only count workspace_created as meaningful product usage
const { results } = await executeHogQLQuery<[[number]]>(`
SELECT count(DISTINCT person_id) as wau_users
// Rolling 7-day WAU: for each day, count users with 3+ active days
// of workspace_created events in the preceding 7-day window
const { results } = await executeHogQLQuery<[string, number][]>(`
SELECT
report_date as date,
count(DISTINCT person_id) as wau
FROM (
SELECT
report_date,
person_id,
count(DISTINCT activity_date) as active_days
FROM (
SELECT person_id, count(DISTINCT toDate(timestamp)) as active_days
SELECT toDate(now()) - number as report_date
FROM numbers(${days})
) dates
CROSS JOIN (
SELECT
person_id,
toDate(timestamp) as activity_date
FROM events
WHERE timestamp >= now() - INTERVAL ${weekStart} DAY
AND timestamp < now() - INTERVAL ${weekEnd} DAY
AND event = 'workspace_created'
GROUP BY person_id
HAVING active_days >= 3
)
`);

// Calculate the week's start date for the label
const weekDate = new Date();
weekDate.setDate(weekDate.getDate() - weekStart);
const weekLabel = weekDate.toISOString().split("T")[0] as string;

weeklyData.push({
week: weekLabel,
count: results[0]?.[0] ?? 0,
WHERE event = 'workspace_created'
AND timestamp >= now() - INTERVAL ${lookbackDays} DAY
) activities
WHERE activity_date > report_date - 7
AND activity_date <= report_date
GROUP BY report_date, person_id
HAVING active_days >= 3
)
GROUP BY report_date
ORDER BY report_date ASC
`);

// Create a map of existing data
const dataMap = new Map(results.map(([date, count]) => [date, count]));

// Fill in all dates in the range (in case some days have 0 WAU)
const filledData: { date: string; count: number }[] = [];
const now = new Date();
for (let i = days - 1; i >= 0; i--) {
const date = new Date(now);
date.setDate(date.getDate() - i);
const dateStr = date.toISOString().split("T")[0] as string;
filledData.push({
date: dateStr,
count: dataMap.get(dateStr) ?? 0,
});
}

return weeklyData;
return filledData;
}),

getRetention: adminProcedure.query(async () => {
Expand Down