Merged in feature/wrap-logging (pull request #2511)

Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood

apps/scandic-web/utils/clientSession.ts

@@ -1,3 +1,5 @@
+import { logger } from "@scandic-hotels/common/logger"
+
 import type { Session } from "next-auth"
 
 export function isValidClientSession(session: Session | null) {
@@ -5,16 +7,16 @@ export function isValidClientSession(session: Session | null) {
     return false
   }
   if (session.error) {
-    console.log(`Session error: ${session.error}`)
+    logger.error(`Session error: ${session.error}`)
     return false
   }
 
   if (session.token.error) {
-    console.log(`Session token error: ${session.token.error}`)
+    logger.error(`Session token error: ${session.token.error}`)
     return false
   }
   if (session.token.expires_at && session.token.expires_at < Date.now()) {
-    console.log(`Session expired: ${session.token.expires_at}`)
+    logger.error(`Session expired: ${session.token.expires_at}`)
     return false
   }
 

apps/scandic-web/utils/logger/index.ts

@@ -1,16 +0,0 @@
-export function createLogger(loggerPrefix: string | (() => Promise<string>)) {
-  const getLoggerPrefix: () => Promise<string> =
-    typeof loggerPrefix === "string" ? async () => loggerPrefix : loggerPrefix
-
-  return {
-    async debug(message: string, ...args: unknown[]): Promise<void> {
-      console.debug(`[${await getLoggerPrefix()}] ${message}`, ...args)
-    },
-    async warn(message: string, ...args: unknown[]): Promise<void> {
-      console.warn(`[${await getLoggerPrefix()}] Warning - ${message}`, ...args)
-    },
-    async error(message: string, ...args: unknown[]): Promise<void> {
-      console.error(`[${await getLoggerPrefix()}] Error - ${message}`, ...args)
-    },
-  }
-}

apps/scandic-web/utils/phone.ts

@@ -1,5 +1,7 @@
 import parsePhoneNumberFromString, { type CountryCode } from "libphonenumber-js"
 
+import { logger } from "@scandic-hotels/common/logger"
+
 export function formatPhoneNumber(
   phoneNumber: string,
   phoneNumberCC?: string | null
@@ -16,7 +18,7 @@ export function formatPhoneNumber(
     : parsePhoneNumberFromString(normalized)
 
   if (!parsedPhonenumber?.isValid()) {
-    console.warn(
+    logger.warn(
       `Invalid phone number: ${phoneNumber} with country code: ${phoneNumberCC}`,
       parsedPhonenumber
     )

apps/scandic-web/utils/tracking/base.ts

@@ -1,3 +1,5 @@
+import { logger } from "@scandic-hotels/common/logger"
+
 import { SESSION_ID_KEY_NAME } from "@/hooks/useSessionId"
 
 export function trackEvent(data: any) {
@@ -11,7 +13,7 @@ export function trackEvent(data: any) {
     try {
       sessionId = sessionStorage.getItem(SESSION_ID_KEY_NAME) ?? ""
     } catch (e) {
-      console.error("Error getting sessionId from sessionStorage", e)
+      logger.error("Error getting sessionId from sessionStorage", e)
     }
 
     data = { ...data, siteVersion: "new-web", sessionId }

apps/scandic-web/utils/url.ts

@@ -1,5 +1,6 @@
 import { z } from "zod"
 
+import { logger } from "@scandic-hotels/common/logger"
 import { BreakfastPackageEnum } from "@scandic-hotels/trpc/enums/breakfast"
 import { RoomPackageCodeEnum } from "@scandic-hotels/trpc/enums/roomFilter"
 
@@ -81,7 +82,7 @@ export function parseBookingWidgetSearchParams(
 
     return result
   } catch (error) {
-    console.log("[URL] Error parsing search params for booking widget:", error)
+    logger.error("[URL] Error parsing search params for booking widget:", error)
     return {}
   }
 }
@@ -118,7 +119,7 @@ export function parseSelectHotelSearchParams(
 
     return result
   } catch (error) {
-    console.log("[URL] Error parsing search params for select hotel:", error)
+    logger.error("[URL] Error parsing search params for select hotel:", error)
 
     return null
   }
@@ -168,7 +169,7 @@ export function parseSelectRateSearchParams(
 
     return result
   } catch (error) {
-    console.log("[URL] Error parsing search params for select rate:", error)
+    logger.error("[URL] Error parsing search params for select rate:", error)
 
     return null
   }
@@ -216,7 +217,7 @@ export function parseDetailsSearchParams(
 
     return result
   } catch (error) {
-    console.log("[URL] Error parsing search params for details:", error)
+    logger.error("[URL] Error parsing search params for details:", error)
 
     return null
   }