Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Return 400 when a Tinybird analytics query times out

Rafidf8eff363922
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 2ea19ff6ae..4724e162ca 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -22,6 +22,7 @@ import { metadataQueryParser } from "./metadata-query-parser";
import { AnalyticsFilters } from "./types";
import { formatUTCDateTimeClickhouse } from "./utils/format-utc-datetime-clickhouse";
import { getStartEndDates } from "./utils/get-start-end-dates";
+import { withTinybirdTimeout } from "./utils/with-tinybird-timeout";
// Fetch data for /api/analytics
export const getAnalytics = async (params: AnalyticsFilters) => {
@@ -193,7 +194,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
filters: allFilters.length > 0 ? JSON.stringify(allFilters) : undefined,
};
- const response = await pipe(tinybirdParams);
+ const response = await withTinybirdTimeout(pipe(tinybirdParams));
if (groupBy === "count") {
const { groupByField, ...rest } = response.data[0];
diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.ts
index 4834bb0b23..c2f417a280 100644
--- a/apps/web/lib/analytics/get-events.ts
+++ b/apps/web/lib/analytics/get-events.ts
@@ -30,6 +30,7 @@ import { metadataQueryParser } from "./metadata-query-parser";
import { EventsFilters } from "./types";
import { formatUTCDateTimeClickhouse } from "./utils/format-utc-datetime-clickhouse";
import { getStartEndDates } from "./utils/get-start-end-dates";
+import { withTinybirdTimeout } from "./utils/with-tinybird-timeout";
// Fetch data for /api/events
export const getEvents = async (params: EventsFilters) => {
@@ -165,7 +166,7 @@ export const getEvents = async (params: EventsFilters) => {
filters: allFilters.length > 0 ? JSON.stringify(allFilters) : undefined,
};
- const response = await pipe(tinybirdParams);
+ const response = await withTinybirdTimeout(pipe(tinybirdParams));
const [linksMap, customersMap] = await Promise.all([
getLinksMap(response.data.map((d) => d.link_id)),
diff --git a/apps/web/lib/analytics/utils/with-tinybird-timeout.ts b/apps/web/lib/analytics/utils/with-tinybird-timeout.ts
new file mode 100644
index 0000000000..ba116e6ee6
--- /dev/null
+++ b/apps/web/lib/analytics/utils/with-tinybird-timeout.ts
@@ -0,0 +1,19 @@
+import { DubApiError } from "@/lib/api/errors";
+import { serializeError } from "@dub/utils";
+
+// Tinybird stops a query after 30s. Return a 400 with a hint instead of a 500.
+export async function withTinybirdTimeout<T>(promise: Promise<T>): Promise<T> {
+ try {
+ return await promise;
+ } catch (error) {
+ if (serializeError(error).includes("Timeout exceeded")) {
+ throw new DubApiError({
+ code: "bad_request",
+ message:
+ "The analytics query took too long. Use a shorter date range or add filters, then try again.",
+ });
+ }
+
+ throw error;
+ }
+}