Skip to content

fix: drain usage sync backlog and unblock failed syncs #165

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
lleyton merged 1 commit into from
Oct 31, 2026
Merged

fix: drain usage sync backlog and unblock failed syncs #165

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
29 changes: 19 additions & 10 deletions apps/dashboard/src/lib/server/billing/metering.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { and, asc, eq, inArray, isNotNull, isNull, lt, ne, or, sql } from 'drizzle-orm';
import { and, asc, eq, inArray, isNotNull, isNull, lt, ne, or } from 'drizzle-orm';
import { organization } from '#lib/server/db/auth.schema.js';
import { initDrizzle } from '#lib/server/db/index.js';
import {
Expand Down Expand Up @@ -738,6 +738,17 @@ async function ensureEventTarget(
return 'ready';
}

function isDuplicateIdempotencyKey(err: unknown) {
return (
autumnStatus(err) === 409 &&
typeof err === 'object' &&
err !== null &&
'body' in err &&
typeof err.body === 'string' &&
err.body.includes('duplicate_idempotency_key')
);
}

async function trackUsageEvent(event: BillingUsageEvent) {
if (!isBillingConfigured()) {
await markUsageEventSynced(event.id);
Expand Down Expand Up @@ -774,6 +785,10 @@ async function trackUsageEvent(event: BillingUsageEvent) {
await markUsageEventAbandoned(event.id, formatAutumnError(err));
return 'abandoned' as const;
}
if (isDuplicateIdempotencyKey(err)) {
await markUsageEventSynced(event.id);
return 'synced' as const;
}
await markUsageEventFailed(event.id, formatAutumnError(err));
return 'failed' as const;
}
Expand Down Expand Up @@ -870,17 +885,14 @@ async function abandonStaleFailedEvents(now: number) {
return stale.length;
}

export async function syncPendingUsage(limit = 50) {
export async function syncPendingUsage(limit = 400) {
const db = initDrizzle();
const expired = await abandonStaleFailedEvents(Date.now());
const events = await db
.select()
.from(billingUsageEvents)
.where(inArray(billingUsageEvents.syncStatus, ['pending', 'failed']))
.orderBy(
sql`case when ${billingUsageEvents.syncStatus} = 'pending' then 0 else 1 end`,
asc(billingUsageEvents.createdAt)
)
.orderBy(asc(billingUsageEvents.createdAt))
.limit(limit);

const { synced, failed, abandoned } = await syncUsageEvents(events);
Expand All @@ -899,10 +911,7 @@ export async function syncProjectUsage(projectId: string, limit = 50) {
inArray(billingUsageEvents.syncStatus, ['pending', 'failed'])
)
)
.orderBy(
sql`case when ${billingUsageEvents.syncStatus} = 'pending' then 0 else 1 end`,
asc(billingUsageEvents.createdAt)
)
.orderBy(asc(billingUsageEvents.createdAt))
.limit(limit);

const { synced, failed, abandoned } = await syncUsageEvents(events);
Expand Down
Loading