rename fastlyRequestId to requestId (#13266)

Author: marjisound

dotcom-rendering/src/server/lib/logging-middleware.ts

@@ -34,7 +34,7 @@ export const requestLoggerMiddleware: RequestHandler = (req, res, next) => {
 			path: req.path,
 			method: req.method,
 		},
-		fastlyRequestId: requestId ?? 'fastly-id-not-provided',
+		requestId: requestId ?? 'request-id-not-provided',
 		timing: {},
 		abTests: hasConfig(req.body)
 			? JSON.stringify(req.body.config.abTests)

dotcom-rendering/src/server/lib/logging-store.ts

@@ -19,7 +19,7 @@ type DCRLoggingStore = {
 		type?: string;
 		platform?: string;
 	};
-	fastlyRequestId: string;
+	requestId: string;
 	abTests: string;
 	error?: {
 		message?: string;

dotcom-rendering/src/server/lib/logging.ts

@@ -12,7 +12,7 @@ const logLocation =
 		: `${path.resolve('logs')}/${logName}`;
 
 const logFields = (logEvent: LoggingEvent): unknown => {
-	const { request, fastlyRequestId, abTests } = loggingStore.getStore() ?? {
+	const { request, requestId, abTests } = loggingStore.getStore() ?? {
 		request: { pageId: 'outside-request-context' },
 	};
 
@@ -28,7 +28,7 @@ const logFields = (logEvent: LoggingEvent): unknown => {
 		level: logEvent.level.levelStr,
 		level_value: logEvent.level.level,
 		request,
-		fastlyRequestId,
+		requestId,
 		abTests,
 		// NODE_APP_INSTANCE is set by cluster mode
 		thread_name: process.env.NODE_APP_INSTANCE ?? '0',