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.

Attach workspace ID to Axiom API error logs

Kiran K5605e5442a1f
diff --git a/apps/web/lib/api/errors.ts b/apps/web/lib/api/errors.ts
index ec0d40e5c4..e3d0fbeee3 100644
--- a/apps/web/lib/api/errors.ts
+++ b/apps/web/lib/api/errors.ts
@@ -1,9 +1,10 @@
-import { NextResponse } from "next/server";
+import { after, NextResponse } from "next/server";
import "server-only";
import { generateErrorMessage } from "zod-error";
import { ZodOpenApiResponseObject } from "zod-openapi";
import * as z from "zod/v4";
import { logger } from "../axiom/server";
+import { WorkspaceProps } from "../types";
import { ErrorCode, ErrorCodes } from "./error-codes";
const speakeasyErrorOverrides: Record<z.infer<typeof ErrorCode>, string> = {
@@ -89,12 +90,22 @@ export function fromZodError(error: z.ZodError): ErrorResponse {
};
}
-function handleApiError(error: any): ErrorResponse & { status: number } {
+export function handleApiError({
+ error,
+ workspace,
+}: {
+ error: any;
+ workspace?: Pick<WorkspaceProps, "id">;
+}): ErrorResponse & { status: number } {
console.error(error.message);
// Send error to Axiom
- logger.error(error.message, error);
- logger.flush();
+ logger.error(error.message, {
+ error,
+ ...(workspace?.id ? { workspaceId: workspace.id } : {}),
+ });
+
+ after(() => logger.flush());
// Zod errors
if (error instanceof z.ZodError) {
@@ -145,7 +156,10 @@ function handleApiError(error: any): ErrorResponse & { status: number } {
}
export function handleAndReturnErrorResponse(err: unknown, headers?: Headers) {
- const { error, status } = handleApiError(err);
+ const { error, status } = handleApiError({
+ error: err,
+ });
+
return NextResponse.json<ErrorResponse>({ error }, { headers, status });
}
diff --git a/apps/web/lib/auth/workspace.ts b/apps/web/lib/auth/workspace.ts
index 41986e3012..16fa92c034 100644
--- a/apps/web/lib/auth/workspace.ts
+++ b/apps/web/lib/auth/workspace.ts
@@ -1,4 +1,4 @@
-import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { DubApiError, handleApiError } from "@/lib/api/errors";
import { prisma } from "@/lib/prisma";
import { BetaFeatures, PlanProps, WorkspaceWithUsers } from "@/lib/types";
import { ratelimit } from "@/lib/upstash";
@@ -6,6 +6,7 @@ import { API_DOMAIN, getSearchParams } from "@dub/utils";
import { WorkspaceRole } from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import { headers } from "next/headers";
+import { NextResponse } from "next/server";
import { captureRequestLog } from "../api-logs/capture-request-log";
import { getRatelimitForPlan } from "../api/get-ratelimit-for-plan";
import {
@@ -514,17 +515,22 @@ export const withWorkspace = (
}
return response;
- } catch (error) {
- const errorResponse = handleAndReturnErrorResponse(
- error,
- responseHeaders,
+ } catch (err) {
+ const { error, status } = handleApiError({
+ error: err,
+ workspace,
+ });
+
+ const response = NextResponse.json(
+ { error },
+ { headers: responseHeaders, status },
);
if (workspace) {
waitUntil(
captureRequestLog({
req: reqForLog,
- response: errorResponse,
+ response,
workspace,
session,
token,
@@ -535,7 +541,7 @@ export const withWorkspace = (
);
}
- return errorResponse;
+ return response;
}
},
);