chore(website,preprocessing): also log request ids when calling the b…

…ackend
loculus-project · Oct 15, 2024 · 69d9e39 · 69d9e39
1 parent 94f85c4
commit 69d9e39
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/preprocessing/nextclade/src/loculus_preprocessing/backend.py b/preprocessing/nextclade/src/loculus_preprocessing/backend.py
@@ -103,6 +103,8 @@ def fetch_unprocessed_sequences(
     }
     logging.debug(f"Requesting data with ETag: {etag}")
     response = requests.post(url, data=params, headers=headers, timeout=10)
+    logging.info(
+        f"Unprocessed data from backend: status code {response.status_code}, request id: {response.headers.get('x-request-id')}")
     match response.status_code:
         case HTTPStatus.NOT_MODIFIED:
             return etag, None
@@ -140,8 +142,8 @@ def submit_processed_sequences(
     if not response.ok:
         Path("failed_submission.json").write_text(ndjson_string, encoding="utf-8")
         msg = (
-            f"Submitting processed data failed. Status code: {
-                response.status_code}\n"
+            f"Submitting processed data failed. Status code: {response.status_code}, "
+            f"request id: {response.headers.get('x-request-id')}\n"
             f"Response: {response.text}\n"
             f"Data sent in request: {ndjson_string[0:1000]}...\n"
         )

diff --git a/website/src/services/zodiosWrapperClient.ts b/website/src/services/zodiosWrapperClient.ts
@@ -65,11 +65,18 @@ export class ZodiosWrapperClient<Api extends ZodiosEndpointDefinitions> {
 
         const message = error.message;
         if (error.response !== undefined) {
+            const requestId =
+                error.response.headers['x-request-id'] !== undefined
+                    ? `(request id ${error.response.headers['x-request-id']}) `
+                    : '';
+
             let problemDetailResponse;
             try {
                 problemDetailResponse = problemDetail.parse(this.tryToExtractProblemDetail(error.response));
             } catch (e) {
-                this.logger.error(`Unknown error from ${this.serviceName}: ${JSON.stringify(error.response.data)}`);
+                this.logger.error(
+                    `Unknown error from ${this.serviceName} ${requestId}: ${JSON.stringify(error.response.data)}`,
+                );
                 return {
                     type: 'about:blank',
                     title: error.message,
@@ -79,7 +86,7 @@ export class ZodiosWrapperClient<Api extends ZodiosEndpointDefinitions> {
                 };
             }
 
-            this.logger.info(`${message}: ${problemDetailResponse.detail}`);
+            this.logger.info(`${requestId}${message}: ${problemDetailResponse.detail}`);
             return problemDetailResponse;
         }