Skip to content

Scheduling infrastructure for absolutely everyone.

feat: enhance API v2 exception filters with user context for improved Axiom observability (#22157)

devin-ai-integration[bot]21422fe02730
diff --git a/apps/api/v2/src/filters/calendar-service-exception.filter.ts b/apps/api/v2/src/filters/calendar-service-exception.filter.ts
index 05868c0575c..0a86486ee0d 100644
--- a/apps/api/v2/src/filters/calendar-service-exception.filter.ts
+++ b/apps/api/v2/src/filters/calendar-service-exception.filter.ts
@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
import { filterReqHeaders } from "@/lib/filterReqHeaders";
import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
import { Request } from "express";
@@ -39,6 +40,7 @@ export class CalendarServiceExceptionFilter implements ExceptionFilter {
const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
response.setHeader("X-Request-Id", requestId.toString());
+ const userContext = extractUserContext(request);
this.logger.error(`Calendar Service Exception Filter: ${exception?.message}`, {
exception,
body: request.body,
@@ -46,6 +48,7 @@ export class CalendarServiceExceptionFilter implements ExceptionFilter {
url: request.url,
method: request.method,
requestId,
+ ...userContext,
});
response.status(400).json({
diff --git a/apps/api/v2/src/filters/http-exception.filter.ts b/apps/api/v2/src/filters/http-exception.filter.ts
index 904942b9f21..e2ef0afb7e4 100644
--- a/apps/api/v2/src/filters/http-exception.filter.ts
+++ b/apps/api/v2/src/filters/http-exception.filter.ts
@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
import { filterReqHeaders } from "@/lib/filterReqHeaders";
import { ArgumentsHost, Catch, ExceptionFilter, HttpException, Logger } from "@nestjs/common";
import { Request } from "express";
@@ -16,6 +17,7 @@ export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
const statusCode = exception.getStatus();
const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
response.setHeader("X-Request-Id", requestId.toString());
+ const userContext = extractUserContext(request);
this.logger.error(`Http Exception Filter: ${exception?.message}`, {
exception,
body: request.body,
@@ -23,6 +25,7 @@ export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
url: request.url,
method: request.method,
requestId,
+ ...userContext,
});
response.status(statusCode).json({
diff --git a/apps/api/v2/src/filters/prisma-exception.filter.ts b/apps/api/v2/src/filters/prisma-exception.filter.ts
index 86bec00a987..4c77c354fdd 100644
--- a/apps/api/v2/src/filters/prisma-exception.filter.ts
+++ b/apps/api/v2/src/filters/prisma-exception.filter.ts
@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
import { filterReqHeaders } from "@/lib/filterReqHeaders";
import type { ArgumentsHost, ExceptionFilter } from "@nestjs/common";
import { Catch, HttpStatus, Logger } from "@nestjs/common";
@@ -43,6 +44,7 @@ export class PrismaExceptionFilter implements ExceptionFilter {
const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
response.setHeader("X-Request-Id", requestId.toString());
+ const userContext = extractUserContext(request);
this.logger.error(`PrismaError: ${error.message}`, {
error,
body: request.body,
@@ -50,6 +52,7 @@ export class PrismaExceptionFilter implements ExceptionFilter {
url: request.url,
method: request.method,
requestId,
+ ...userContext,
});
let message = "There was an error, please try again later.";
diff --git a/apps/api/v2/src/filters/trpc-exception.filter.ts b/apps/api/v2/src/filters/trpc-exception.filter.ts
index 4a77cba3b18..02bf3aab2df 100644
--- a/apps/api/v2/src/filters/trpc-exception.filter.ts
+++ b/apps/api/v2/src/filters/trpc-exception.filter.ts
@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
import { filterReqHeaders } from "@/lib/filterReqHeaders";
import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
import { Request } from "express";
@@ -120,6 +121,7 @@ export class TRPCExceptionFilter implements ExceptionFilter {
const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
response.setHeader("X-Request-Id", requestId.toString());
+ const userContext = extractUserContext(request);
this.logger.error(`TRPC Exception Filter: ${exception?.message}`, {
exception,
body: request.body,
@@ -127,6 +129,7 @@ export class TRPCExceptionFilter implements ExceptionFilter {
url: request.url,
method: request.method,
requestId,
+ ...userContext,
});
response.status(statusCode).json({
diff --git a/apps/api/v2/src/filters/zod-exception.filter.ts b/apps/api/v2/src/filters/zod-exception.filter.ts
index 3a8bb417718..95ba3c9fe83 100644
--- a/apps/api/v2/src/filters/zod-exception.filter.ts
+++ b/apps/api/v2/src/filters/zod-exception.filter.ts
@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
import { filterReqHeaders } from "@/lib/filterReqHeaders";
import type { ArgumentsHost, ExceptionFilter } from "@nestjs/common";
import { Catch, HttpStatus, Logger } from "@nestjs/common";
@@ -18,6 +19,7 @@ export class ZodExceptionFilter implements ExceptionFilter {
const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
response.setHeader("X-Request-Id", requestId.toString());
+ const userContext = extractUserContext(request);
this.logger.error(`ZodError: ${error.message}`, {
error,
body: request.body,
@@ -25,6 +27,7 @@ export class ZodExceptionFilter implements ExceptionFilter {
url: request.url,
method: request.method,
requestId,
+ ...userContext,
});
response.status(HttpStatus.BAD_REQUEST).json({
diff --git a/apps/api/v2/src/lib/extract-user-context.ts b/apps/api/v2/src/lib/extract-user-context.ts
new file mode 100644
index 00000000000..5b2bfe8287e
--- /dev/null
+++ b/apps/api/v2/src/lib/extract-user-context.ts
@@ -0,0 +1,34 @@
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+import { ApiAuthGuardUser } from "../modules/auth/strategies/api-auth/api-auth.strategy";
+
+export interface UserContext {
+ userId?: number;
+ userEmail?: string;
+ organizationId?: number;
+ teamId?: number;
+}
+
+export function extractUserContext(request: Request): UserContext {
+ const context: UserContext = {};
+
+ const user = (request as any).user as ApiAuthGuardUser | undefined;
+ if (user) {
+ context.userId = user.id;
+ context.userEmail = user.email;
+ }
+
+ const organizationId = (request as any).organizationId as number | undefined;
+ if (organizationId) {
+ context.organizationId = organizationId;
+ }
+
+ const team = (request as any).team as Team | undefined;
+ if (team) {
+ context.teamId = team.id;
+ }
+
+ return context;
+}