@oneuptime/common 10.0.53 → 10.0.54

package/Server/Services/ScheduledMaintenanceService.ts

@@ -40,7 +40,7 @@ import StatusPageService from "../../Server/Services/StatusPageService";
 import StatusPageSubscriberService from "../../Server/Services/StatusPageSubscriberService";
 import QueryHelper from "../../Server/Types/Database/QueryHelper";
 import Markdown, { MarkdownContentType } from "../../Server/Types/Markdown";
-import logger from "../../Server/Utils/Logger";
+import logger, { LogAttributes } from "../../Server/Utils/Logger";
 import StatusPage from "../../Models/DatabaseModels/StatusPage";
 import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource";
 import StatusPageSubscriber from "../../Models/DatabaseModels/StatusPageSubscriber";
@@ -92,6 +92,10 @@ export class Service extends DatabaseService<Model> {
       logger.debug(
         "ScheduledMaintenance:SendSubscriberRemindersOnEventScheduled: Sending notification for event: " +
           event.id,
+        {
+          projectId: event.projectId?.toString(),
+          scheduledMaintenanceId: event.id?.toString(),
+        } as LogAttributes,
       );
 
       let statusPageResources: Array<StatusPageResource> = [];
@@ -288,7 +292,9 @@ export class Service extends DatabaseService<Model> {
               statusPageId: statuspage.id!,
               scheduledMaintenanceId: event.id!,
             }).catch((err: Error) => {
-              logger.error(err);
+              logger.error(err, {
+                projectId: statuspage.projectId?.toString(),
+              } as LogAttributes);
             });
           }
 
@@ -320,7 +326,9 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
               url: subscriber.slackIncomingWebhookUrl,
               text: SlackUtil.convertMarkdownToSlackRichText(slackMessage),
             }).catch((err: Error) => {
-              logger.error(err);
+              logger.error(err, {
+                projectId: statuspage.projectId?.toString(),
+              } as LogAttributes);
             });
           }
 
@@ -398,7 +406,9 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
                   scheduledMaintenanceId: event.id!,
                 },
               ).catch((err: Error) => {
-                logger.error(err);
+                logger.error(err, {
+                  projectId: statuspage.projectId?.toString(),
+                } as LogAttributes);
               });
             } else {
               // Use default hard-coded template
@@ -421,7 +431,9 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
                   scheduledMaintenanceId: event.id!,
                 },
               ).catch((err: Error) => {
-                logger.error(err);
+                logger.error(err, {
+                  projectId: statuspage.projectId?.toString(),
+                } as LogAttributes);
               });
             }
           }
@@ -815,6 +827,10 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
         } catch (error) {
           logger.error(
             `Workspace operations failed in ScheduledMaintenanceService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              scheduledMaintenanceId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -827,6 +843,10 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
         } catch (error) {
           logger.error(
             `Create scheduled maintenance feed failed in ScheduledMaintenanceService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              scheduledMaintenanceId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -839,6 +859,10 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
         } catch (error) {
           logger.error(
             `Create scheduled maintenance state timeline failed in ScheduledMaintenanceService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              scheduledMaintenanceId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -869,6 +893,10 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
         } catch (error) {
           logger.error(
             `Add owners failed in ScheduledMaintenanceService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              scheduledMaintenanceId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -876,6 +904,10 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
       .catch((error: Error) => {
         logger.error(
           `Critical error in ScheduledMaintenanceService sequential operations: ${error}`,
+          {
+            projectId: createdItem.projectId?.toString(),
+            scheduledMaintenanceId: createdItem.id?.toString(),
+          } as LogAttributes,
         );
       });
 
@@ -921,6 +953,10 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
     } catch (error) {
       logger.error(
         `Error in handleScheduledMaintenanceWorkspaceOperationsAsync: ${error}`,
+        {
+          projectId: createdItem.projectId?.toString(),
+          scheduledMaintenanceId: createdItem.id?.toString(),
+        } as LogAttributes,
       );
       throw error;
     }
@@ -991,7 +1027,10 @@ ${scheduledMaintenance.description || "No description provided."}
         },
       });
     } catch (error) {
-      logger.error(`Error in createScheduledMaintenanceFeedAsync: ${error}`);
+      logger.error(`Error in createScheduledMaintenanceFeedAsync: ${error}`, {
+        projectId: scheduledMaintenance.projectId?.toString(),
+        scheduledMaintenanceId: scheduledMaintenance.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -1026,6 +1065,10 @@ ${scheduledMaintenance.description || "No description provided."}
     } catch (error) {
       logger.error(
         `Error in createScheduledMaintenanceStateTimelineAsync: ${error}`,
+        {
+          projectId: createdItem.projectId?.toString(),
+          scheduledMaintenanceId: createdItem.id?.toString(),
+        } as LogAttributes,
       );
       throw error;
     }
@@ -1888,6 +1931,9 @@ ${labels
       });
       logger.info(
         `Updated ScheduledMaintenance ${scheduledMaintenance.id} current state to ${latestTimeline.scheduledMaintenanceStateId}`,
+        {
+          projectId: scheduledMaintenance.projectId?.toString(),
+        } as LogAttributes,
       );
     }
   }

package/Server/Services/ScheduledMaintenanceStateTimelineService.ts

@@ -26,7 +26,7 @@ import ScheduledMaintenanceStateTimeline from "../../Models/DatabaseModels/Sched
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService";
 import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
@@ -104,7 +104,10 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
           namespace: "ScheduledMaintenanceStateTimeline.create",
         });
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          scheduledMaintenanceId:
+            createBy.data.scheduledMaintenanceId?.toString(),
+        } as LogAttributes);
       }
 
       if (!createBy.data.startsAt) {
@@ -292,7 +295,11 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
         try {
           await Semaphore.release(mutex);
         } catch (err) {
-          logger.error(err);
+          logger.error(err, {
+            projectId: createBy.data.projectId?.toString(),
+            scheduledMaintenanceId:
+              createBy.data.scheduledMaintenanceId?.toString(),
+          } as LogAttributes);
         }
       }
 
@@ -317,14 +324,32 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
 
     // update the last status as ended.
 
-    logger.debug("Status Timeline Before this");
-    logger.debug(onCreate.carryForward.statusTimelineBeforeThisStatus);
-
-    logger.debug("Status Timeline After this");
-    logger.debug(onCreate.carryForward.statusTimelineAfterThisStatus);
-
-    logger.debug("Created Item");
-    logger.debug(createdItem);
+    logger.debug("Status Timeline Before this", {
+      projectId: createdItem.projectId?.toString(),
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineBeforeThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Status Timeline After this", {
+      projectId: createdItem.projectId?.toString(),
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineAfterThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Created Item", {
+      projectId: createdItem.projectId?.toString(),
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+    } as LogAttributes);
+    logger.debug(createdItem, {
+      projectId: createdItem.projectId?.toString(),
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+    } as LogAttributes);
 
     /*
      * now there are three cases.
@@ -332,7 +357,10 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
      */
     if (!onCreate.carryForward.statusTimelineBeforeThisStatus) {
       // This is the first status, no need to update previous status.
-      logger.debug("This is the first status.");
+      logger.debug("This is the first status.", {
+        projectId: createdItem.projectId?.toString(),
+        scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+      } as LogAttributes);
     } else if (!onCreate.carryForward.statusTimelineAfterThisStatus) {
       /*
        * 2. This is the last status.
@@ -347,7 +375,10 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
           isRoot: true,
         },
       });
-      logger.debug("This is the last status.");
+      logger.debug("This is the last status.", {
+        projectId: createdItem.projectId?.toString(),
+        scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+      } as LogAttributes);
     } else {
       /*
        * 3. This is in the middle.
@@ -373,7 +404,10 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
           isRoot: true,
         },
       });
-      logger.debug("This status is in the middle.");
+      logger.debug("This status is in the middle.", {
+        projectId: createdItem.projectId?.toString(),
+        scheduledMaintenanceId: createdItem.scheduledMaintenanceId?.toString(),
+      } as LogAttributes);
     }
 
     if (!createdItem.endsAt) {
@@ -393,7 +427,11 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
       try {
         await Semaphore.release(mutex);
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createdItem.projectId?.toString(),
+          scheduledMaintenanceId:
+            createdItem.scheduledMaintenanceId?.toString(),
+        } as LogAttributes);
       }
     }
 
@@ -583,8 +621,16 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
           ).toString()})** is complete. Archiving channel.`,
         },
       }).catch((error: Error) => {
-        logger.error(`Error while archiving workspace channels:`);
-        logger.error(error);
+        logger.error(`Error while archiving workspace channels:`, {
+          projectId: createdItem.projectId?.toString(),
+          scheduledMaintenanceId:
+            createdItem.scheduledMaintenanceId?.toString(),
+        } as LogAttributes);
+        logger.error(error, {
+          projectId: createdItem.projectId?.toString(),
+          scheduledMaintenanceId:
+            createdItem.scheduledMaintenanceId?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -796,7 +842,9 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
 
         if (!stateBeforeThis) {
           // This is the first state, no need to update previous state.
-          logger.debug("This is the first state.");
+          logger.debug("This is the first state.", {
+            scheduledMaintenanceId: scheduledMaintenanceId?.toString(),
+          } as LogAttributes);
         } else if (!stateAfterThis) {
           /*
            * This is the last state.
@@ -811,7 +859,9 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
               isRoot: true,
             },
           });
-          logger.debug("This is the last state.");
+          logger.debug("This is the last state.", {
+            scheduledMaintenanceId: scheduledMaintenanceId?.toString(),
+          } as LogAttributes);
         } else {
           /*
            * This state is in the middle.
@@ -837,7 +887,9 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
               isRoot: true,
             },
           });
-          logger.debug("This state is in the middle.");
+          logger.debug("This state is in the middle.", {
+            scheduledMaintenanceId: scheduledMaintenanceId?.toString(),
+          } as LogAttributes);
         }
       }
 

package/Server/Services/StatusPageDomainService.ts

@@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy";
 import DeleteBy from "../Types/Database/DeleteBy";
 import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import GreenlockUtil from "../Utils/Greenlock/Greenlock";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import DomainService from "./DomainService";
 import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse";
@@ -164,6 +164,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
           logger.debug(
             "Ordering SSL for domain: " + statusPageDomain.fullDomain,
+            { fullDomain: statusPageDomain.fullDomain } as LogAttributes,
           );
 
           await GreenlockUtil.orderCert({
@@ -175,6 +176,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
           logger.debug(
             "SSL ordered for domain: " + statusPageDomain.fullDomain,
+            { fullDomain: statusPageDomain.fullDomain } as LogAttributes,
           );
 
           // update the order.
@@ -244,7 +246,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
       return true;
     } catch (err) {
-      logger.error(err);
+      logger.error(err, { fullDomain: fulldomain } as LogAttributes);
       return false;
     }
   }
@@ -288,7 +290,9 @@ export class Service extends DatabaseService<StatusPageDomain> {
     try {
       // get the token from the domain.
 
-      logger.debug("Checking for CNAME " + fullDomain);
+      logger.debug("Checking for CNAME " + fullDomain, {
+        fullDomain,
+      } as LogAttributes);
 
       const statusPageDomain: StatusPageDomain | null = await this.findOneBy({
         query: {
@@ -309,7 +313,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
       const token: string = statusPageDomain.cnameVerificationToken!;
 
-      logger.debug("Checking for CNAME " + fullDomain + " with token " + token);
+      logger.debug(
+        "Checking for CNAME " + fullDomain + " with token " + token,
+        { fullDomain } as LogAttributes,
+      );
 
       try {
         const result: HTTPErrorResponse | HTTPResponse<JSONObject> =
@@ -322,8 +329,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
             ),
           });
 
-        logger.debug("CNAME verification result");
-        logger.debug(result);
+        logger.debug("CNAME verification result", {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(result, { fullDomain } as LogAttributes);
 
         if (result.isSuccess()) {
           await this.updateCnameStatusForStatusPageDomain({
@@ -334,8 +343,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
           return true;
         }
       } catch (err) {
-        logger.debug("Failed checking for CNAME " + fullDomain);
-        logger.debug(err);
+        logger.debug("Failed checking for CNAME " + fullDomain, {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(err, { fullDomain } as LogAttributes);
       }
 
       // try with https
@@ -351,8 +362,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
             ),
           });
 
-        logger.debug("CNAME verification result for https");
-        logger.debug(resultHttps);
+        logger.debug("CNAME verification result for https", {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(resultHttps, { fullDomain } as LogAttributes);
 
         if (resultHttps.isSuccess()) {
           await this.updateCnameStatusForStatusPageDomain({
@@ -363,8 +376,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
           return true;
         }
       } catch (err) {
-        logger.debug("Failed checking for CNAME " + fullDomain);
-        logger.debug(err);
+        logger.debug("Failed checking for CNAME " + fullDomain, {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(err, { fullDomain } as LogAttributes);
       }
 
       try {
@@ -383,6 +398,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
           if (!cnameRecord) {
             logger.debug(
               `No CNAME record found for ${fullDomain}. Expected record: ${StatusPageCNameRecord}`,
+              { fullDomain } as LogAttributes,
             );
             await this.updateCnameStatusForStatusPageDomain({
               domain: fullDomain,
@@ -398,6 +414,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
           ) {
             logger.debug(
               `CNAME record for ${fullDomain} matches the expected record: ${StatusPageCNameRecord}`,
+              { fullDomain } as LogAttributes,
             );
 
             await this.updateCnameStatusForStatusPageDomain({
@@ -410,11 +427,14 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
           logger.debug(
             `CNAME record for ${fullDomain} is ${cnameRecord} and it does not match the expected record: ${StatusPageCNameRecord}`,
+            { fullDomain } as LogAttributes,
           );
         }
       } catch (err) {
-        logger.debug("Failed checking for CNAME " + fullDomain);
-        logger.debug(err);
+        logger.debug("Failed checking for CNAME " + fullDomain, {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(err, { fullDomain } as LogAttributes);
       }
 
       await this.updateCnameStatusForStatusPageDomain({
@@ -424,8 +444,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
       return false;
     } catch (err) {
-      logger.debug("Failed checking for CNAME " + fullDomain);
-      logger.debug(err);
+      logger.debug("Failed checking for CNAME " + fullDomain, {
+        fullDomain,
+      } as LogAttributes);
+      logger.debug(err, { fullDomain } as LogAttributes);
 
       await this.updateCnameStatusForStatusPageDomain({
         domain: fullDomain,
@@ -464,6 +486,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
     logger.debug(
       `StatusPageCerts:RemoveCerts - Checking CNAME ${statusPageDomain.fullDomain}`,
+      { fullDomain: statusPageDomain.fullDomain } as LogAttributes,
     );
 
     // Check CNAME validation and if that fails. Remove certs from Greenlock.
@@ -496,8 +519,11 @@ export class Service extends DatabaseService<StatusPageDomain> {
         } catch (err) {
           logger.error(
             "Cannot order cert for domain: " + statusPageDomain.fullDomain,
+            { fullDomain: statusPageDomain.fullDomain } as LogAttributes,
           );
-          logger.error(err);
+          logger.error(err, {
+            fullDomain: statusPageDomain.fullDomain,
+          } as LogAttributes);
         }
       }
     } else {
@@ -538,10 +564,14 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
           for (const domain of domains) {
             try {
-              logger.debug("Ordering SSL for domain: " + domain.fullDomain);
+              logger.debug("Ordering SSL for domain: " + domain.fullDomain, {
+                fullDomain: domain.fullDomain,
+              } as LogAttributes);
               await this.orderCert(domain);
             } catch (e) {
-              logger.error(e);
+              logger.error(e, {
+                fullDomain: domain.fullDomain,
+              } as LogAttributes);
             }
           }
 
@@ -579,7 +609,9 @@ export class Service extends DatabaseService<StatusPageDomain> {
       try {
         await this.isCnameValid(domain.fullDomain as string); // this will also upate the status.
       } catch (e) {
-        logger.error(e);
+        logger.error(e, {
+          fullDomain: domain.fullDomain as string,
+        } as LogAttributes);
       }
     }
   }
@@ -605,7 +637,9 @@ export class Service extends DatabaseService<StatusPageDomain> {
           },
         });
 
-        logger.debug(`DomainModel removed from greenlock: ${domain}`);
+        logger.debug(`DomainModel removed from greenlock: ${domain}`, {
+          fullDomain: domain,
+        } as LogAttributes);
       },
     });
   }
@@ -653,8 +687,10 @@ export class Service extends DatabaseService<StatusPageDomain> {
           // order cert again.
           await this.orderCert(domain);
         } catch (err) {
-          logger.error("Cannot order cert for domain: " + domain.fullDomain);
-          logger.error(err);
+          logger.error("Cannot order cert for domain: " + domain.fullDomain, {
+            fullDomain: domain.fullDomain,
+          } as LogAttributes);
+          logger.error(err, { fullDomain: domain.fullDomain } as LogAttributes);
         }
       }
     }

package/Server/Services/StatusPageService.ts

@@ -5,7 +5,7 @@ import UpdateBy from "../Types/Database/UpdateBy";
 import CookieUtil from "../Utils/Cookie";
 import { ExpressRequest } from "../Utils/Express";
 import JSONWebToken from "../Utils/JsonWebToken";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import DatabaseService from "./DatabaseService";
 import MonitorStatusService from "./MonitorStatusService";
@@ -217,7 +217,10 @@ export class Service extends DatabaseService<StatusPage> {
         false,
         onCreate.createBy.props,
       ).catch((error: Error) => {
-        logger.error(`Error in StatusPageService owner assignment: ${error}`);
+        logger.error(`Error in StatusPageService owner assignment: ${error}`, {
+          projectId: createdItem.projectId?.toString(),
+          statusPageId: createdItem.id?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -405,7 +408,9 @@ export class Service extends DatabaseService<StatusPage> {
           req.ips[0];
 
         if (!ipAccessedFrom) {
-          logger.error("IP address not found in request.");
+          logger.error("IP address not found in request.", {
+            statusPageId: statusPageId?.toString(),
+          } as LogAttributes);
           return {
             hasReadAccess: false,
             error: new ForbiddenException(
@@ -425,6 +430,7 @@ export class Service extends DatabaseService<StatusPage> {
         if (!isIPWhitelisted) {
           logger.error(
             `IP address ${ipAccessedFrom} is not whitelisted for status page ${statusPageId.toString()}.`,
+            { statusPageId: statusPageId?.toString() } as LogAttributes,
           );
 
           return {
@@ -460,7 +466,9 @@ export class Service extends DatabaseService<StatusPage> {
             };
           }
         } catch (err) {
-          logger.error(err);
+          logger.error(err, {
+            statusPageId: statusPageId?.toString(),
+          } as LogAttributes);
         }
       }
 
@@ -492,7 +500,9 @@ export class Service extends DatabaseService<StatusPage> {
         };
       }
     } catch (err) {
-      logger.error(err);
+      logger.error(err, {
+        statusPageId: statusPageId?.toString(),
+      } as LogAttributes);
     }
 
     return {
@@ -524,7 +534,9 @@ export class Service extends DatabaseService<StatusPage> {
         payload["type"] === MASTER_PASSWORD_COOKIE_IDENTIFIER
       );
     } catch (err) {
-      logger.error(err);
+      logger.error(err, {
+        statusPageId: data.statusPageId?.toString(),
+      } as LogAttributes);
     }
 
     return false;
@@ -841,7 +853,10 @@ export class Service extends DatabaseService<StatusPage> {
           statusPageId: statuspage.id!,
         },
       ).catch((err: Error) => {
-        logger.error(err);
+        logger.error(err, {
+          projectId: statuspage.projectId?.toString(),
+          statusPageId: statuspage.id?.toString(),
+        } as LogAttributes);
       });
     };
 
@@ -889,7 +904,10 @@ export class Service extends DatabaseService<StatusPage> {
           continue; // Cant send Status Page reports to SMS subscribers.
         }
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: statuspage.projectId?.toString(),
+          statusPageId: statuspage.id?.toString(),
+        } as LogAttributes);
       }
     }
   }