Skip to content

feat(log): Log the request id sent with the request #52782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 2 commits into from
May 14, 2025
Merged

feat(log): Log the request id sent with the request #52782

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c25654
feat(log): Log the request id sent with the request
come-nc May 13, 2025
2b4bfcc
fix(log): Only log client request id if present, and at the end
come-nc May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(log): Only log client request id if present, and at the end 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
@come-nc
come-nc committed May 13, 2025
commit 2b4bfcc21280b6c2bbc7e8d2d4c4b766b4d344e3
6 changes: 4 additions & 2 deletions lib/private/Log/LogDetails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,8 @@ public function logDetails(string $app, $message, int $level): array {
$userAgent = '--';
}
$version = $this->config->getValue('version', '');
$clientReqId = $request->getHeader('X-Request-Id');
$entry = compact(
'reqId',
'clientReqId',
'level',
'time',
'remoteAddr',
Expand All @@ -61,6 +59,10 @@ public function logDetails(string $app, $message, int $level): array {
'userAgent',
'version'
);
$clientReqId = $request->getHeader('X-Request-Id');
if ($clientReqId !== '') {
$entry['clientReqId'] = $clientReqId;
}

if (is_array($message)) {
// Exception messages are extracted and the exception is put into a separate field
Expand Down
Loading