chore: add userId and sessionId to logs, update meilisearch version t…

…o v1.12.0

apps/api/src/auth.ts

@@ -180,17 +180,23 @@ export const auth = betterAuth({
     // TODO: add trace ids to these logs
     // Upstash client will automatically deserialize JSON strings
     get: async (key) => {
-      logger.debug({ key, category: LogCategory.DATABASE, event: "redis_get" });
+      logger.debug(
+        { key, category: LogCategory.DATABASE, event: "redis_get" },
+        "Better auth get from redis.",
+      );
 
       return await redisClient.get(key);
     },
     set: async (key, value, ttl) => {
-      logger.debug({
-        key,
-        ttl,
-        category: LogCategory.DATABASE,
-        event: "redis_set",
-      });
+      logger.debug(
+        {
+          key,
+          ttl,
+          category: LogCategory.DATABASE,
+          event: "redis_set",
+        },
+        "Better auth set to redis.",
+      );
 
       if (ttl) {
         await redisClient.set(key, JSON.stringify(value), { ex: ttl });
@@ -199,11 +205,14 @@ export const auth = betterAuth({
       }
     },
     delete: async (key) => {
-      logger.debug({
-        key,
-        category: LogCategory.DATABASE,
-        event: "redis_delete",
-      });
+      logger.debug(
+        {
+          key,
+          category: LogCategory.DATABASE,
+          event: "redis_delete",
+        },
+        "Beter auth delete from redis.",
+      );
 
       await redisClient.del(key);
     },

apps/api/src/logger.ts

@@ -5,6 +5,8 @@ import { AsyncLocalStorage } from "async_hooks";
 
 interface TraceContext {
   traceId?: string;
+  userId?: string;
+  sessionId?: string;
   seqNum: number;
 }
 
@@ -15,7 +17,6 @@ export const getTraceContext = (): TraceContext => {
 
   if (!context) {
     return {
-      traceId: undefined,
       seqNum: 0,
     };
   }
@@ -45,6 +46,8 @@ export const logger = pino({
     return {
       traceId: context.traceId,
       seqNum: context.seqNum,
+      userId: context.userId,
+      sessionId: context.sessionId,
     };
   },
   serializers: {

apps/api/src/middleware.ts

@@ -2,7 +2,7 @@ import { NextFunction, RequestHandler, Request, Response } from "express";
 import { fromNodeHeaders } from "better-auth/node";
 import { Session, User, auth as authClient } from "./auth";
 import crypto from "crypto";
-import { traceContext } from "./logger";
+import { getTraceContext, traceContext } from "./logger";
 
 export const auth: RequestHandler = async (req, res, next) => {
   const { api } = authClient;
@@ -15,6 +15,11 @@ export const auth: RequestHandler = async (req, res, next) => {
     return res.status(401).json({ message: "Unauthorized" });
   }
 
+  const context = getTraceContext();
+
+  context.userId = user.id;
+  context.sessionId = session.id;
+
   req.user = user;
   req.session = session;
 

apps/api/src/trpc.ts

@@ -2,7 +2,7 @@ import { TRPCError, initTRPC } from "@trpc/server";
 import * as trpcExpress from "@trpc/server/adapters/express";
 import { fromNodeHeaders } from "better-auth/node";
 import { Session, User, auth } from "./auth";
-import { logger } from "./logger";
+import { getTraceContext, logger } from "./logger";
 
 // Created for each request
 export const createContext = async ({
@@ -26,8 +26,12 @@ export const createContext = async ({
     };
   }
 
+  const context = getTraceContext();
   const { session, user } = data;
 
+  context.userId = user.id;
+  context.sessionId = session.id;
+
   return {
     session,
     user,

apps/search/Dockerfile

@@ -1,4 +1,4 @@
-FROM getmeili/meilisearch:v1.3.4
+FROM getmeili/meilisearch:v1.12.0
 
 COPY ./apps/search/config.toml /etc/meilisearch/config.toml