From 2ebd0c026ae38a5c8043c9f56939b2f64ff20d2f Mon Sep 17 00:00:00 2001 From: Sitnikov Ivan Date: Tue, 4 Jun 2024 17:50:35 +0500 Subject: [PATCH] fix(global): INFRA-296 try to get req.id from ingress headers --- .helm | 2 +- packages/keystone/KSv5v6/v5/prepareKeystone.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.helm b/.helm index 2cda77b6d98..63764c93870 160000 --- a/.helm +++ b/.helm @@ -1 +1 @@ -Subproject commit 2cda77b6d98f4d5582f7e31051c3d64b97824a22 +Subproject commit 63764c93870db01739f829056db6aa87f782e5dd diff --git a/packages/keystone/KSv5v6/v5/prepareKeystone.js b/packages/keystone/KSv5v6/v5/prepareKeystone.js index a0d3aef9322..8c74104f6ac 100644 --- a/packages/keystone/KSv5v6/v5/prepareKeystone.js +++ b/packages/keystone/KSv5v6/v5/prepareKeystone.js @@ -198,14 +198,14 @@ function prepareKeystone ({ onConnect, extendKeystoneConfig, extendExpressApp, s app.use(function reqId (req, res, next) { console.log('request headers', JSON.stringify(req.headers)) - if (req.headers[requestIdHeaderName] !== undefined) { - console.log('found external X-Request-Id', req.headers[requestIdHeaderName]) + if (req.headers[requestIdHeaderName.toLowerCase()] !== undefined) { + console.log('found external X-Request-Id', req.headers[requestIdHeaderName.toLowerCase()]) } else { console.log('used to generate own X-Request-Id') } - const reqId = req.headers[requestIdHeaderName] || v4() - console.log('reqId ', reqId, '; Checking equality with original ', req.headers['X-Request-Id'] === reqId) + const reqId = req.headers[requestIdHeaderName.toLowerCase()] || v4() + console.log('reqId ', reqId, '; Checking equality with original ', req.headers['x-request-id'] === reqId) _internalGetExecutionContextAsyncLocalStorage().run({ reqId }, () => { // we are expecting to receive reqId from client in order to have fully traced logs end to end // also, property name are constant name, not a dynamic user input