@oneuptime/common 10.0.53 → 10.0.54

package/Server/Services/AlertEpisodeStateTimelineService.ts

@@ -15,7 +15,7 @@ import AlertEpisode from "../../Models/DatabaseModels/AlertEpisode";
 import AlertEpisodeStateTimeline from "../../Models/DatabaseModels/AlertEpisodeStateTimeline";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import AlertEpisodeFeedService from "./AlertEpisodeFeedService";
 import { AlertEpisodeFeedEventType } from "../../Models/DatabaseModels/AlertEpisodeFeed";
 import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore";
@@ -50,7 +50,10 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
           namespace: "AlertEpisodeStateTimeline.create",
         });
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createBy.data.projectId?.toString(),
+          alertEpisodeId: createBy.data.alertEpisodeId?.toString(),
+        } as LogAttributes);
       }
 
       if (
@@ -109,8 +112,14 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
           },
         });
 
-      logger.debug("State Before this");
-      logger.debug(stateBeforeThis);
+      logger.debug("State Before this", {
+        projectId: createBy.data.projectId?.toString(),
+        alertEpisodeId: createBy.data.alertEpisodeId?.toString(),
+      } as LogAttributes);
+      logger.debug(stateBeforeThis, {
+        projectId: createBy.data.projectId?.toString(),
+        alertEpisodeId: createBy.data.alertEpisodeId?.toString(),
+      } as LogAttributes);
 
       // If this is the first state, then do not notify the owner.
       if (!stateBeforeThis) {
@@ -164,8 +173,14 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
         }
       }
 
-      logger.debug("State After this");
-      logger.debug(stateAfterThis);
+      logger.debug("State After this", {
+        projectId: createBy.data.projectId?.toString(),
+        alertEpisodeId: createBy.data.alertEpisodeId?.toString(),
+      } as LogAttributes);
+      logger.debug(stateAfterThis, {
+        projectId: createBy.data.projectId?.toString(),
+        alertEpisodeId: createBy.data.alertEpisodeId?.toString(),
+      } as LogAttributes);
 
       return {
         createBy,
@@ -181,7 +196,10 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
         try {
           await Semaphore.release(mutex);
         } catch (err) {
-          logger.error(err);
+          logger.error(err, {
+            projectId: createBy.data.projectId?.toString(),
+            alertEpisodeId: createBy.data.alertEpisodeId?.toString(),
+          } as LogAttributes);
         }
       }
 
@@ -204,19 +222,40 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
       throw new BadDataException("alertStateId is null");
     }
 
-    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(),
+      alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineBeforeThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Status Timeline After this", {
+      projectId: createdItem.projectId?.toString(),
+      alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+    } as LogAttributes);
+    logger.debug(onCreate.carryForward.statusTimelineAfterThisStatus, {
+      projectId: createdItem.projectId?.toString(),
+      alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+    } as LogAttributes);
+
+    logger.debug("Created Item", {
+      projectId: createdItem.projectId?.toString(),
+      alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+    } as LogAttributes);
+    logger.debug(createdItem, {
+      projectId: createdItem.projectId?.toString(),
+      alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+    } as LogAttributes);
 
     // Handle timeline updates
     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(),
+        alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+      } as LogAttributes);
     } else if (!onCreate.carryForward.statusTimelineAfterThisStatus) {
       // This is the last status. Update the previous status to end at the start of this status.
       await this.updateOneById({
@@ -228,7 +267,10 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
           isRoot: true,
         },
       });
-      logger.debug("This is the last status.");
+      logger.debug("This is the last status.", {
+        projectId: createdItem.projectId?.toString(),
+        alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+      } as LogAttributes);
     } else {
       // This is in the middle. Update the previous status to end at the start of this status.
       await this.updateOneById({
@@ -251,7 +293,10 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
           isRoot: true,
         },
       });
-      logger.debug("This status is in the middle.");
+      logger.debug("This status is in the middle.", {
+        projectId: createdItem.projectId?.toString(),
+        alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+      } as LogAttributes);
     }
 
     // Update episode's current state if this is the latest timeline entry
@@ -305,6 +350,10 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
         } catch (error) {
           logger.error(
             `Failed to cascade state change to member alerts: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+            } as LogAttributes,
           );
         }
       }
@@ -314,7 +363,10 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
       try {
         await Semaphore.release(mutex);
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createdItem.projectId?.toString(),
+          alertEpisodeId: createdItem.alertEpisodeId?.toString(),
+        } as LogAttributes);
       }
     }
 
@@ -471,7 +523,9 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
 
         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.", {
+            alertEpisodeId: episodeId?.toString(),
+          } as LogAttributes);
         } else if (!stateAfterThis) {
           // This is the last state. Update the previous state to end at the end of this state.
           await this.updateOneById({
@@ -483,7 +537,9 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
               isRoot: true,
             },
           });
-          logger.debug("This is the last state.");
+          logger.debug("This is the last state.", {
+            alertEpisodeId: episodeId?.toString(),
+          } as LogAttributes);
         } else {
           // This state is in the middle. Update the previous state to end at the start of the next state.
           await this.updateOneById({
@@ -506,7 +562,9 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
               isRoot: true,
             },
           });
-          logger.debug("This state is in the middle.");
+          logger.debug("This state is in the middle.", {
+            alertEpisodeId: episodeId?.toString(),
+          } as LogAttributes);
         }
       }
 

package/Server/Services/AlertFeedService.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 Model, {
   AlertFeedEventType,
@@ -101,14 +101,26 @@ export class Service extends DatabaseService<Model> {
           });
         }
       } 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(),
+          alertId: data.alertId?.toString(),
+        } as LogAttributes);
+        logger.error(e, {
+          projectId: data.projectId?.toString(),
+          alertId: data.alertId?.toString(),
+        } as LogAttributes);
 
         // we dont throw this error as it is not a critical error
       }
     } catch (error) {
-      logger.error("AlertFeedService.createAlertFeedItem");
-      logger.error(error);
+      logger.error("AlertFeedService.createAlertFeedItem", {
+        projectId: data.projectId?.toString(),
+        alertId: data.alertId?.toString(),
+      } as LogAttributes);
+      logger.error(error, {
+        projectId: data.projectId?.toString(),
+        alertId: data.alertId?.toString(),
+      } as LogAttributes);
       // we dont want to throw the error here, as this is a non-critical operation
     }
   }

package/Server/Services/AlertGroupingEngineService.ts

@@ -12,7 +12,7 @@ import Monitor from "../../Models/DatabaseModels/Monitor";
 import AlertSeverity from "../../Models/DatabaseModels/AlertSeverity";
 import ServiceMonitor from "../../Models/DatabaseModels/ServiceMonitor";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import OneUptimeDate from "../../Types/Date";
 import QueryHelper from "../Types/Database/QueryHelper";
@@ -38,11 +38,15 @@ export interface GroupingResult {
 class AlertGroupingEngineServiceClass {
   @CaptureSpan()
   public async processAlert(alert: Alert): Promise<GroupingResult> {
-    logger.debug(`Processing alert ${alert.id} for grouping`);
+    logger.debug(`Processing alert ${alert.id} for grouping`, {
+      projectId: alert.projectId?.toString(),
+    } as LogAttributes);
 
     try {
       if (!alert.id || !alert.projectId) {
-        logger.warn("Alert missing id or projectId, skipping grouping");
+        logger.warn("Alert missing id or projectId, skipping grouping", {
+          projectId: alert.projectId?.toString(),
+        } as LogAttributes);
         return { grouped: false };
       }
 
@@ -124,12 +128,14 @@ class AlertGroupingEngineServiceClass {
       if (rules.length === 0) {
         logger.debug(
           `No enabled grouping rules found for project ${alert.projectId}`,
+          { projectId: alert.projectId?.toString() } as LogAttributes,
         );
         return { grouped: false };
       }
 
       logger.debug(
         `Found ${rules.length} enabled grouping rules for project ${alert.projectId}`,
+        { projectId: alert.projectId?.toString() } as LogAttributes,
       );
 
       // Find first matching rule
@@ -139,6 +145,7 @@ class AlertGroupingEngineServiceClass {
         if (matches) {
           logger.debug(
             `Alert ${alert.id} matches rule ${rule.name || rule.id}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
 
           // Try to find existing episode or create new one
@@ -150,10 +157,14 @@ class AlertGroupingEngineServiceClass {
         }
       }
 
-      logger.debug(`Alert ${alert.id} did not match any grouping rules`);
+      logger.debug(`Alert ${alert.id} did not match any grouping rules`, {
+        projectId: alert.projectId?.toString(),
+      } as LogAttributes);
       return { grouped: false };
     } catch (error) {
-      logger.error(`Error processing alert for grouping: ${error}`);
+      logger.error(`Error processing alert for grouping: ${error}`, {
+        projectId: alert.projectId?.toString(),
+      } as LogAttributes);
       return { grouped: false };
     }
   }
@@ -165,6 +176,7 @@ class AlertGroupingEngineServiceClass {
   ): Promise<boolean> {
     logger.debug(
       `Checking if alert ${alert.id} matches rule ${rule.name || rule.id}`,
+      { projectId: alert.projectId?.toString() } as LogAttributes,
     );
 
     // Check monitor IDs - if monitors are specified, alert must be from one of them
@@ -286,6 +298,7 @@ class AlertGroupingEngineServiceClass {
         } catch {
           logger.warn(
             `Invalid regex pattern in rule ${rule.id}: ${rule.monitorNamePattern}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
           return false;
         }
@@ -304,6 +317,7 @@ class AlertGroupingEngineServiceClass {
         } catch {
           logger.warn(
             `Invalid regex pattern in rule ${rule.id}: ${rule.monitorDescriptionPattern}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
           return false;
         }
@@ -323,6 +337,7 @@ class AlertGroupingEngineServiceClass {
       } catch {
         logger.warn(
           `Invalid regex pattern in rule ${rule.id}: ${rule.alertTitlePattern}`,
+          { projectId: alert.projectId?.toString() } as LogAttributes,
         );
         return false;
       }
@@ -341,6 +356,7 @@ class AlertGroupingEngineServiceClass {
       } catch {
         logger.warn(
           `Invalid regex pattern in rule ${rule.id}: ${rule.alertDescriptionPattern}`,
+          { projectId: alert.projectId?.toString() } as LogAttributes,
         );
         return false;
       }
@@ -349,6 +365,7 @@ class AlertGroupingEngineServiceClass {
     // If no criteria specified (all fields empty), rule matches all alerts
     logger.debug(
       `Rule ${rule.name || rule.id} matched alert ${alert.id} (all criteria passed)`,
+      { projectId: alert.projectId?.toString() } as LogAttributes,
     );
     return true;
   }
@@ -373,6 +390,7 @@ class AlertGroupingEngineServiceClass {
        */
       logger.debug(
         `Acquiring mutex for grouping key: ${mutexKey} for alert ${alert.id}`,
+        { projectId: alert.projectId?.toString() } as LogAttributes,
       );
       mutex = await Semaphore.lock({
         key: mutexKey,
@@ -382,6 +400,7 @@ class AlertGroupingEngineServiceClass {
       });
       logger.debug(
         `Acquired mutex for grouping key: ${mutexKey} for alert ${alert.id}`,
+        { projectId: alert.projectId?.toString() } as LogAttributes,
       );
 
       // Calculate time window cutoff (only if time window is enabled)
@@ -496,14 +515,17 @@ class AlertGroupingEngineServiceClass {
         try {
           logger.debug(
             `Releasing mutex for grouping key: ${mutexKey} for alert ${alert.id}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
           await Semaphore.release(mutex);
           logger.debug(
             `Released mutex for grouping key: ${mutexKey} for alert ${alert.id}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
         } catch (err) {
           logger.error(
             `Error releasing mutex for grouping key: ${mutexKey}: ${err}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
         }
       }
@@ -747,6 +769,7 @@ class AlertGroupingEngineServiceClass {
           } catch (ownerError) {
             logger.error(
               `Error adding owner user ${user.id} to episode: ${ownerError}`,
+              { projectId: alert.projectId?.toString() } as LogAttributes,
             );
           }
         }
@@ -777,6 +800,7 @@ class AlertGroupingEngineServiceClass {
           } catch (ownerError) {
             logger.error(
               `Error adding owner team ${team.id} to episode: ${ownerError}`,
+              { projectId: alert.projectId?.toString() } as LogAttributes,
             );
           }
         }
@@ -824,13 +848,16 @@ class AlertGroupingEngineServiceClass {
         } catch (feedError) {
           logger.error(
             `Error creating episode feed for episode creation: ${feedError}`,
+            { projectId: alert.projectId?.toString() } as LogAttributes,
           );
         }
       }
 
       return createdEpisode;
     } catch (error) {
-      logger.error(`Error creating new episode: ${error}`);
+      logger.error(`Error creating new episode: ${error}`, {
+        projectId: alert.projectId?.toString(),
+      } as LogAttributes);
       return null;
     }
   }
@@ -989,7 +1016,9 @@ class AlertGroupingEngineServiceClass {
         error instanceof Error &&
         error.message.includes("already a member")
       ) {
-        logger.debug(`Alert ${alert.id} is already in episode ${episodeId}`);
+        logger.debug(`Alert ${alert.id} is already in episode ${episodeId}`, {
+          projectId: alert.projectId?.toString(),
+        } as LogAttributes);
         return;
       }
       throw error;

package/Server/Services/AlertService.ts

@@ -28,7 +28,7 @@ import AlertState from "../../Models/DatabaseModels/AlertState";
 import AlertStateTimeline from "../../Models/DatabaseModels/AlertStateTimeline";
 import User from "../../Models/DatabaseModels/User";
 import { IsBillingEnabled } from "../EnvironmentConfig";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
 import MetricService from "./MetricService";
 import GlobalConfigService from "./GlobalConfigService";
@@ -261,6 +261,10 @@ export class Service extends DatabaseService<Model> {
           } catch (error) {
             logger.error(
               `Workspace operations failed in AlertService.onCreateSuccess: ${error}`,
+              {
+                projectId: createdItem.projectId?.toString(),
+                alertId: createdItem.id?.toString(),
+              } as LogAttributes,
             );
             return Promise.resolve();
           }
@@ -273,6 +277,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Create alert feed failed in AlertService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve(); // Continue chain even on error
         }
@@ -283,6 +291,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Handle alert state change failed in AlertService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve(); // Continue chain even on error
         }
@@ -311,6 +323,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Add owners failed in AlertService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve(); // Continue chain even on error
         }
@@ -325,6 +341,10 @@ export class Service extends DatabaseService<Model> {
           } catch (error) {
             logger.error(
               `On-call duty policy execution failed in AlertService.onCreateSuccess: ${error}`,
+              {
+                projectId: createdItem.projectId?.toString(),
+                alertId: createdItem.id?.toString(),
+              } as LogAttributes,
             );
             return Promise.resolve();
           }
@@ -338,6 +358,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Alert grouping failed in AlertService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
           return Promise.resolve();
         }
@@ -345,6 +369,10 @@ export class Service extends DatabaseService<Model> {
       .catch((error: Error) => {
         logger.error(
           `Critical error in AlertService sequential operations: ${error}`,
+          {
+            projectId: createdItem.projectId?.toString(),
+            alertId: createdItem.id?.toString(),
+          } as LogAttributes,
         );
       });
 
@@ -375,8 +403,14 @@ export class Service extends DatabaseService<Model> {
             : {}),
         });
 
-      logger.debug("Alert created. Workspace result:");
-      logger.debug(workspaceResult);
+      logger.debug("Alert created. Workspace result:", {
+        projectId: createdItem.projectId?.toString(),
+        alertId: createdItem.id?.toString(),
+      } as LogAttributes);
+      logger.debug(workspaceResult, {
+        projectId: createdItem.projectId?.toString(),
+        alertId: createdItem.id?.toString(),
+      } as LogAttributes);
 
       if (workspaceResult && workspaceResult.channelsCreated?.length > 0) {
         // update alert with these channels.
@@ -392,7 +426,10 @@ export class Service extends DatabaseService<Model> {
         });
       }
     } catch (error) {
-      logger.error(`Error in handleAlertWorkspaceOperationsAsync: ${error}`);
+      logger.error(`Error in handleAlertWorkspaceOperationsAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        alertId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -506,7 +543,9 @@ ${alert.remediationNotes || "No remediation notes provided."}
         },
       });
     } catch (error) {
-      logger.error(`Error in createAlertFeedAsync: ${error}`);
+      logger.error(`Error in createAlertFeedAsync: ${error}`, {
+        alertId: alertId?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -532,7 +571,10 @@ ${alert.remediationNotes || "No remediation notes provided."}
         },
       });
     } catch (error) {
-      logger.error(`Error in handleAlertStateChangeAsync: ${error}`);
+      logger.error(`Error in handleAlertStateChangeAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        alertId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -562,7 +604,10 @@ ${alert.remediationNotes || "No remediation notes provided."}
         await Promise.allSettled(policyPromises);
       }
     } catch (error) {
-      logger.error(`Error in executeAlertOnCallDutyPoliciesAsync: ${error}`);
+      logger.error(`Error in executeAlertOnCallDutyPoliciesAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        alertId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -1385,7 +1430,10 @@ ${alertSeverity.name}
       metricNameServiceNameMap: metricTypesMap,
       projectId: alert.projectId,
     }).catch((err: Error) => {
-      logger.error(err);
+      logger.error(err, {
+        projectId: alert.projectId?.toString(),
+        alertId: alert.id?.toString(),
+      } as LogAttributes);
     });
   }
 
@@ -1562,6 +1610,10 @@ ${alertSeverity.name}
       });
       logger.info(
         `Updated Alert ${alert.id} current state to ${latestTimeline.alertStateId}`,
+        {
+          projectId: alert.projectId?.toString(),
+          alertId: alert.id?.toString(),
+        } as LogAttributes,
       );
     }
   }

package/Server/Services/AlertStateTimelineService.ts

@@ -18,7 +18,7 @@ import { JSONObject } from "../../Types/JSON";
 import AlertInternalNote from "../../Models/DatabaseModels/AlertInternalNote";
 import AlertInternalNoteService from "./AlertInternalNoteService";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import AlertFeedService from "./AlertFeedService";
 import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
@@ -78,7 +78,10 @@ export class Service extends DatabaseService<AlertStateTimeline> {
           namespace: "AlertStateTimeline.create",
         });
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createBy.data.projectId?.toString(),
+          alertId: createBy.data.alertId?.toString(),
+        } as LogAttributes);
       }
 
       if (
@@ -267,7 +270,10 @@ export class Service extends DatabaseService<AlertStateTimeline> {
         try {
           await Semaphore.release(mutex);
         } catch (err) {
-          logger.error(err);
+          logger.error(err, {
+            projectId: createBy.data.projectId?.toString(),
+            alertId: createBy.data.alertId?.toString(),
+          } as LogAttributes);
         }
       }
 
@@ -365,7 +371,10 @@ export class Service extends DatabaseService<AlertStateTimeline> {
       try {
         await Semaphore.release(mutex);
       } catch (err) {
-        logger.error(err);
+        logger.error(err, {
+          projectId: createdItem.projectId?.toString(),
+          alertId: createdItem.alertId?.toString(),
+        } as LogAttributes);
       }
     }
 
@@ -450,8 +459,15 @@ ${createdItem.rootCause}`,
     }).catch((error: Error) => {
       logger.error(
         "Error while refreshing alert metrics after alert state timeline creation",
+        {
+          projectId: createdItem.projectId?.toString(),
+          alertId: createdItem.alertId?.toString(),
+        } as LogAttributes,
       );
-      logger.error(error);
+      logger.error(error, {
+        projectId: createdItem.projectId?.toString(),
+        alertId: createdItem.alertId?.toString(),
+      } as LogAttributes);
     });
 
     const isLastAlertState: boolean = await this.isLastAlertState({
@@ -475,8 +491,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(),
+          alertId: createdItem.alertId?.toString(),
+        } as LogAttributes);
+        logger.error(error, {
+          projectId: createdItem.projectId?.toString(),
+          alertId: createdItem.alertId?.toString(),
+        } as LogAttributes);
       });
     }