🚧 Zwico

Author: kevinkoessl

src/middlewares/extract-header.middleware.ts

@@ -1,8 +1,11 @@
 import { NextFunction, Response } from 'express';
 import { BridgeRequest } from '../models';
+import { AsyncLocalStorage } from 'async_hooks';
 
 const DEFAULT_LOCALE = 'de-DE';
 
+export const integrationIdStorage = new AsyncLocalStorage<string>();
+
 export function extractHeaderMiddleware(
   req: BridgeRequest<any>,
   res: Response,
@@ -20,5 +23,5 @@ export function extractHeaderMiddleware(
     locale,
   };
 
-  next();
+  integrationIdStorage.run(userId, () => next());
 }

src/util/logger.util.ts

@@ -1,6 +1,8 @@
-import { anonymizeKey } from './anonymize-key';
 import { context, trace } from '@opentelemetry/api';
 
+import { anonymizeKey } from './anonymize-key';
+import { integrationIdStorage } from '../middlewares';
+
 function addMessageToTraceSpan(
   method: 'log' | 'error' | 'warn',
   message: string,
@@ -20,75 +22,75 @@ function addMessageToTraceSpan(
  * @param source the context where the log originated from (usually the function name)
  * @param message the message of the log
  * @param apiKey the refreshToken
- * @param integrationUserId platypus user id
  * @param args additional data, will be stringified and appended
  */
 export const infoLogger = (
   source: string,
   message: string,
   apiKey?: string,
-  integrationUserId?: string,
   ...args: unknown[]
 ): void => {
-  addMessageToTraceSpan('log', message, [...args, integrationUserId]);
+  const userId = integrationIdStorage.getStore();
 
-  logger(console.info, source, message, apiKey, integrationUserId, ...args);
+  addMessageToTraceSpan('log', message, [...args, userId]);
+
+  logger(console.info, source, message, apiKey, ...args);
 };
 
 /**
  * Logging function equivalent to console.error
  * @param source the context where the log originated from (usually the function name)
  * @param message the message of the log
  * @param apiKey the refreshToken
- * @param integrationUserId platypus user id
  * @param args additional data, will be stringified and appended
  */
 export const errorLogger = (
   source: string,
   message: string,
   apiKey?: string,
-  integrationUserId?: string,
   ...args: unknown[]
 ): void => {
-  addMessageToTraceSpan('error', message, [...args, integrationUserId]);
+  const userId = integrationIdStorage.getStore();
+
+  addMessageToTraceSpan('error', message, [...args, userId]);
 
-  logger(console.error, source, message, apiKey, integrationUserId, ...args);
+  logger(console.error, source, message, apiKey, ...args);
 };
 
 /**
  * Logging function equivalent to console.warn
  * @param source the context where the log originated from (usually the function name)
  * @param message the message of the log
  * @param apiKey the refreshToken
- * @param integrationUserId platypus user id
  * @param args additional data, will be stringified and appended
  */
 export const warnLogger = (
   source: string,
   message: string,
   apiKey?: string,
-  integrationUserId?: string,
   ...args: unknown[]
 ): void => {
-  addMessageToTraceSpan('warn', message, [...args, integrationUserId]);
+  const userId = integrationIdStorage.getStore();
+
+  addMessageToTraceSpan('warn', message, [...args, userId]);
 
-  logger(console.warn, source, message, apiKey, integrationUserId, ...args);
+  logger(console.warn, source, message, apiKey, ...args);
 };
 
 const logger = (
   logFn: (message?: any, ...optionalParams: any[]) => void,
   source: string,
   message: string,
   apiKey: string | undefined,
-  integrationUserId: string | undefined,
   ...args: unknown[]
 ): void => {
   // eslint-disable-next-line no-console
   const anonymizedApiKey = apiKey ? anonymizeKey(apiKey) : undefined;
+  const userId = integrationIdStorage.getStore();
 
   const formatedMessage = constructLogMessage(
     anonymizedApiKey ? `[${anonymizedApiKey}]` : undefined,
-    integrationUserId ? `[${integrationUserId}]` : undefined,
+    userId ? `[${userId}]` : undefined,
     `[${source}]`,
     message,
   );
@@ -99,7 +101,7 @@ const logger = (
     logFn(
       JSON.stringify({
         message: formatedMessage,
-        data: { ...args, integrationUserId },
+        data: { ...args, integrationUserId: userId },
       }),
     );
   }