[log] log requestId

Author: svenefftinge

components/gitpod-protocol/src/util/logging.ts

@@ -15,12 +15,23 @@ let version: string | undefined;
 
 export interface LogContext {
     organizationId?: string;
+    requestId?: string;
     sessionId?: string;
     userId?: string;
     workspaceId?: string;
     instanceId?: string;
 }
+
+/**
+ * allows to globally augment the log context, default is an identity function
+ */
+let logContextAugmenter: LogContext.Augmenter = (context) => context;
+
 export namespace LogContext {
+    export type Augmenter = (context: LogContext | undefined) => LogContext | undefined;
+    export function setAugmenter(augmenter: Augmenter): void {
+        logContextAugmenter = augmenter;
+    }
     export function from(params: { userId?: string; user?: any; request?: any }) {
         return <LogContext>{
             sessionId: params.request?.requestID,
@@ -306,6 +317,7 @@ function makeLogItem(
     if (context !== undefined && Object.keys(context).length == 0) {
         context = undefined;
     }
+    context = logContextAugmenter(context);
     context = scrubPayload(context, plainLogging);
 
     let reportedErrorEvent: {} = {};

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

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2023 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { LogContext } from "@gitpod/gitpod-protocol/lib/util/logging";
+import { AsyncLocalStorage } from "node:async_hooks";
+
+// we are installing a special augmenter that sets userId, sessionId and requestId if they are not set.
+
+const asyncLocalStorage = new AsyncLocalStorage<LogContext>();
+const augmenter: LogContext.Augmenter = (ctx) => {
+    const globalContext = asyncLocalStorage.getStore();
+    return {
+        ...globalContext,
+        ...ctx,
+    };
+};
+LogContext.setAugmenter(augmenter);
+
+export async function runWithContext<T>(context: LogContext, fun: () => T): Promise<T> {
+    return asyncLocalStorage.run(context, fun);
+}

components/server/src/websocket/websocket-connection-manager.ts

@@ -49,6 +49,8 @@ import * as opentracing from "opentracing";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { GitpodHostUrl } from "@gitpod/gitpod-protocol/lib/util/gitpod-host-url";
 import { maskIp } from "../analytics";
+import { runWithContext } from "../util/log-context";
+import { v4 } from "uuid";
 
 export type GitpodServiceFactory = () => GitpodServerImpl;
 
@@ -373,6 +375,19 @@ class GitpodJsonRpcProxyFactory<T extends object> extends JsonRpcProxyFactory<T>
     }
 
     protected async onRequest(method: string, ...args: any[]): Promise<any> {
+        const userId = this.clientMetadata.userId;
+        return runWithContext(
+            {
+                requestId: v4(),
+                userId,
+            },
+            () => {
+                return this.internalOnRequest(method, ...args);
+            },
+        );
+    }
+
+    private async internalOnRequest(method: string, ...args: any[]): Promise<any> {
         const span = TraceContext.startSpan(method, undefined);
         const ctx = { span };
         const userId = this.clientMetadata.userId;