chore: adapt logger changes

Author: himanshusinghs

src/common/session.ts

@@ -63,7 +63,7 @@ export class Session extends EventEmitter<SessionEvents> {
                 : undefined;
 
         this.apiClient = new ApiClient({ baseUrl: apiBaseUrl, credentials }, logger);
-        this.exportsManager = new SessionExportsManager(this.sessionId, exportsManagerConfig ?? config);
+        this.exportsManager = new SessionExportsManager(this.sessionId, exportsManagerConfig ?? config, logger);
 
         this.connectionManager = connectionManager ?? new ConnectionManager();
         this.connectionManager.on("connection-succeeded", () => this.emit("connect"));

src/common/sessionExportsManager.ts

@@ -9,7 +9,7 @@ import { Transform } from "stream";
 import { pipeline } from "stream/promises";
 
 import { UserConfig } from "./config.js";
-import logger, { LogId } from "./logger.js";
+import { LoggerBase, LogId } from "./logger.js";
 
 export const jsonExportFormat = z.enum(["relaxed", "canonical"]);
 export type JSONExportFormat = z.infer<typeof jsonExportFormat>;
@@ -38,8 +38,9 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
     private exportsDirectoryPath: string;
 
     constructor(
-        private readonly sessionId: string,
-        private readonly config: SessionExportsManagerConfig
+        readonly sessionId: string,
+        private readonly config: SessionExportsManagerConfig,
+        private readonly logger: LoggerBase
     ) {
         super();
         this.exportsDirectoryPath = path.join(this.config.exportsPath, sessionId);
@@ -54,11 +55,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
             clearInterval(this.exportsCleanupInterval);
             await fs.rm(this.exportsDirectoryPath, { force: true, recursive: true });
         } catch (error) {
-            logger.error(
-                LogId.exportCloseError,
-                "Error while closing SessionExportManager",
-                error instanceof Error ? error.message : String(error)
-            );
+            this.logger.error({
+                id: LogId.exportCloseError,
+                context: "Error while closing SessionExportManager",
+                message: error instanceof Error ? error.message : String(error),
+            });
         }
     }
 
@@ -90,11 +91,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
                 content: await fs.readFile(exportPath, "utf8"),
             };
         } catch (error) {
-            logger.error(
-                LogId.exportReadError,
-                "Error when reading export",
-                error instanceof Error ? error.message : String(error)
-            );
+            this.logger.error({
+                id: LogId.exportReadError,
+                context: "Error when reading export",
+                message: error instanceof Error ? error.message : String(error),
+            });
             if ((error as NodeJS.ErrnoException).code === "ENOENT") {
                 throw new Error("Requested export does not exist!");
             }
@@ -137,11 +138,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
                 // partial and incorrect export so we remove it entirely.
                 await fs.unlink(exportFilePath).catch((error) => {
                     if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
-                        logger.error(
-                            LogId.exportCreationCleanupError,
-                            "Error when removing partial export",
-                            error instanceof Error ? error.message : String(error)
-                        );
+                        this.logger.error({
+                            id: LogId.exportCreationCleanupError,
+                            context: "Error when removing partial export",
+                            message: error instanceof Error ? error.message : String(error),
+                        });
                     }
                 });
                 throw pipelineError;
@@ -158,11 +159,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
                 }
             }
         } catch (error) {
-            logger.error(
-                LogId.exportCreationError,
-                "Error when generating JSON export",
-                error instanceof Error ? error.message : String(error)
-            );
+            this.logger.error({
+                id: LogId.exportCreationError,
+                context: "Error when generating JSON export",
+                message: error instanceof Error ? error.message : String(error),
+            });
             throw error;
         }
     }
@@ -218,11 +219,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
                 }
             }
         } catch (error) {
-            logger.error(
-                LogId.exportCleanupError,
-                "Error when cleaning up exports",
-                error instanceof Error ? error.message : String(error)
-            );
+            this.logger.error({
+                id: LogId.exportCleanupError,
+                context: "Error when cleaning up exports",
+                message: error instanceof Error ? error.message : String(error),
+            });
         } finally {
             this.exportsCleanupInProgress = false;
         }
@@ -236,11 +237,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
             // does not exist then we can safely ignore that error anything else
             // we need to flag.
             if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
-                logger.error(
-                    LogId.exportCleanupError,
-                    "Considerable error when removing export file",
-                    error instanceof Error ? error.message : String(error)
-                );
+                this.logger.error({
+                    id: LogId.exportCleanupError,
+                    context: "Considerable error when removing export file",
+                    message: error instanceof Error ? error.message : String(error),
+                });
             }
         }
     }

src/resources/common/exportedData.ts

@@ -5,7 +5,7 @@ import {
     ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { Server } from "../../server.js";
-import logger, { LogId } from "../../common/logger.js";
+import { LogId } from "../../common/logger.js";
 
 export class ExportedData {
     private readonly name = "exported-data";
@@ -57,11 +57,11 @@ export class ExportedData {
                 })),
             };
         } catch (error) {
-            logger.error(
-                LogId.exportedDataListError,
-                "Error when listing exported data resources",
-                error instanceof Error ? error.message : String(error)
-            );
+            this.server.session.logger.error({
+                id: LogId.exportedDataListError,
+                context: "Error when listing exported data resources",
+                message: error instanceof Error ? error.message : String(error),
+            });
             return {
                 resources: [],
             };
@@ -73,11 +73,11 @@ export class ExportedData {
             const sessionExports = this.server.session.exportsManager.listAvailableExports();
             return sessionExports.filter(({ name }) => name.startsWith(value)).map(({ name }) => name);
         } catch (error) {
-            logger.error(
-                LogId.exportedDataAutoCompleteError,
-                "Error when autocompleting exported data",
-                error instanceof Error ? error.message : String(error)
-            );
+            this.server.session.logger.error({
+                id: LogId.exportedDataAutoCompleteError,
+                context: "Error when autocompleting exported data",
+                message: error instanceof Error ? error.message : String(error),
+            });
             return [];
         }
     };

tests/unit/common/sessionExportsManager.test.ts

@@ -16,6 +16,7 @@ import { Session } from "../../../src/common/session.js";
 import { ROOT_DIR } from "../../accuracy/sdk/constants.js";
 import { timeout } from "../../integration/helpers.js";
 import { EJSON, EJSONOptions } from "bson";
+import { CompositeLogger } from "../../../src/common/logger.js";
 
 const exportsPath = path.join(ROOT_DIR, "tests", "tmp", "exports");
 const exportsManagerConfig: SessionExportsManagerConfig = {
@@ -76,7 +77,7 @@ describe("SessionExportsManager unit test", () => {
         await manager?.close();
         await fs.rm(exportsManagerConfig.exportsPath, { recursive: true, force: true });
         await fs.mkdir(exportsManagerConfig.exportsPath, { recursive: true });
-        session = new Session({ apiBaseUrl: "" });
+        session = new Session({ apiBaseUrl: "", logger: new CompositeLogger() });
         manager = session.exportsManager;
     });
 
@@ -282,11 +283,15 @@ describe("SessionExportsManager unit test", () => {
 
         it("should cleanup expired exports", async () => {
             const { exportName, exportPath, exportURI } = getExportNameAndPath(session.sessionId, Date.now());
-            const manager = new SessionExportsManager(session.sessionId, {
-                ...exportsManagerConfig,
-                exportTimeoutMs: 100,
-                exportCleanupIntervalMs: 50,
-            });
+            const manager = new SessionExportsManager(
+                session.sessionId,
+                {
+                    ...exportsManagerConfig,
+                    exportTimeoutMs: 100,
+                    exportCleanupIntervalMs: 50,
+                },
+                new CompositeLogger()
+            );
             await manager.createJSONExport({
                 input,
                 exportName,