Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove tbOld (complete Tinybird migration) #3139

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
steven-tey merged 1 commit into from
Nov 20, 2025
Merged

Remove tbOld (complete Tinybird migration) #3139

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
12 changes: 0 additions & 12 deletions apps/web/app/(ee)/api/cron/framer/backfill-leads-batch/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,18 +303,6 @@ export const POST = withWorkspace(async ({ req, workspace }) => {
body: dataArray.map((d) => JSON.stringify(d.clickData)).join("\n"),
},
),
// TODO: Remove after Tinybird migration
fetch(
`${process.env.TINYBIRD_API_URL}/v0/events?name=dub_click_events&wait=true`,
{
method: "POST",
headers: {
Authorization: `Bearer ${process.env.TINYBIRD_API_KEY_OLD}`,
"Content-Type": "application/x-ndjson",
},
body: dataArray.map((d) => JSON.stringify(d.clickData)).join("\n"),
},
),

// Record leads
recordLeadWithTimestamp(dataArray.map((d) => d.leadEventData)),
Expand Down
12 changes: 2 additions & 10 deletions apps/web/lib/api/audit-logs/record-audit-log.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getIP } from "@/lib/api/utils/get-ip";
import { tb, tbOld } from "@/lib/tinybird";
import { tb } from "@/lib/tinybird";
import { log } from "@dub/utils";
import { ipAddress as getIPAddress, waitUntil } from "@vercel/functions";
import { ipAddress as getIPAddress } from "@vercel/functions";
import { headers } from "next/headers";
import { z } from "zod";
import { createId } from "../create-id";
Expand Down Expand Up @@ -56,7 +56,6 @@ export const recordAuditLog = async (data: AuditLogInput | AuditLogInput[]) => {
: [transformAuditLogTB(data, { headersList, ipAddress })];

try {
waitUntil(recordAuditLogTBOld(auditLogs));
return await recordAuditLogTB(auditLogs);
} catch (error) {
console.error(
Expand All @@ -78,10 +77,3 @@ const recordAuditLogTB = tb.buildIngestEndpoint({
event: auditLogSchemaTB,
wait: true,
});

// TODO: Remove after Tinybird migration
const recordAuditLogTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_audit_logs",
event: auditLogSchemaTB,
wait: true,
});
6 changes: 0 additions & 6 deletions apps/web/lib/tinybird/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@ export const tb = new Tinybird({
token: process.env.TINYBIRD_API_KEY as string,
baseUrl: process.env.TINYBIRD_API_URL as string,
});

// TODO: Remove after Tinybird migration
export const tbOld = new Tinybird({
token: process.env.TINYBIRD_API_KEY_OLD as string,
baseUrl: process.env.TINYBIRD_API_URL as string,
});
16 changes: 2 additions & 14 deletions apps/web/lib/tinybird/log-conversion-events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { waitUntil } from "@vercel/functions";
import { z } from "zod";
import { tb, tbOld } from "./client";
import { tb } from "./client";

const schema = z.object({
workspace_id: z.string(),
Expand All @@ -11,18 +10,7 @@ const schema = z.object({
});

// Log the conversion events for debugging purposes
export const logConversionEventTB = tb.buildIngestEndpoint({
export const logConversionEvent = tb.buildIngestEndpoint({
datasource: "dub_conversion_events_log",
event: schema,
});

// TODO: Remove after Tinybird migration
export const logConversionEventTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_conversion_events_log",
event: schema,
});

export const logConversionEvent = async (payload: any) => {
waitUntil(logConversionEventTBOld(payload));
return await logConversionEventTB(payload);
};
16 changes: 2 additions & 14 deletions apps/web/lib/tinybird/log-import-error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
import { waitUntil } from "@vercel/functions";
import { importErrorLogSchema } from "../zod/schemas/import-error-log";
import { tb, tbOld } from "./client";
import { tb } from "./client";

export const logImportErrorTB = tb.buildIngestEndpoint({
export const logImportError = tb.buildIngestEndpoint({
datasource: "dub_import_error_logs",
event: importErrorLogSchema,
});

// TODO: Remove after Tinybird migration
export const logImportErrorTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_import_error_logs",
event: importErrorLogSchema,
});

export const logImportError = async (payload: any) => {
waitUntil(logImportErrorTBOld(payload));
return await logImportErrorTB(payload);
};
17 changes: 2 additions & 15 deletions apps/web/lib/tinybird/record-click-zod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { waitUntil } from "@vercel/functions";
import { z } from "zod";
import { tb, tbOld } from "./client";
import { tb } from "./client";

export const recordClickZodSchema = z.object({
timestamp: z.string().default(""),
Expand Down Expand Up @@ -37,20 +36,8 @@ export const recordClickZodSchema = z.object({
trigger: z.string().default("link"),
});

export const recordClickZodTB = tb.buildIngestEndpoint({
export const recordClickZod = tb.buildIngestEndpoint({
datasource: "dub_click_events",
event: recordClickZodSchema,
wait: true,
});

// TODO: Remove after Tinybird migration
export const recordClickZodTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_click_events",
event: recordClickZodSchema,
wait: true,
});

export const recordClickZod = async (payload: any) => {
waitUntil(recordClickZodTBOld(payload));
return await recordClickZodTB(payload);
};
12 changes: 0 additions & 12 deletions apps/web/lib/tinybird/record-click.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,18 +231,6 @@ export async function recordClick({
[programId, partnerId],
);
}),

// TODO: Remove after Tinybird migration
fetchWithRetry(
`${process.env.TINYBIRD_API_URL}/v0/events?name=dub_click_events&wait=true`,
{
method: "POST",
headers: {
Authorization: `Bearer ${process.env.TINYBIRD_API_KEY_OLD}`,
},
body: JSON.stringify(clickData),
},
).then((res) => res.json()),
]);

// Find the rejected promises and log them
Expand Down
30 changes: 3 additions & 27 deletions apps/web/lib/tinybird/record-lead.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,15 @@
import { waitUntil } from "@vercel/functions";
import { z } from "zod";
import { leadEventSchemaTB } from "../zod/schemas/leads";
import { tb, tbOld } from "./client";
import { tb } from "./client";

export const recordLeadTB = tb.buildIngestEndpoint({
export const recordLead = tb.buildIngestEndpoint({
datasource: "dub_lead_events",
event: leadEventSchemaTB,
});

// TODO: Remove after Tinybird migration
export const recordLeadTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_lead_events",
event: leadEventSchemaTB,
});

export const recordLead = async (payload: any) => {
waitUntil(recordLeadTBOld(payload));
return await recordLeadTB(payload);
};

export const recordLeadWithTimestampTB = tb.buildIngestEndpoint({
datasource: "dub_lead_events",
event: leadEventSchemaTB.extend({
timestamp: z.string(),
}),
});

export const recordLeadWithTimestampTBOld = tbOld.buildIngestEndpoint({
export const recordLeadWithTimestamp = tb.buildIngestEndpoint({
datasource: "dub_lead_events",
event: leadEventSchemaTB.extend({
timestamp: z.string(),
}),
});

export const recordLeadWithTimestamp = async (payload: any) => {
waitUntil(recordLeadWithTimestampTBOld(payload));
return await recordLeadWithTimestampTB(payload);
};
16 changes: 1 addition & 15 deletions apps/web/lib/tinybird/record-link.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { waitUntil } from "@vercel/functions";
import { z } from "zod";
import { ExpandedLink } from "../api/links";
import { decodeKeyIfCaseSensitive } from "../api/links/case-sensitivity";
import { tb, tbOld } from "./client";
import { tb } from "./client";

export const dubLinksMetadataSchema = z.object({
link_id: z.string(),
Expand Down Expand Up @@ -50,13 +49,6 @@ const recordLinkTB = tb.buildIngestEndpoint({
wait: true,
});

// TODO: Remove after Tinybird migration
const recordLinkTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_links_metadata",
event: dubLinksMetadataSchema,
wait: true,
});

const transformLinkTB = (link: ExpandedLink) => {
const key = decodeKeyIfCaseSensitive({
domain: link.domain,
Expand Down Expand Up @@ -85,16 +77,10 @@ export const recordLink = async (
{ deleted }: { deleted?: boolean } = {},
) => {
if (Array.isArray(payload)) {
waitUntil(
recordLinkTBOld(
payload.map(transformLinkTB).map((p) => ({ ...p, deleted })),
),
);
return await recordLinkTB(
payload.map(transformLinkTB).map((p) => ({ ...p, deleted })),
);
} else {
waitUntil(recordLinkTBOld({ ...transformLinkTB(payload), deleted }));
return await recordLinkTB({ ...transformLinkTB(payload), deleted });
}
};
30 changes: 3 additions & 27 deletions apps/web/lib/tinybird/record-sale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,15 @@
import { waitUntil } from "@vercel/functions";
import z from "../zod";
import { saleEventSchemaTB } from "../zod/schemas/sales";
import { tb, tbOld } from "./client";
import { tb } from "./client";

export const recordSaleTB = tb.buildIngestEndpoint({
export const recordSale = tb.buildIngestEndpoint({
datasource: "dub_sale_events",
event: saleEventSchemaTB,
});

// TODO: Remove after Tinybird migration
export const recordSaleNewTB = tbOld.buildIngestEndpoint({
datasource: "dub_sale_events",
event: saleEventSchemaTB,
});

export const recordSale = async (payload: any) => {
waitUntil(recordSaleNewTB(payload));
return await recordSaleTB(payload);
};

export const recordSaleWithTimestampTB = tb.buildIngestEndpoint({
datasource: "dub_sale_events",
event: saleEventSchemaTB.extend({
timestamp: z.string(),
}),
});

export const recordSaleWithTimestampNewTB = tbOld.buildIngestEndpoint({
export const recordSaleWithTimestamp = tb.buildIngestEndpoint({
datasource: "dub_sale_events",
event: saleEventSchemaTB.extend({
timestamp: z.string(),
}),
});

export const recordSaleWithTimestamp = async (payload: any) => {
waitUntil(recordSaleWithTimestampNewTB(payload));
return await recordSaleWithTimestampTB(payload);
};
16 changes: 2 additions & 14 deletions apps/web/lib/tinybird/record-webhook-event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
import { waitUntil } from "@vercel/functions";
import { webhookEventSchemaTB } from "../zod/schemas/webhooks";
import { tb, tbOld } from "./client";
import { tb } from "./client";

export const recordWebhookEventTB = tb.buildIngestEndpoint({
export const recordWebhookEvent = tb.buildIngestEndpoint({
datasource: "dub_webhook_events",
event: webhookEventSchemaTB.omit({ timestamp: true }),
});

// TODO: Remove after Tinybird migration
export const recordWebhookEventTBOld = tbOld.buildIngestEndpoint({
datasource: "dub_webhook_events",
event: webhookEventSchemaTB.omit({ timestamp: true }),
});

export const recordWebhookEvent = async (payload: any) => {
waitUntil(recordWebhookEventTBOld(payload));
return await recordWebhookEventTB(payload);
};