Add logging source

.github/workflows/presubmits.yml

@@ -7,6 +7,7 @@ on: [pull_request]
 jobs:
     prettier-check:
         runs-on: ubuntu-latest
+        if: ${{ !github.event.pull_request.draft }}
 
         steps:
             - name: Checkout code
@@ -28,6 +29,7 @@ jobs:
               run: pnpm run format-check
     builder:
         runs-on: ubuntu-latest
+        if: ${{ !github.event.pull_request.draft }}
 
         steps:
             - name: Checkout code

apps/api/src/lib/functions/database.ts

@@ -1,6 +1,6 @@
 import { userToTeam, db, and, eq, log, team, teamJoinRequest } from "db";
 import type { UserType, SiteRoleType } from "db/types";
-import type { LoggingOptions, LoggingType } from "../types";
+import type { LoggingOptions, LoggingType, LoggingSource } from "../types";
 import { type Context } from "hono";
 import { isInDevMode } from ".";
 
@@ -125,7 +125,8 @@ export async function isUserSiteAdminOrQueryHasPermissions<T = unknown>(
  */
 export async function logError(message: string, c?: Context) {
 	const options = getAllContextValues(c);
-	await logToDb("ERROR", message, options);
+	const source = getLoggingSourceFromContext(c);
+	await logToDb("ERROR", message, source, options);
 }
 
 /**
@@ -135,7 +136,8 @@ export async function logError(message: string, c?: Context) {
  */
 export async function logInfo(message: string, c?: Context) {
 	const options = getAllContextValues(c);
-	await logToDb("INFO", message, options);
+	const source = getLoggingSourceFromContext(c);
+	await logToDb("INFO", message, source, options);
 }
 
 /**
@@ -145,7 +147,8 @@ export async function logInfo(message: string, c?: Context) {
  */
 export async function logWarning(message: string, c?: Context) {
 	const options = getAllContextValues(c);
-	await logToDb("WARNING", message, options);
+	const source = getLoggingSourceFromContext(c);
+	await logToDb("WARNING", message, source, options);
 }
 
 /**
@@ -156,19 +159,24 @@ export async function logWarning(message: string, c?: Context) {
  * @param options - Optional logging metadata (user ID, team ID, route, request ID)
  */
 export async function logToDb(
-	loggingType: LoggingType,
+	logType: LoggingType,
 	message: string,
+	source: LoggingSource,
 	options?: LoggingOptions,
 ) {
 	if (isInDevMode()) {
-		console.log(`[${loggingType}] - ${message} - Options: `, options);
+		console.log(
+			`[${logType}] from ${source} - ${message} - Options: `,
+			options,
+		);
 		return;
 	}
 	try {
 		await db.insert(log).values({
 			...options,
-			logType: loggingType,
+			logType,
 			message,
+			source,
 		});
 	} catch (e) {
 		// Silently fail if logging to the db fails.
@@ -194,6 +202,14 @@ function getAllContextValues(c?: Context): LoggingOptions | undefined {
 	};
 }
 
+function getLoggingSourceFromContext(c?: Context): LoggingSource {
+	if (!c) {
+		return "SERVER";
+	}
+
+	return "SERVER";
+}
+
 /**
  * Safely extract an error code string from an unknown thrown value from a db error.
  * Returns the code as a string when present, otherwise null.

apps/api/src/lib/functions/middleware.ts

@@ -6,6 +6,7 @@ import type { ApiContext } from "../types";
 import { API_ERROR_MESSAGES } from "shared";
 
 export const MIDDLEWARE_PUBLIC_ROUTES = ["/health", "/api/auth"];
+
 /**
  * Middleware to set user and session context for each request. This middleware checks the authentication status of the incoming request, retrieves the user session if it exists, and sets relevant information in the context for downstream handlers to use. It also logs the request path and authentication status for monitoring purposes.
  * @param c - The Hono context object

apps/api/src/lib/types.ts

@@ -15,7 +15,9 @@ export type ApiContext = Context<{
 
 export type LoggingOptions = Omit<
 	typeof log.$inferInsert,
-	"id" | "occurredAt" | "logType" | "message"
+	"id" | "occurredAt" | "logType" | "message" | "source"
 >;
 // Single type representing the logType value (e.g. "INFO" | "WARNING" | "ERROR")
 export type LoggingType = (typeof log.$inferSelect)["logType"];
+
+export type LoggingSource = (typeof log.$inferSelect)["source"];

packages/db/drizzle/0012_lumpy_the_anarchist.sql

@@ -0,0 +1 @@
+ALTER TABLE `log` ADD `source` text NOT NULL;