chore: add CR fixes

Author: bartoszherba

packages/logger/__tests__/unit/consolaStructuredLogger.spec.ts

@@ -12,7 +12,7 @@ describe("createConsolaStructuredLogger", () => {
   const logData: LogData = "Test log message";
   const metadata: Metadata = { userId: "12345" };
 
-  it("should create a logger with the correct set of methods", () => {
+  it("it creates a logger with the correct set of methods", () => {
     const logger = createConsolaStructuredLogger(mockStructuredLog);
 
     expect(logger).toHaveProperty("emergency");
@@ -25,7 +25,7 @@ describe("createConsolaStructuredLogger", () => {
     expect(logger).toHaveProperty("debug");
   });
 
-  it("should log at the correct level", () => {
+  it("it logs at the correct level", () => {
     const logger = createConsolaStructuredLogger(mockStructuredLog);
 
     const infoSpy = jest.spyOn(logger, "info").mockImplementation(() => {});

packages/logger/src/ConsolaStructuredLogger.ts

@@ -1,4 +1,4 @@
-import { ConsolaOptions, ConsolaReporter, createConsola } from "consola";
+import { ConsolaOptions, createConsola } from "consola";
 
 import dotenv from "dotenv";
 import { LogLevel } from "./interfaces/LogLevel";
@@ -37,22 +37,24 @@ const createConsolaStructuredLogger = (
     debug: 4,
   };
 
-  const jsonReporter: ConsolaReporter = {
-    log: (logObject) => {
-      if (
-        process.env.NODE_ENV === "development" ||
-        typeof window !== "undefined"
-      ) {
-        console.log(logObject.args[0].structuredLog);
-      } else {
-        console.log(JSON.stringify(logObject.args[0].structuredLog));
-      }
-    },
+  const buildJsonReporter = () => {
+    return {
+      log: (logObject) => {
+        if (
+          process.env.NODE_ENV === "development" ||
+          typeof window !== "undefined"
+        ) {
+          console.log(logObject.args[0].structuredLog);
+        } else {
+          console.log(JSON.stringify(logObject.args[0].structuredLog));
+        }
+      },
+    };
   };
 
   const logger = createConsola({
     level: levelMap?.[options.level] ?? levelMap.info,
-    reporters: [jsonReporter],
+    reporters: options.reporters || [buildJsonReporter()],
   });
 
   if (options.reporters) {
@@ -75,6 +77,11 @@ const createConsolaStructuredLogger = (
       metadata
     );
 
+    /**
+     * Map the log level to the consola level
+     * Our log levels are more granular than consola's log levels
+     * and we need to map them to the closest consola level
+     */
     const consolaLevel = mapToConsolaLevel(level);
 
     switch (consolaLevel) {

packages/logger/src/structuredLog/GCPStructuredLog.ts

@@ -1,5 +1,5 @@
 import {
-  removeAnsiCodesFromStr as defaultRemoveAnsiCodes,
+  removeAnsiColorCodesFromStr as defaultRemoveAnsiCodes,
   type RemoveAnsiCode,
 } from "../utils/removeAnsiCodes";
 import type { LogData, Metadata } from "../interfaces/LoggerInterface";
@@ -40,7 +40,7 @@ export class GCPStructuredLog implements StructuredLog {
   };
 
   /**
-   * The function to remove ANSI codes from the log message.
+   * The function to remove ANSI color codes from the log message.
    */
   private removeAnsiCodes: RemoveAnsiCode;
 

packages/logger/src/utils/removeAnsiCodes.ts

@@ -1,6 +1,6 @@
 export type RemoveAnsiCode = (str: string) => string;
 
-export const removeAnsiCodesFromStr: RemoveAnsiCode = (str) => {
+export const removeAnsiColorCodesFromStr: RemoveAnsiCode = (str) => {
   // eslint-disable-next-line no-control-regex
   const ansiRegex = /\x1B\[[0-?9;]*[mK]/g;
 

packages/middleware/src/handlers/prepareApiFunction/index.ts

@@ -22,6 +22,12 @@ export function prepareApiFunction(
         extensionName,
         functionName,
       },
+      errorBoundary: {
+        scope: {
+          integrationName,
+          functionName,
+        },
+      },
     };
 
     const {

packages/middleware/src/integrations/registerIntegrations.ts

@@ -43,6 +43,7 @@ async function triggerExtendAppHook(
       const loggerWithMetadata = injectMetadata(logger, () => ({
         scope: {
           extensionName: name,
+          type: "hook",
           hookName: "extendApp",
         },
       }));