@oneuptime/common 10.0.53 → 10.0.55

package/Server/Services/IncidentStateTimelineService.ts

@@ -24,7 +24,7 @@ import IncidentStateTimeline from "../../Models/DatabaseModels/IncidentStateTime
 import IncidentMember from "../../Models/DatabaseModels/IncidentMember";
 import IncidentRole from "../../Models/DatabaseModels/IncidentRole";
 import { IsBillingEnabled } from "../EnvironmentConfig";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import IncidentFeedService from "./IncidentFeedService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -82,7 +82,10 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
           namespace: "IncidentStateTimeline.create",
         });
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createBy.data.projectId?.toString(),
+          incidentId: createBy.data.incidentId?.toString(),
+        } as LogAttributes);
       }
 
       if (!createBy.data.startsAt) {
@@ -166,8 +169,14 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
         }),
       ]);
 
-      logger.debug("State Before this");
-      logger.debug(stateBeforeThis);
+      logger.debug("State Before this", {
+        projectId: createBy.data.projectId?.toString(),
+        incidentId: createBy.data.incidentId?.toString(),
+      } as LogAttributes);
+      logger.debug(stateBeforeThis, {
+        projectId: createBy.data.projectId?.toString(),
+        incidentId: createBy.data.incidentId?.toString(),
+      } as LogAttributes);
 
       // If this is the first state, then do not notify the owner.
       if (!stateBeforeThis) {
@@ -246,8 +255,14 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
         }
       }
 
-      logger.debug("State After this");
-      logger.debug(stateAfterThis);
+      logger.debug("State After this", {
+        projectId: createBy.data.projectId?.toString(),
+        incidentId: createBy.data.incidentId?.toString(),
+      } as LogAttributes);
+      logger.debug(stateAfterThis, {
+        projectId: createBy.data.projectId?.toString(),
+        incidentId: createBy.data.incidentId?.toString(),
+      } as LogAttributes);
 
       const publicNote: string | undefined = (
         createBy.miscDataProps as JSONObject | undefined
@@ -291,7 +306,10 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
         try {
           await Semaphore.release(mutex);
         } catch (err) {
-          logger.error(err);
+          logger.error(err, {
+            projectId: createBy.data.projectId?.toString(),
+            incidentId: createBy.data.incidentId?.toString(),
+          } as LogAttributes);
         }
       }
 
@@ -315,14 +333,32 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
     }
     // 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(),
+      incidentId: createdItem.incidentId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineBeforeThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      incidentId: createdItem.incidentId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Status Timeline After this", {
+      projectId: createdItem.projectId?.toString(),
+      incidentId: createdItem.incidentId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineAfterThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      incidentId: createdItem.incidentId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Created Item", {
+      projectId: createdItem.projectId?.toString(),
+      incidentId: createdItem.incidentId?.toString(),
+    } as LogAttributes);
+    logger.debug(createdItem, {
+      projectId: createdItem.projectId?.toString(),
+      incidentId: createdItem.incidentId?.toString(),
+    } as LogAttributes);
 
     /*
      * now there are three cases.
@@ -330,7 +366,10 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
      */
     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(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
     } else if (!onCreate.carryForward.statusTimelineAfterThisStatus) {
       /*
        * 2. This is the last status.
@@ -345,7 +384,10 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
           isRoot: true,
         },
       });
-      logger.debug("This is the last status.");
+      logger.debug("This is the last status.", {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
     } else {
       /*
        * 3. This is in the middle.
@@ -371,7 +413,10 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
           isRoot: true,
         },
       });
-      logger.debug("This status is in the middle.");
+      logger.debug("This status is in the middle.", {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
     }
 
     if (!createdItem.endsAt) {
@@ -408,7 +453,10 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
       try {
         await Semaphore.release(mutex);
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createdItem.projectId?.toString(),
+          incidentId: createdItem.incidentId?.toString(),
+        } as LogAttributes);
       }
     }
 
@@ -469,8 +517,14 @@ ${createdItem.rootCause}`,
         projectId: createdItem.projectId!,
         userId: stateChangeUserId,
       }).catch((error: Error) => {
-        logger.error(`Error while auto-assigning incident commander:`);
-        logger.error(error);
+        logger.error(`Error while auto-assigning incident commander:`, {
+          projectId: createdItem.projectId?.toString(),
+          incidentId: createdItem.incidentId?.toString(),
+        } as LogAttributes);
+        logger.error(error, {
+          projectId: createdItem.projectId?.toString(),
+          incidentId: createdItem.incidentId?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -523,8 +577,14 @@ ${createdItem.rootCause}`,
     IncidentService.refreshIncidentMetrics({
       incidentId: createdItem.incidentId,
     }).catch((error: Error) => {
-      logger.error(`Error while refreshing incident metrics:`);
-      logger.error(error);
+      logger.error(`Error while refreshing incident metrics:`, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
+      logger.error(error, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
     });
 
     // Track SLA response/resolution times
@@ -538,8 +598,14 @@ ${createdItem.rootCause}`,
         onCreate.carryForward.statusTimelineBeforeThisStatus?.incidentState
           ?.isResolvedState || false,
     }).catch((error: Error) => {
-      logger.error(`Error while tracking SLA state change:`);
-      logger.error(error);
+      logger.error(`Error while tracking SLA state change:`, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
+      logger.error(error, {
+        projectId: createdItem.projectId?.toString(),
+        incidentId: createdItem.incidentId?.toString(),
+      } as LogAttributes);
     });
 
     const isLastIncidentState: boolean = await this.isLastIncidentState({
@@ -563,8 +629,14 @@ ${createdItem.rootCause}`,
           ).toString()})** is resolved. 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(),
+          incidentId: createdItem.incidentId?.toString(),
+        } as LogAttributes);
+        logger.error(error, {
+          projectId: createdItem.projectId?.toString(),
+          incidentId: createdItem.incidentId?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -691,6 +763,10 @@ ${createdItem.rootCause}`,
 
     logger.debug(
       `Auto-assigned user ${data.userId.toString()} as Incident Commander for incident ${data.incidentId.toString()}`,
+      {
+        projectId: data.projectId?.toString(),
+        incidentId: data.incidentId?.toString(),
+      } as LogAttributes,
     );
   }
 
@@ -727,6 +803,10 @@ ${createdItem.rootCause}`,
 
           logger.info(
             `Created new SLA record for reopened incident ${data.incidentId}`,
+            {
+              projectId: data.projectId?.toString(),
+              incidentId: data.incidentId?.toString(),
+            } as LogAttributes,
           );
         }
 
@@ -749,7 +829,10 @@ ${createdItem.rootCause}`,
         });
       }
     } catch (error) {
-      logger.error(`Error in trackSlaStateChange: ${error}`);
+      logger.error(`Error in trackSlaStateChange: ${error}`, {
+        projectId: data.projectId?.toString(),
+        incidentId: data.incidentId?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -847,7 +930,9 @@ ${createdItem.rootCause}`,
 
         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.", {
+            incidentId: incidentId?.toString(),
+          } as LogAttributes);
         } else if (!stateAfterThis) {
           /*
            * This is the last state.
@@ -862,7 +947,9 @@ ${createdItem.rootCause}`,
               isRoot: true,
             },
           });
-          logger.debug("This is the last state.");
+          logger.debug("This is the last state.", {
+            incidentId: incidentId?.toString(),
+          } as LogAttributes);
         } else {
           /*
            * This state is in the middle.
@@ -888,7 +975,9 @@ ${createdItem.rootCause}`,
               isRoot: true,
             },
           });
-          logger.debug("This state is in the middle.");
+          logger.debug("This state is in the middle.", {
+            incidentId: incidentId?.toString(),
+          } as LogAttributes);
         }
       }
 

package/Server/Services/KubernetesClusterService.ts

@@ -5,6 +5,10 @@ import ObjectID from "../../Types/ObjectID";
 import QueryHelper from "../Types/Database/QueryHelper";
 import OneUptimeDate from "../../Types/Date";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
+import GlobalCache from "../Infrastructure/GlobalCache";
+
+const LAST_SEEN_CACHE_NAMESPACE: string = "k8s-cluster-last-seen";
+const LAST_SEEN_THROTTLE_SECONDS: number = 60;
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -36,26 +40,70 @@ export class Service extends DatabaseService<Model> {
       return existingCluster;
     }
 
-    // Create new cluster
-    const newCluster: Model = new Model();
-    newCluster.projectId = data.projectId;
-    newCluster.name = data.clusterIdentifier;
-    newCluster.clusterIdentifier = data.clusterIdentifier;
-    newCluster.otelCollectorStatus = "connected";
-    newCluster.lastSeenAt = OneUptimeDate.getCurrentDate();
+    try {
+      // Create new cluster
+      const newCluster: Model = new Model();
+      newCluster.projectId = data.projectId;
+      newCluster.name = data.clusterIdentifier;
+      newCluster.clusterIdentifier = data.clusterIdentifier;
+      newCluster.otelCollectorStatus = "connected";
+      newCluster.lastSeenAt = OneUptimeDate.getCurrentDate();
 
-    const createdCluster: Model = await this.create({
-      data: newCluster,
-      props: {
-        isRoot: true,
-      },
-    });
+      const createdCluster: Model = await this.create({
+        data: newCluster,
+        props: {
+          isRoot: true,
+        },
+      });
+
+      return createdCluster;
+    } catch {
+      /*
+       * Race condition: another request created the cluster concurrently.
+       * Re-fetch the existing cluster.
+       */
+      const reFetchedCluster: Model | null = await this.findOneBy({
+        query: {
+          projectId: data.projectId,
+          clusterIdentifier: data.clusterIdentifier,
+        },
+        select: {
+          _id: true,
+          projectId: true,
+          clusterIdentifier: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (reFetchedCluster) {
+        return reFetchedCluster;
+      }
 
-    return createdCluster;
+      throw new Error(
+        "Failed to create or find cluster: " + data.clusterIdentifier,
+      );
+    }
   }
 
   @CaptureSpan()
   public async updateLastSeen(clusterId: ObjectID): Promise<void> {
+    const cacheKey: string = clusterId.toString();
+
+    const cached: string | null = await GlobalCache.getString(
+      LAST_SEEN_CACHE_NAMESPACE,
+      cacheKey,
+    );
+
+    if (cached) {
+      return; // another pod already updated recently
+    }
+
+    await GlobalCache.setString(LAST_SEEN_CACHE_NAMESPACE, cacheKey, "1", {
+      expiresInSeconds: LAST_SEEN_THROTTLE_SECONDS,
+    });
+
     await this.updateOneById({
       id: clusterId,
       data: {

package/Server/Services/MonitorFeedService.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 MonitorFeed, {
   MonitorFeedEventType,
@@ -43,8 +43,14 @@ export class Service extends DatabaseService<MonitorFeed> {
       | undefined;
   }): Promise<void> {
     try {
-      logger.debug("MonitorFeedService.createMonitorFeedItem");
-      logger.debug(data);
+      logger.debug("MonitorFeedService.createMonitorFeedItem", {
+        projectId: data.projectId?.toString(),
+        monitorId: data.monitorId?.toString(),
+      } as LogAttributes);
+      logger.debug(data, {
+        projectId: data.projectId?.toString(),
+        monitorId: data.monitorId?.toString(),
+      } as LogAttributes);
 
       const monitorFeed: MonitorFeed = new MonitorFeed();
 
@@ -93,8 +99,14 @@ export class Service extends DatabaseService<MonitorFeed> {
         },
       });
 
-      logger.debug("Monitor Feed created");
-      logger.debug(createdMonitorFeed);
+      logger.debug("Monitor Feed created", {
+        projectId: data.projectId?.toString(),
+        monitorId: data.monitorId?.toString(),
+      } as LogAttributes);
+      logger.debug(createdMonitorFeed, {
+        projectId: data.projectId?.toString(),
+        monitorId: data.monitorId?.toString(),
+      } as LogAttributes);
 
       try {
         // send notification to slack and teams
@@ -110,14 +122,26 @@ export class Service extends DatabaseService<MonitorFeed> {
           });
         }
       } 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(),
+          monitorId: data.monitorId?.toString(),
+        } as LogAttributes);
+        logger.error(e, {
+          projectId: data.projectId?.toString(),
+          monitorId: data.monitorId?.toString(),
+        } as LogAttributes);
 
         // we dont throw this error as it is not a critical error
       }
     } catch (e) {
-      logger.error("Error in creating monitor feed");
-      logger.error(e);
+      logger.error("Error in creating monitor feed", {
+        projectId: data.projectId?.toString(),
+        monitorId: data.monitorId?.toString(),
+      } as LogAttributes);
+      logger.error(e, {
+        projectId: data.projectId?.toString(),
+        monitorId: data.monitorId?.toString(),
+      } as LogAttributes);
 
       // we dont throw this error as it is not a critical error
     }

package/Server/Services/MonitorProbeService.ts

@@ -11,7 +11,7 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import MonitorService from "./MonitorService";
 import { MonitorTypeHelper } from "../../Types/Monitor/MonitorType";
 import CronTab from "../Utils/CronTab";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 
 export class Service extends DatabaseService<MonitorProbe> {
   public constructor() {
@@ -54,7 +54,9 @@ export class Service extends DatabaseService<MonitorProbe> {
           monitorProbe?.monitor?.monitoringInterval as string,
         );
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          monitorId: data.monitorId?.toString(),
+        } as LogAttributes);
       }
 
       if (nextPing && monitorProbe.id) {
@@ -92,13 +94,15 @@ export class Service extends DatabaseService<MonitorProbe> {
     const claimedIds: Array<ObjectID> = await this.executeTransaction(
       async (transactionalEntityManager: EntityManager) => {
         /*
-         * First, select and lock the monitor probes that need to be processed
+         * Select and lock the monitor probes that need to be processed,
+         * including the monitoringInterval so we can compute the real nextPingAt
+         * in a single UPDATE (avoiding a second round-trip).
          * FOR UPDATE SKIP LOCKED ensures that:
          * 1. Rows are locked for this transaction
          * 2. Rows already locked by other transactions are skipped
          */
         const selectQuery: string = `
-        SELECT mp."_id"
+        SELECT mp."_id", m."monitoringInterval"
         FROM "MonitorProbe" mp
         INNER JOIN "Monitor" m ON mp."monitorId" = m."_id"
         INNER JOIN "Project" p ON mp."projectId" = p."_id"
@@ -120,41 +124,60 @@ export class Service extends DatabaseService<MonitorProbe> {
         FOR UPDATE OF mp SKIP LOCKED
       `;
 
-        const selectedRows: Array<{ _id: string }> =
-          await transactionalEntityManager.query(selectQuery, [
-            data.probeId.toString(),
-            currentDate,
-            data.limit,
-          ]);
+        const selectedRows: Array<{
+          _id: string;
+          monitoringInterval: string | null;
+        }> = await transactionalEntityManager.query(selectQuery, [
+          data.probeId.toString(),
+          currentDate,
+          data.limit,
+        ]);
 
         if (selectedRows.length === 0) {
           return [];
         }
 
-        const ids: Array<string> = selectedRows.map((row: { _id: string }) => {
-          return row._id;
-        });
-
-        /*
-         * Update the claimed monitors to set nextPingAt to 1 minute from now
-         * This is a temporary value; the actual nextPingAt will be calculated
-         * based on the monitor's interval after the probe fetches the full details
-         */
-        const tempNextPingAt: Date = OneUptimeDate.addRemoveMinutes(
+        // Compute the real nextPingAt per monitor and batch-update in one query
+        const defaultNextPing: Date = OneUptimeDate.addRemoveMinutes(
           currentDate,
           1,
         );
 
+        const ids: Array<string> = [];
+        const nextPingDates: Array<Date> = [];
+        const caseFragments: Array<string> = [];
+
+        for (let i: number = 0; i < selectedRows.length; i++) {
+          const row: { _id: string; monitoringInterval: string | null } =
+            selectedRows[i]!;
+          ids.push(row._id);
+
+          let nextPing: Date = defaultNextPing;
+          if (row.monitoringInterval) {
+            try {
+              nextPing = CronTab.getNextExecutionTime(row.monitoringInterval);
+            } catch {
+              // fall back to default 1 minute
+            }
+          }
+
+          nextPingDates.push(nextPing);
+          caseFragments.push(
+            `WHEN '${row._id}'::uuid THEN $${i + 3}::timestamptz`,
+          );
+        }
+
         const updateQuery: string = `
         UPDATE "MonitorProbe"
-        SET "lastPingAt" = $1, "nextPingAt" = $2
-        WHERE "_id" = ANY($3::uuid[])
+        SET "lastPingAt" = $1,
+            "nextPingAt" = CASE "_id" ${caseFragments.join(" ")} END
+        WHERE "_id" = ANY($2::uuid[])
       `;
 
         await transactionalEntityManager.query(updateQuery, [
           currentDate,
-          tempNextPingAt,
           ids,
+          ...nextPingDates,
         ]);
 
         return ids.map((id: string) => {

package/Server/Services/MonitorService.ts

@@ -65,7 +65,7 @@ import MonitorFeedService from "./MonitorFeedService";
 import { MonitorFeedEventType } from "../../Models/DatabaseModels/MonitorFeed";
 import { Gray500, Green500 } from "../../Types/BrandColors";
 import LabelService from "./LabelService";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import ExceptionMessages from "../../Types/Exception/ExceptionMessages";
 import Project from "../../Models/DatabaseModels/Project";
@@ -263,6 +263,10 @@ export class Service extends DatabaseService<Model> {
       } catch (error) {
         logger.error(
           `Error while archiving workspace channels for monitor ${monitor.id?.toString()}: ${error}`,
+          {
+            projectId: monitor.projectId?.toString(),
+            monitorId: monitor.id?.toString(),
+          } as LogAttributes,
         );
       }
     }
@@ -620,6 +624,10 @@ ${createdItem.description?.trim() || "No description provided."}
         } catch (error) {
           logger.error(
             "Workspace operations failed in MonitorService.onCreateSuccess",
+            {
+              projectId: createdItem.projectId?.toString(),
+              monitorId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           logger.error(error as Error);
           return Promise.resolve();
@@ -639,6 +647,10 @@ ${createdItem.description?.trim() || "No description provided."}
         } catch (error) {
           logger.error(
             "Change monitor status failed in MonitorService.onCreateSuccess",
+            {
+              projectId: createdItem.projectId?.toString(),
+              monitorId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           logger.error(error as Error);
           return Promise.resolve();
@@ -659,6 +671,10 @@ ${createdItem.description?.trim() || "No description provided."}
         } catch (error) {
           logger.error(
             "Add default probes failed in MonitorService.onCreateSuccess",
+            {
+              projectId: createdItem.projectId?.toString(),
+              monitorId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           logger.error(error as Error);
           return Promise.resolve();
@@ -675,6 +691,10 @@ ${createdItem.description?.trim() || "No description provided."}
         } catch (error) {
           logger.error(
             "Billing operations failed in MonitorService.onCreateSuccess",
+            {
+              projectId: createdItem.projectId?.toString(),
+              monitorId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           logger.error(error as Error);
           return Promise.resolve();
@@ -702,7 +722,10 @@ ${createdItem.description?.trim() || "No description provided."}
           }
           return Promise.resolve();
         } catch (error) {
-          logger.error("Add owners failed in MonitorService.onCreateSuccess");
+          logger.error("Add owners failed in MonitorService.onCreateSuccess", {
+            projectId: createdItem.projectId?.toString(),
+            monitorId: createdItem.id?.toString(),
+          } as LogAttributes);
           logger.error(error as Error);
           return Promise.resolve();
         }
@@ -713,6 +736,10 @@ ${createdItem.description?.trim() || "No description provided."}
         } catch (error) {
           logger.error(
             "Refresh probe status failed in MonitorService.onCreateSuccess",
+            {
+              projectId: createdItem.projectId?.toString(),
+              monitorId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           logger.error(error as Error);
           return Promise.resolve();
@@ -721,6 +748,10 @@ ${createdItem.description?.trim() || "No description provided."}
       .catch((error: Error) => {
         logger.error(
           `Critical error in MonitorService sequential operations: ${error}`,
+          {
+            projectId: createdItem.projectId?.toString(),
+            monitorId: createdItem.id?.toString(),
+          } as LogAttributes,
         );
       });
 
@@ -1287,7 +1318,7 @@ ${createdItem.description?.trim() || "No description provided."}
       const emailMessage: EmailEnvelope = {
         templateType: EmailTemplateType.MonitorProbesStatus,
         vars: vars,
-        subject: `[Monitor Probes ${enabledStatus}] ${monitor.name!}`,
+        subject: `[${enabledStatus} Monitor Probes] ${monitor.name!}`,
       };
 
       const sms: SMSMessage = {
@@ -1417,7 +1448,7 @@ ${createdItem.description?.trim() || "No description provided."}
       const emailMessage: EmailEnvelope = {
         templateType: EmailTemplateType.MonitorProbesStatus,
         vars: vars,
-        subject: `[Monitor Probes ${status}] ${monitor.name!}`,
+        subject: `[${status} Monitor Probes] ${monitor.name!}`,
       };
 
       const sms: SMSMessage = {