Improve/fix checks (#2727)

* Improve checks logging * fix scrub check * Monitor on error
dust-tt · Nov 30, 2023 · a025a23 · a025a23
1 parent 822a880
commit a025a23
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 33 deletions.
diff --git a/front/production_checks/checks/managed_data_source_gdrive_gc.ts b/front/production_checks/checks/managed_data_source_gdrive_gc.ts
@@ -63,11 +63,13 @@ export const managedDataSourceGCGdriveCheck: CheckFunction = async (
     );
     if (notDeleted.length > 0) {
       reportFailure(
-        { notDeleted },
+        { notDeleted, connectorId: ds.connectorId },
         "Google Drive documents not properly Garbage collected"
       );
     } else {
-      reportSuccess({});
+      reportSuccess({
+        connectorId: ds.connectorId,
+      });
     }
   }
 };
diff --git a/front/production_checks/checks/scrub_deleted_core_document_versions.ts b/front/production_checks/checks/scrub_deleted_core_document_versions.ts
@@ -33,9 +33,12 @@ export const scrubDeletedCoreDocumentVersionsCheck: CheckFunction = async (
     hash: string;
   }[];
 
-  logger.info("Found deleted core documents to scrub", {
-    documentCount: deletedDocuments.length,
-  });
+  logger.info(
+    {
+      documentCount: deletedDocuments.length,
+    },
+    "Found deleted core documents to scrub"
+  );
 
   const chunks = [];
   for (let i = 0; i < deletedDocuments.length; i += 32) {
@@ -46,10 +49,6 @@ export const scrubDeletedCoreDocumentVersionsCheck: CheckFunction = async (
   let deletedCount = 0;
 
   for (let i = 0; i < chunks.length; i++) {
-    logger.info("Processing chunk", {
-      chunkIndex: i,
-      chunksCount: chunks.length,
-    });
     const chunk = chunks[i];
     await Promise.all(
       chunk.map((d) => {
@@ -71,11 +70,16 @@ export const scrubDeletedCoreDocumentVersionsCheck: CheckFunction = async (
     );
   }
 
-  logger.info("Done scrubbing deleted core document versions", {
+  logger.info(
+    {
+      deletedCount,
+    },
+    "Done scrubbing deleted core document versions"
+  );
+
+  reportSuccess({
     deletedCount,
   });
-
-  reportSuccess({});
 };
 
 async function scrubDocument(
@@ -151,14 +155,18 @@ async function scrubDocument(
   await Promise.all(
     files.map((f) => {
       if (!seen.has(f.name)) {
-        logger.info("Scrubbing", {
-          path: f.name,
-          documentId: document_id,
-          documentHash: hash,
-          dataSourceProject: dataSource.project,
-          dataSourceInternalId: dataSource.internal_id,
-          dataSourceId: dataSource.id,
-        });
+        seen.add(f.name);
+        logger.info(
+          {
+            path: f.name,
+            documentId: document_id,
+            documentHash: hash,
+            dataSourceProject: dataSource.project,
+            dataSourceInternalId: dataSource.internal_id,
+            dataSourceId: dataSource.id,
+          },
+          "Scrubbing"
+        );
 
         return f.delete();
       }
@@ -176,18 +184,18 @@ async function scrubDocument(
     }
   );
 
-  logger.info("Scrubbed deleted versions", {
-    documentId: document_id,
-    documentHash: hash,
-    dataSourceProject: dataSource.project,
-    dataSourceInternalId: dataSource.internal_id,
-    dataSourceId: dataSource.id,
-    filesCount: files.length,
-  });
+  logger.info(
+    {
+      documentId: document_id,
+      documentHash: hash,
+      dataSourceProject: dataSource.project,
+      dataSourceInternalId: dataSource.internal_id,
+      dataSourceId: dataSource.id,
+      filesCount: files.length,
+    },
+    "Scrubbed deleted versions"
+  );
 
-  files.forEach((f) => {
-    seen.add(f.name);
-  });
   seen.add(uid);
 
   return true;

diff --git a/front/production_checks/temporal/activities.ts b/front/production_checks/temporal/activities.ts
@@ -34,7 +34,7 @@ async function runAllChecks(checks: Check[]) {
   for (const check of checks) {
     const uuid = uuidv4();
     const logger = mainLogger.child({
-      name: check.name,
+      checkName: check.name,
       uuid,
     });
     try {
@@ -75,7 +75,7 @@ async function runAllChecks(checks: Check[]) {
         logger.info("Check done");
       }
     } catch (e) {
-      logger.error({ error: e }, "Check failed");
+      logger.error({ error: e }, "Production check failed");
     }
   }
   mainLogger.info({ uuid: allCheckUuid }, "Done running all checks");