@oneuptime/common 10.0.53 → 10.0.55

package/Server/Services/IncidentService.ts

@@ -45,7 +45,7 @@ import Metric, {
 } from "../../Models/AnalyticsModels/Metric";
 import OneUptimeDate from "../../Types/Date";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import IncidentFeedService from "./IncidentFeedService";
 import IncidentSlaService from "./IncidentSlaService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
@@ -691,6 +691,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Workspace operations failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -701,6 +706,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Create incident feed failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -711,6 +721,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Handle incident state change failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -739,6 +754,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Add owners failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -755,6 +775,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Monitor status change failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -767,6 +792,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Disable active monitoring failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -783,6 +813,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `On-call duty policy execution failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -794,6 +829,11 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Incident grouping failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
         }
       })
@@ -814,12 +854,22 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `SLA creation failed in IncidentService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              incidentId: createdItem.id?.toString(),
+              userId: createdItem.createdByUserId?.toString(),
+            } as LogAttributes,
           );
         }
       })
       .catch((error: Error) => {
         logger.error(
           `Critical error in IncidentService sequential operations: ${error}`,
+          {
+            projectId: createdItem.projectId?.toString(),
+            incidentId: createdItem.id?.toString(),
+            userId: createdItem.createdByUserId?.toString(),
+          } as LogAttributes,
         );
       });
 
@@ -866,7 +916,13 @@ export class Service extends DatabaseService<Model> {
         });
       }
     } catch (error) {
-      logger.error(`Error in handleIncidentWorkspaceOperationsAsync: ${error}`);
+      logger.error(
+        `Error in handleIncidentWorkspaceOperationsAsync: ${error}`,
+        {
+          projectId: createdItem.projectId?.toString(),
+          incidentId: createdItem.id?.toString(),
+        } as LogAttributes,
+      );
       throw error;
     }
   }
@@ -945,7 +1001,11 @@ ${incident.remediationNotes || "No remediation notes provided."}
         },
       });
     } catch (error) {
-      logger.error(`Error in createIncidentFeedAsync: ${error}`);
+      logger.error(`Error in createIncidentFeedAsync: ${error}`, {
+        projectId: incident.projectId?.toString(),
+        incidentId: incident.id?.toString(),
+        userId: incident.createdByUserId?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -984,7 +1044,10 @@ ${incident.remediationNotes || "No remediation notes provided."}
         },
       });
     } catch (error) {
-      logger.error(`Error in handleIncidentStateChangeAsync: ${error}`);
+      logger.error(`Error in handleIncidentStateChangeAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -1014,7 +1077,10 @@ ${incident.remediationNotes || "No remediation notes provided."}
         await Promise.allSettled(policyPromises);
       }
     } catch (error) {
-      logger.error(`Error in executeOnCallDutyPoliciesAsync: ${error}`);
+      logger.error(`Error in executeOnCallDutyPoliciesAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -1045,7 +1111,10 @@ ${incident.remediationNotes || "No remediation notes provided."}
         );
       }
     } catch (error) {
-      logger.error(`Error in handleMonitorStatusChangeAsync: ${error}`);
+      logger.error(`Error in handleMonitorStatusChangeAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -1425,12 +1494,19 @@ ${incident.remediationNotes || "No remediation notes provided."}
                 },
                 projectId: projectId,
               }).catch((err: Error) => {
-                logger.error(err);
+                logger.error(err, {
+                  projectId: projectId?.toString(),
+                  incidentId: incidentId?.toString(),
+                } as LogAttributes);
               });
             }
           } catch (metricError) {
             logger.error(
               `Failed to emit postmortem completion time metric: ${metricError}`,
+              {
+                projectId: projectId?.toString(),
+                incidentId: incidentId?.toString(),
+              } as LogAttributes,
             );
           }
         }
@@ -1566,6 +1642,10 @@ ${incidentSeverity.name}
             } catch (slaError) {
               logger.error(
                 `SLA recalculation failed in IncidentService.onUpdateSuccess: ${slaError}`,
+                {
+                  projectId: projectId?.toString(),
+                  incidentId: incidentId?.toString(),
+                } as LogAttributes,
               );
             }
 
@@ -1617,11 +1697,18 @@ ${incidentSeverity.name}
                 },
                 projectId: projectId,
               }).catch((err: Error) => {
-                logger.error(err);
+                logger.error(err, {
+                  projectId: projectId?.toString(),
+                  incidentId: incidentId?.toString(),
+                } as LogAttributes);
               });
             } catch (metricError) {
               logger.error(
                 `Failed to emit severity change metric: ${metricError}`,
+                {
+                  projectId: projectId?.toString(),
+                  incidentId: incidentId?.toString(),
+                } as LogAttributes,
               );
             }
           }
@@ -2571,7 +2658,10 @@ ${incidentSeverity.name}
       metricNameServiceNameMap: metricTypesMap,
       projectId: incident.projectId,
     }).catch((err: Error) => {
-      logger.error(err);
+      logger.error(err, {
+        projectId: incident.projectId?.toString(),
+        incidentId: incident.id?.toString(),
+      } as LogAttributes);
     });
   }
 
@@ -2680,6 +2770,10 @@ ${incidentSeverity.name}
       });
       logger.info(
         `Updated Incident ${incident.id} current state to ${latestTimeline.incidentStateId}`,
+        {
+          projectId: incident.projectId?.toString(),
+          incidentId: incident.id?.toString(),
+        } as LogAttributes,
       );
     }
   }

package/Server/Services/IncidentSlaRuleService.ts

@@ -9,7 +9,7 @@ import Label from "../../Models/DatabaseModels/Label";
 import Monitor from "../../Models/DatabaseModels/Monitor";
 import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import MonitorService from "./MonitorService";
 import IncidentService from "./IncidentService";
@@ -60,6 +60,7 @@ export class Service extends DatabaseService<Model> {
   }): Promise<Model | null> {
     logger.debug(
       `Finding matching SLA rule for incident ${data.incidentId} in project ${data.projectId}`,
+      { projectId: data.projectId?.toString() } as LogAttributes,
     );
 
     // Get the incident if not provided
@@ -90,7 +91,9 @@ export class Service extends DatabaseService<Model> {
     }
 
     if (!incident) {
-      logger.warn(`Incident ${data.incidentId} not found`);
+      logger.warn(`Incident ${data.incidentId} not found`, {
+        projectId: data.projectId?.toString(),
+      } as LogAttributes);
       return null;
     }
 
@@ -137,7 +140,9 @@ export class Service extends DatabaseService<Model> {
     });
 
     if (rules.length === 0) {
-      logger.debug(`No enabled SLA rules found for project ${data.projectId}`);
+      logger.debug(`No enabled SLA rules found for project ${data.projectId}`, {
+        projectId: data.projectId?.toString(),
+      } as LogAttributes);
       return null;
     }
 
@@ -148,12 +153,15 @@ export class Service extends DatabaseService<Model> {
       if (matches) {
         logger.debug(
           `Incident ${data.incidentId} matches SLA rule ${rule.name || rule.id}`,
+          { projectId: data.projectId?.toString() } as LogAttributes,
         );
         return rule;
       }
     }
 
-    logger.debug(`Incident ${data.incidentId} did not match any SLA rules`);
+    logger.debug(`Incident ${data.incidentId} did not match any SLA rules`, {
+      projectId: data.projectId?.toString(),
+    } as LogAttributes);
     return null;
   }
 
@@ -164,6 +172,7 @@ export class Service extends DatabaseService<Model> {
   ): Promise<boolean> {
     logger.debug(
       `Checking if incident ${incident.id} matches SLA rule ${rule.name || rule.id}`,
+      { projectId: incident.projectId?.toString() } as LogAttributes,
     );
 
     // Check monitor IDs - if monitors are specified, incident must have at least one of them
@@ -321,6 +330,7 @@ export class Service extends DatabaseService<Model> {
       } catch {
         logger.warn(
           `Invalid regex pattern in SLA rule ${rule.id}: ${rule.incidentTitlePattern}`,
+          { projectId: incident.projectId?.toString() } as LogAttributes,
         );
         return false;
       }
@@ -340,6 +350,7 @@ export class Service extends DatabaseService<Model> {
       } catch {
         logger.warn(
           `Invalid regex pattern in SLA rule ${rule.id}: ${rule.incidentDescriptionPattern}`,
+          { projectId: incident.projectId?.toString() } as LogAttributes,
         );
         return false;
       }
@@ -348,6 +359,7 @@ export class Service extends DatabaseService<Model> {
     // If no criteria specified (all fields empty), rule matches all incidents
     logger.debug(
       `SLA rule ${rule.name || rule.id} matched incident ${incident.id} (all criteria passed)`,
+      { projectId: incident.projectId?.toString() } as LogAttributes,
     );
     return true;
   }

package/Server/Services/IncidentSlaService.ts

@@ -6,7 +6,7 @@ import ObjectID from "../../Types/ObjectID";
 import OneUptimeDate from "../../Types/Date";
 import IncidentSlaStatus from "../../Types/Incident/IncidentSlaStatus";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import IncidentSlaRuleService from "./IncidentSlaRuleService";
 import IncidentService from "./IncidentService";
@@ -30,6 +30,7 @@ export class Service extends DatabaseService<Model> {
   }): Promise<Model | null> {
     logger.debug(
       `Creating SLA record for incident ${data.incidentId} in project ${data.projectId}`,
+      { projectId: data.projectId?.toString() } as LogAttributes,
     );
 
     // Find matching rule
@@ -52,6 +53,7 @@ export class Service extends DatabaseService<Model> {
     if (!matchingRule || !matchingRule.id) {
       logger.debug(
         `No matching SLA rule found for incident ${data.incidentId}`,
+        { projectId: data.projectId?.toString() } as LogAttributes,
       );
       return null;
     }
@@ -101,12 +103,14 @@ export class Service extends DatabaseService<Model> {
 
       logger.info(
         `Created SLA record ${createdSla.id} for incident ${data.incidentId} with rule ${matchingRule.name || matchingRule.id}`,
+        { projectId: data.projectId?.toString() } as LogAttributes,
       );
 
       return createdSla;
     } catch (error) {
       logger.error(
         `Error creating SLA record for incident ${data.incidentId}: ${error}`,
+        { projectId: data.projectId?.toString() } as LogAttributes,
       );
       return null;
     }
@@ -119,6 +123,7 @@ export class Service extends DatabaseService<Model> {
   }): Promise<void> {
     logger.debug(
       `Marking incident ${data.incidentId} as responded at ${data.respondedAt}`,
+      { incidentId: data.incidentId?.toString() } as LogAttributes,
     );
 
     // Find all active SLA records for this incident
@@ -153,7 +158,10 @@ export class Service extends DatabaseService<Model> {
           },
         });
 
-        logger.info(`Marked SLA ${sla.id} as responded at ${data.respondedAt}`);
+        logger.info(
+          `Marked SLA ${sla.id} as responded at ${data.respondedAt}`,
+          { incidentId: data.incidentId?.toString() } as LogAttributes,
+        );
       }
     }
   }
@@ -165,6 +173,7 @@ export class Service extends DatabaseService<Model> {
   }): Promise<void> {
     logger.debug(
       `Marking incident ${data.incidentId} as resolved at ${data.resolvedAt}`,
+      { incidentId: data.incidentId?.toString() } as LogAttributes,
     );
 
     // Find all active SLA records for this incident
@@ -231,6 +240,7 @@ export class Service extends DatabaseService<Model> {
 
       logger.info(
         `Marked SLA ${sla.id} as resolved with status ${finalStatus}`,
+        { incidentId: data.incidentId?.toString() } as LogAttributes,
       );
     }
   }
@@ -239,7 +249,9 @@ export class Service extends DatabaseService<Model> {
   public async recalculateDeadlines(data: {
     incidentId: ObjectID;
   }): Promise<void> {
-    logger.debug(`Recalculating deadlines for incident ${data.incidentId}`);
+    logger.debug(`Recalculating deadlines for incident ${data.incidentId}`, {
+      incidentId: data.incidentId?.toString(),
+    } as LogAttributes);
 
     // Get the incident to find the new severity and project
     const incident: Incident | null = await IncidentService.findOneById({
@@ -266,7 +278,9 @@ export class Service extends DatabaseService<Model> {
     });
 
     if (!incident || !incident.projectId) {
-      logger.warn(`Incident ${data.incidentId} not found`);
+      logger.warn(`Incident ${data.incidentId} not found`, {
+        projectId: incident?.projectId?.toString(),
+      } as LogAttributes);
       return;
     }
 
@@ -338,11 +352,13 @@ export class Service extends DatabaseService<Model> {
 
         logger.info(
           `Recalculated SLA ${sla.id} with new rule ${newMatchingRule.name || newMatchingRule.id}`,
+          { projectId: incident.projectId?.toString() } as LogAttributes,
         );
       } else if (!newMatchingRule) {
         // No matching rule anymore, but keep the existing SLA record
         logger.debug(
           `No matching SLA rule found after severity change for incident ${data.incidentId}, keeping existing SLA`,
+          { projectId: incident.projectId?.toString() } as LogAttributes,
         );
       }
     }