use requestId from OpenNext

Author: Nicolas Dorseuil

packages/gitbook-v2/openNext/customWorkers/defaultWrangler.jsonc

@@ -125,7 +125,8 @@
             "vars": {
                 // This is a bit misleading, but it means that we can have 500 concurrent revalidations
                 // This means that we'll have up to 100 durable objects instance running at the same time
-                "MAX_REVALIDATE_CONCURRENCY": "100"
+                "MAX_REVALIDATE_CONCURRENCY": "100",
+                "OPEN_NEXT_REQUEST_ID_HEADER": true
             },
             "r2_buckets": [
                 {

packages/gitbook-v2/openNext/customWorkers/middlewareWrangler.jsonc

@@ -153,7 +153,8 @@
                 // TODO: remove this once the issue is fixed
                 "DEBUG_CLOUDFLARE": "true",
                 "WORKER_VERSION_ID": "TO_REPLACE",
-                "STAGE": "production"
+                "STAGE": "production",
+                "OPEN_NEXT_REQUEST_ID_HEADER": true
             },
             "routes": [
                 {

packages/gitbook-v2/src/lib/logger.ts

@@ -1,14 +1,25 @@
 import { createLogger } from '@/lib/logger';
 import { cache } from 'react';
 
+const getRequestId = (fallbackRequestId?: string) => {
+    // We are in OpenNext and we should have access to the request ID.
+    if ((globalThis as any).__openNextAls) {
+        return (globalThis as any).__openNextAls.getStore()?.requestId;
+    }
+    return fallbackRequestId;
+};
+
 // We don't want to use react cache in the edge runtime, so we use a different logger creation method.
 // It is treeshaken by Next.js.
 export const getLogger =
     process.env.NEXT_RUNTIME === 'edge'
-        ? () => createLogger('GBO', {})
+        ? () =>
+              createLogger('GBO', {
+                  requestId: getRequestId(),
+              })
         : cache(() => {
               // This is not cryptographically secure, but it's fine for logging purposes.
               // It allows us to identify logs from the same request.
-              const requestId = Math.random().toString(36).substring(2, 15);
+              const requestId = getRequestId(Math.random().toString(36).substring(2, 15));
               return createLogger('GBOV2', { requestId });
           });