[server] register ctx log augmenter

Author: geropl

components/server/src/init.ts

@@ -59,11 +59,13 @@ import { TracingManager } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { TypeORM } from "@gitpod/gitpod-db/lib";
 import { dbConnectionsEnqueued, dbConnectionsFree, dbConnectionsTotal } from "./prometheus-metrics";
 import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
+import { installCtxLogAugmenter } from "./util/log-context";
 if (process.env.NODE_ENV === "development") {
     require("longjohn");
 }
 
 log.enableJSONLogging("server", process.env.VERSION, LogrusLogLevel.getFromEnv());
+installCtxLogAugmenter();
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
 (async () => {

components/server/src/util/log-context.ts

@@ -26,17 +26,19 @@ function mapToLogContext(ctx: RequestContext): LogContextOptions {
 
 // we are installing a special augmenter that enhances the log context if executed within `runWithContext`
 // with a contextId and a contextTimeMs, which denotes the amount of milliseconds since the context was created.
-const augmenter: LogContext.Augmenter = (ctx) => {
-    const requestContext = ctxTryGet();
-    let derivedContext: LogContextOptions = {};
-    if (requestContext) {
-        derivedContext = mapToLogContext(requestContext);
-    }
-    const result = {
-        ...derivedContext,
-        ...ctx,
+export function installCtxLogAugmenter() {
+    const augmenter: LogContext.Augmenter = (ctx) => {
+        const requestContext = ctxTryGet();
+        let derivedContext: LogContextOptions = {};
+        if (requestContext) {
+            derivedContext = mapToLogContext(requestContext);
+        }
+        const result = {
+            ...derivedContext,
+            ...ctx,
+        };
+        // if its an empty object return undefined
+        return Object.keys(result).length === 0 ? undefined : result;
     };
-    // if its an empty object return undefined
-    return Object.keys(result).length === 0 ? undefined : result;
-};
-LogContext.setAugmenter(augmenter);
+    LogContext.setAugmenter(augmenter);
+}