@oneuptime/common 10.0.53 → 10.0.54

package/Server/Services/MonitorStatusTimelineService.ts

@@ -3,7 +3,7 @@ import CreateBy from "../Types/Database/CreateBy";
 import DeleteBy from "../Types/Database/DeleteBy";
 import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import QueryHelper from "../Types/Database/QueryHelper";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import MonitorService from "./MonitorService";
 import UserService from "./UserService";
@@ -40,7 +40,10 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
         namespace: "MonitorStatusTimeline.create",
       });
     } catch (e) {
-      logger.error(e);
+      logger.error(e, {
+        projectId: createBy.data.projectId?.toString(),
+        monitorId: createBy.data.monitorId?.toString(),
+      } as LogAttributes);
     }
 
     if (!createBy.data.startsAt) {
@@ -98,8 +101,14 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
       },
     });
 
-    logger.debug("State Before this");
-    logger.debug(stateBeforeThis);
+    logger.debug("State Before this", {
+      projectId: createBy.data.projectId?.toString(),
+      monitorId: createBy.data.monitorId?.toString(),
+    } as LogAttributes);
+    logger.debug(stateBeforeThis, {
+      projectId: createBy.data.projectId?.toString(),
+      monitorId: createBy.data.monitorId?.toString(),
+    } as LogAttributes);
 
     // If this is the first state, then do not notify the owner.
     if (!stateBeforeThis) {
@@ -161,8 +170,14 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
       }
     }
 
-    logger.debug("State After this");
-    logger.debug(stateAfterThis);
+    logger.debug("State After this", {
+      projectId: createBy.data.projectId?.toString(),
+      monitorId: createBy.data.monitorId?.toString(),
+    } as LogAttributes);
+    logger.debug(stateAfterThis, {
+      projectId: createBy.data.projectId?.toString(),
+      monitorId: createBy.data.monitorId?.toString(),
+    } as LogAttributes);
 
     return {
       createBy,
@@ -189,14 +204,32 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
 
     // 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(),
+      monitorId: createdItem.monitorId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineBeforeThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      monitorId: createdItem.monitorId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Status Timeline After this", {
+      projectId: createdItem.projectId?.toString(),
+      monitorId: createdItem.monitorId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineAfterThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      monitorId: createdItem.monitorId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Created Item", {
+      projectId: createdItem.projectId?.toString(),
+      monitorId: createdItem.monitorId?.toString(),
+    } as LogAttributes);
+    logger.debug(createdItem, {
+      projectId: createdItem.projectId?.toString(),
+      monitorId: createdItem.monitorId?.toString(),
+    } as LogAttributes);
 
     /*
      * now there are three cases.
@@ -204,7 +237,10 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
      */
     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(),
+        monitorId: createdItem.monitorId?.toString(),
+      } as LogAttributes);
     } else if (!onCreate.carryForward.statusTimelineAfterThisStatus) {
       /*
        * 2. This is the last status.
@@ -219,7 +255,10 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
           isRoot: true,
         },
       });
-      logger.debug("This is the last status.");
+      logger.debug("This is the last status.", {
+        projectId: createdItem.projectId?.toString(),
+        monitorId: createdItem.monitorId?.toString(),
+      } as LogAttributes);
     } else {
       /*
        * 3. This is in the middle.
@@ -245,7 +284,10 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
           isRoot: true,
         },
       });
-      logger.debug("This status is in the middle.");
+      logger.debug("This status is in the middle.", {
+        projectId: createdItem.projectId?.toString(),
+        monitorId: createdItem.monitorId?.toString(),
+      } as LogAttributes);
     }
 
     if (!createdItem.endsAt) {
@@ -420,7 +462,9 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
 
         if (!stateBeforeThis) {
           // 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.", {
+            monitorId: monitorId?.toString(),
+          } as LogAttributes);
         } else if (!stateAfterThis) {
           /*
            * This is the last status.
@@ -435,7 +479,9 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
               isRoot: true,
             },
           });
-          logger.debug("This is the last status.");
+          logger.debug("This is the last status.", {
+            monitorId: monitorId?.toString(),
+          } as LogAttributes);
         } else {
           /*
            * This status is in the middle.
@@ -461,7 +507,9 @@ export class Service extends DatabaseService<MonitorStatusTimeline> {
               isRoot: true,
             },
           });
-          logger.debug("This status is in the middle.");
+          logger.debug("This status is in the middle.", {
+            monitorId: monitorId?.toString(),
+          } as LogAttributes);
         }
       }
 

package/Server/Services/NotificationService.ts

@@ -2,7 +2,7 @@ import {
   IsBillingEnabled,
   NotificationSlackWebhookOnSubscriptionUpdate,
 } from "../EnvironmentConfig";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import BaseService from "./BaseService";
 import BillingService from "./BillingService";
 import ProjectService from "./ProjectService";
@@ -129,6 +129,7 @@ export class NotificationService extends BaseService {
       }).catch((error: Exception) => {
         logger.error(
           "Error sending slack message for balance refill: " + error,
+          { projectId: projectId?.toString() } as LogAttributes,
         );
       });
 
@@ -153,7 +154,7 @@ export class NotificationService extends BaseService {
           project.name || ""
         } and failed. Please make sure your payment method is upto date and has sufficient balance. You can add new payment methods in Project Settings.`,
       );
-      logger.error(err);
+      logger.error(err, { projectId: projectId?.toString() } as LogAttributes);
       throw err;
     }
   }
@@ -245,6 +246,7 @@ ${project.createdOwnerName && project.createdOwnerEmail ? `*Project Created By:*
       }).catch((error: Exception) => {
         logger.error(
           "Error sending slack message for balance refill: " + error,
+          { projectId: project.id?.toString() } as LogAttributes,
         );
       });
     }

package/Server/Services/OnCallDutyPolicyEscalationRuleService.ts

@@ -30,7 +30,7 @@ import OnCallDutyPolicyEscalationRuleTeam from "../../Models/DatabaseModels/OnCa
 import OnCallDutyPolicyEscalationRuleUser from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser";
 import OnCallDutyPolicyExecutionLogTimeline from "../../Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline";
 import User from "../../Models/DatabaseModels/User";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import OnCallDutyPolicyUserOverride from "../../Models/DatabaseModels/OnCallDutyPolicyUserOverride";
 import OnCallDutyPolicyUserOverrideService from "./OnCallDutyPolicyUserOverrideService";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -44,6 +44,10 @@ export class Service extends DatabaseService<Model> {
   }): Promise<ObjectID | null> {
     logger.debug(
       `Getting route alert to user id for userId: ${data.userId.toString()}`,
+      {
+        projectId: data.projectId.toString(),
+        userId: data.userId.toString(),
+      } as LogAttributes,
     );
 
     const currentDate: Date = OneUptimeDate.getCurrentDate();
@@ -70,7 +74,10 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
-    logger.debug(`Found alert routed to: ${JSON.stringify(alertRoutedTo)}`);
+    logger.debug(`Found alert routed to: ${JSON.stringify(alertRoutedTo)}`, {
+      projectId: data.projectId.toString(),
+      userId: data.userId.toString(),
+    } as LogAttributes);
 
     // local override takes precedence over global override.
     const localOverride: OnCallDutyPolicyUserOverride | undefined =
@@ -84,6 +91,10 @@ export class Service extends DatabaseService<Model> {
     if (localOverride && localOverride.routeAlertsToUserId) {
       logger.debug(
         `Route alert to user id found: ${localOverride.routeAlertsToUserId.toString()}`,
+        {
+          projectId: data.projectId.toString(),
+          userId: data.userId.toString(),
+        } as LogAttributes,
       );
       return localOverride.routeAlertsToUserId;
     }
@@ -96,6 +107,10 @@ export class Service extends DatabaseService<Model> {
     if (globalOverride && globalOverride.routeAlertsToUserId) {
       logger.debug(
         `Route alert to user id found: ${globalOverride.routeAlertsToUserId.toString()}`,
+        {
+          projectId: data.projectId.toString(),
+          userId: data.userId.toString(),
+        } as LogAttributes,
       );
       return globalOverride.routeAlertsToUserId;
     }
@@ -117,7 +132,10 @@ export class Service extends DatabaseService<Model> {
       onCallPolicyId: ObjectID;
     },
   ): Promise<void> {
-    logger.debug(`Starting rule execution for ruleId: ${ruleId.toString()}`);
+    logger.debug(`Starting rule execution for ruleId: ${ruleId.toString()}`, {
+      projectId: options.projectId.toString(),
+      onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+    } as LogAttributes);
 
     const rule: Model | null = await this.findOneById({
       id: ruleId,
@@ -137,7 +155,10 @@ export class Service extends DatabaseService<Model> {
       );
     }
 
-    logger.debug(`Found rule: ${JSON.stringify(rule)}`);
+    logger.debug(`Found rule: ${JSON.stringify(rule)}`, {
+      projectId: options.projectId.toString(),
+      onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+    } as LogAttributes);
 
     await OnCallDutyPolicyExecutionLogService.updateOneById({
       id: options.onCallPolicyExecutionLogId,
@@ -152,7 +173,10 @@ export class Service extends DatabaseService<Model> {
       },
     });
 
-    logger.debug(`Updated execution log for ruleId: ${ruleId.toString()}`);
+    logger.debug(`Updated execution log for ruleId: ${ruleId.toString()}`, {
+      projectId: options.projectId.toString(),
+      onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+    } as LogAttributes);
 
     type GetNewLogFunction = () => OnCallDutyPolicyExecutionLogTimeline;
 
@@ -242,7 +266,10 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
-    logger.debug(`Found users in rule: ${JSON.stringify(usersInRule)}`);
+    logger.debug(`Found users in rule: ${JSON.stringify(usersInRule)}`, {
+      projectId: options.projectId.toString(),
+      onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+    } as LogAttributes);
 
     const teamsInRule: Array<OnCallDutyPolicyEscalationRuleTeam> =
       await OnCallDutyPolicyEscalationRuleTeamService.findBy({
@@ -259,7 +286,10 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
-    logger.debug(`Found teams in rule: ${JSON.stringify(teamsInRule)}`);
+    logger.debug(`Found teams in rule: ${JSON.stringify(teamsInRule)}`, {
+      projectId: options.projectId.toString(),
+      onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+    } as LogAttributes);
 
     const schedulesInRule: Array<OnCallDutyPolicyEscalationRuleSchedule> =
       await OnCallDutyPolicyEscalationRuleScheduleService.findBy({
@@ -276,7 +306,13 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
-    logger.debug(`Found schedules in rule: ${JSON.stringify(schedulesInRule)}`);
+    logger.debug(
+      `Found schedules in rule: ${JSON.stringify(schedulesInRule)}`,
+      {
+        projectId: options.projectId.toString(),
+        onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+      } as LogAttributes,
+    );
 
     type StartUserNotificationRuleExecutionFunction = (
       userId: ObjectID,
@@ -307,6 +343,11 @@ export class Service extends DatabaseService<Model> {
 
         logger.debug(
           `Starting notification rule execution for userId: ${alertSentToUserId.toString()}`,
+          {
+            projectId: options.projectId.toString(),
+            onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+            userId: alertSentToUserId.toString(),
+          } as LogAttributes,
         );
         let log: OnCallDutyPolicyExecutionLogTimeline = getNewLog();
         log.statusMessage = "Sending notification to user.";
@@ -479,7 +520,10 @@ export class Service extends DatabaseService<Model> {
       });
     }
 
-    logger.debug(`Completed rule execution for ruleId: ${ruleId.toString()}`);
+    logger.debug(`Completed rule execution for ruleId: ${ruleId.toString()}`, {
+      projectId: options.projectId.toString(),
+      onCallDutyPolicyEscalationRuleId: ruleId.toString(),
+    } as LogAttributes);
   }
 
   public constructor() {

package/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts

@@ -23,7 +23,7 @@ import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import OnCallDutyPolicyTimeLogService from "./OnCallDutyPolicyTimeLogService";
 import OneUptimeDate from "../../Types/Date";
 import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
 
 export class Service extends DatabaseService<Model> {
@@ -183,6 +183,10 @@ export class Service extends DatabaseService<Model> {
       }).catch((error: Error) => {
         logger.error(
           `Error starting time log for user ${createdModel.user?.id}: ${error}`,
+          {
+            projectId: projectId?.toString(),
+            userId: createdModel.user?.id?.toString(),
+          } as LogAttributes,
         );
       });
     }
@@ -267,7 +271,10 @@ export class Service extends DatabaseService<Model> {
             userId: userId,
             endsAt: OneUptimeDate.getCurrentDate(),
           }).catch((error: Error) => {
-            logger.error(`Error ending time log for user ${userId}: ${error}`);
+            logger.error(`Error ending time log for user ${userId}: ${error}`, {
+              projectId: projectId?.toString(),
+              userId: userId?.toString(),
+            } as LogAttributes);
           });
         }
       }

package/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts

@@ -7,7 +7,7 @@ import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/O
 import { Blue500, Green500, Red500, Yellow500 } from "../../Types/BrandColors";
 import Color from "../../Types/Color";
 import ObjectID from "../../Types/ObjectID";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import AlertFeedService from "./AlertFeedService";
 import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
@@ -76,6 +76,10 @@ export class Service extends DatabaseService<Model> {
   }): Promise<void> {
     logger.debug(
       "OnCallDutyPolicyExecutionLogTimelineService.addToIncidentFeed",
+      {
+        onCallDutyPolicyExecutionLogTimelineId:
+          data.onCallDutyPolicyExecutionLogTimelineId?.toString(),
+      } as LogAttributes,
     );
 
     const onCallDutyPolicyExecutionLogTimeline: Model | null =
@@ -123,8 +127,12 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
-    logger.debug("OnCallDutyPolicyExecutionLogTimeline: ");
-    logger.debug(onCallDutyPolicyExecutionLogTimeline);
+    logger.debug("OnCallDutyPolicyExecutionLogTimeline: ", {
+      projectId: onCallDutyPolicyExecutionLogTimeline?.projectId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCallDutyPolicyExecutionLogTimeline, {
+      projectId: onCallDutyPolicyExecutionLogTimeline?.projectId?.toString(),
+    } as LogAttributes);
 
     if (!onCallDutyPolicyExecutionLogTimeline) {
       return;
@@ -146,7 +154,9 @@ export class Service extends DatabaseService<Model> {
       const status: OnCallDutyExecutionLogTimelineStatus =
         onCallDutyPolicyExecutionLogTimeline.status!;
 
-      logger.debug("Status: " + status);
+      logger.debug("Status: " + status, {
+        projectId: onCallDutyPolicyExecutionLogTimeline?.projectId?.toString(),
+      } as LogAttributes);
 
       if (
         status &&
@@ -237,7 +247,10 @@ The on-call policy **[${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.na
           })}** instead, because of an override rule.`;
         }
 
-        logger.debug("Feed Info in Markdown: " + feedInfoInMarkdown);
+        logger.debug("Feed Info in Markdown: " + feedInfoInMarkdown, {
+          projectId:
+            onCallDutyPolicyExecutionLogTimeline?.projectId?.toString(),
+        } as LogAttributes);
 
         if (onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId) {
           await IncidentFeedService.createIncidentFeedItem({
@@ -287,7 +300,10 @@ The on-call policy **[${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.na
           });
         }
 
-        logger.debug("Incident Feed created");
+        logger.debug("Incident Feed created", {
+          projectId:
+            onCallDutyPolicyExecutionLogTimeline?.projectId?.toString(),
+        } as LogAttributes);
       }
     }
   }
@@ -297,8 +313,13 @@ The on-call policy **[${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.na
     _onCreate: OnCreate<Model>,
     createdItem: Model,
   ): Promise<Model> {
-    logger.debug("OnCallDutyPolicyExecutionLogTimelineService.onCreateSuccess");
-    logger.debug(createdItem);
+    logger.debug(
+      "OnCallDutyPolicyExecutionLogTimelineService.onCreateSuccess",
+      { projectId: createdItem.projectId?.toString() } as LogAttributes,
+    );
+    logger.debug(createdItem, {
+      projectId: createdItem.projectId?.toString(),
+    } as LogAttributes);
 
     await this.addToIncidentOrAlertFeed({
       onCallDutyPolicyExecutionLogTimelineId: createdItem.id!,

package/Server/Services/OnCallDutyPolicyFeedService.ts

@@ -4,7 +4,7 @@ import OneUptimeDate from "../../Types/Date";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import { IsBillingEnabled } from "../EnvironmentConfig";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import OnCallDutyPolicyFeed, {
   OnCallDutyPolicyFeedEventType,
@@ -45,8 +45,15 @@ export class Service extends DatabaseService<OnCallDutyPolicyFeed> {
     try {
       logger.debug(
         "OnCallDutyPolicyFeedService.createOnCallDutyPolicyFeedItem",
+        {
+          projectId: data.projectId?.toString(),
+          onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+        } as LogAttributes,
       );
-      logger.debug(data);
+      logger.debug(data, {
+        projectId: data.projectId?.toString(),
+        onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+      } as LogAttributes);
 
       const onCallDutyPolicyFeed: OnCallDutyPolicyFeed =
         new OnCallDutyPolicyFeed();
@@ -99,8 +106,14 @@ export class Service extends DatabaseService<OnCallDutyPolicyFeed> {
           },
         });
 
-      logger.debug("On Call Duty Policy Feed created");
-      logger.debug(createdOnCallDutyPolicyFeed);
+      logger.debug("On Call Duty Policy Feed created", {
+        projectId: data.projectId?.toString(),
+        onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+      } as LogAttributes);
+      logger.debug(createdOnCallDutyPolicyFeed, {
+        projectId: data.projectId?.toString(),
+        onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+      } as LogAttributes);
 
       try {
         // send notification to slack and teams
@@ -116,14 +129,26 @@ export class Service extends DatabaseService<OnCallDutyPolicyFeed> {
           });
         }
       } catch (e) {
-        logger.error("Error in sending notification to slack and teams");
-        logger.error(e);
+        logger.error("Error in sending notification to slack and teams", {
+          projectId: data.projectId?.toString(),
+          onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+        } as LogAttributes);
+        logger.error(e, {
+          projectId: data.projectId?.toString(),
+          onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+        } as LogAttributes);
 
         // we dont throw this error as it is not a critical error
       }
     } catch (e) {
-      logger.error("Error in creating onCallDutyPolicy feed");
-      logger.error(e);
+      logger.error("Error in creating onCallDutyPolicy feed", {
+        projectId: data.projectId?.toString(),
+        onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+      } as LogAttributes);
+      logger.error(e, {
+        projectId: data.projectId?.toString(),
+        onCallDutyPolicyId: data.onCallDutyPolicyId?.toString(),
+      } as LogAttributes);
 
       // we dont throw this error as it is not a critical error
     }