[server] also log the actual request name (#18812)

gitpod-io · Sep 27, 2023 · e393546 · e393546
1 parent ec8ca77
commit e393546
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/components/server/src/server.ts b/components/server/src/server.ts
@@ -144,7 +144,7 @@ export class Server {
         app.use(async (req: express.Request, res: express.Response, next: express.NextFunction) => {
             try {
                 const userId = req.user ? req.user.id : undefined;
-                await runWithContext("http", { userId }, () => next());
+                await runWithContext("http", { userId, requestPath: req.path }, () => next());
             } catch (err) {
                 next(err);
             }

diff --git a/components/server/src/util/log-context.ts b/components/server/src/util/log-context.ts
@@ -32,7 +32,7 @@ LogContext.setAugmenter(augmenter);
 
 export async function runWithContext<T>(
     contextKind: string,
-    context: LogContext & { contextId?: string },
+    context: LogContext & { contextId?: string } & any,
     fun: () => T,
 ): Promise<T> {
     return asyncLocalStorage.run(

diff --git a/components/server/src/websocket/websocket-connection-manager.ts b/components/server/src/websocket/websocket-connection-manager.ts
@@ -382,6 +382,7 @@ class GitpodJsonRpcProxyFactory<T extends object> extends JsonRpcProxyFactory<T>
             {
                 userId,
                 contextId: requestId,
+                method,
             },
             () => {
                 try {
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     userId,
                     contextId: requestId,
+                    method,
                 },
                 () => {
                     try {
@@ Expand Down @@