fix(log): Only log client request id if present, and at the end

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/private/Log/LogDetails.php

@@ -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',
@@ -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