Skip to content

Open-source status page, incident response and uptime monitoring

🐛 rum (#788)

Thibault Le Ouay438383cdc4fe
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx
index a9a70a3f2..d7a6a67f2 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx
@@ -10,14 +10,13 @@ export const RUMMetricCard = async ({
const data = await api.rumRouter.GetEventMetricsForWorkspace.query({
event: event,
});
- console.log(data);
return (
<Card>
<p className="text-tremor-default text-tremor-content dark:text-dark-tremor-content">
{event}
</p>
<p className="text-tremor-content-strong dark:text-dark-tremor-content-strong text-3xl font-semibold">
- {data.median}
+ {data?.median || 0}
</p>
</Card>
);
diff --git a/packages/api/src/router/clerk/webhook.ts b/packages/api/src/router/clerk/webhook.ts
index b09c6e81a..d31051569 100644
--- a/packages/api/src/router/clerk/webhook.ts
+++ b/packages/api/src/router/clerk/webhook.ts
@@ -1,5 +1,3 @@
-import { customAlphabet } from "nanoid";
-import { alphanumeric } from "nanoid-dictionary";
import * as randomWordSlugs from "random-word-slugs";
import * as z from "zod";
@@ -53,12 +51,10 @@ export const webhookRouter = createTRPCRouter({
slug = undefined;
}
}
- const lowercaseRandomString = customAlphabet(alphanumeric, 10);
- const dsn = `os_rum_${lowercaseRandomString}`;
const workspaceResult = await opts.ctx.db
.insert(workspace)
- .values({ slug, name: "", dsn })
+ .values({ slug, name: "" })
.returning({ id: workspace.id })
.get();
await opts.ctx.db
diff --git a/packages/api/src/router/rum/index.ts b/packages/api/src/router/rum/index.ts
index a9a6e9125..aa47cf16f 100644
--- a/packages/api/src/router/rum/index.ts
+++ b/packages/api/src/router/rum/index.ts
@@ -14,27 +14,29 @@ export const rumRouter = createTRPCRouter({
.query(async (opts) => {
try {
const data = await opts.ctx.clickhouseClient.query({
- query: `select
- event_name,
- quantile(0.5)(value) as median
- from
- cwv
- where
- dsn = '${opts.ctx.workspace.dsn}'
- and event_name = '${opts.input.event}'
- group by
- event_name
-`,
+ query: `
+ select
+ event_name,
+ quantile(0.5)(value) as median
+ from cwv
+ where
+ dsn = '${opts.ctx.workspace.dsn}'
+ and event_name = '${opts.input.event}'
+ group by event_name
+ `,
format: "JSONEachRow",
});
const result = await data.json();
const schema = z.array(
z.object({ event_name: z.string(), median: z.number() }),
);
- return schema.parse(result)[0];
+ if (!result) {
+ return null;
+ }
+ const d = schema.parse(result);
+ return d.length > 0 ? d[0] : null;
} catch (e) {
- console.error(e);
- throw e;
+ return null;
}
}),
});