@oneuptime/common 10.0.52 → 10.0.54

package/Server/API/UserSmsAPI.ts

@@ -10,7 +10,7 @@ import {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
@@ -107,7 +107,10 @@ export default class UserSMSAPI extends BaseAPI<UserSMS, UserSMSServiceType> {
               },
             );
           } catch (e) {
-            logger.error(e);
+            logger.error(
+              e,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
+            );
           }
 
           return Response.sendEmptySuccessResponse(req, res);

package/Server/API/UserWhatsAppAPI.ts

@@ -10,7 +10,7 @@ import {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
@@ -116,7 +116,10 @@ export default class UserWhatsAppAPI extends BaseAPI<
               },
             );
           } catch (e) {
-            logger.error(e);
+            logger.error(
+              e,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
+            );
           }
 
           return Response.sendEmptySuccessResponse(req, res);

package/Server/Infrastructure/Postgres/SchemaMigrations/1774559064921-MigrationName.ts

@@ -0,0 +1,47 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1774559064921 implements MigrationInterface {
+  public name = "MigrationName1774559064921";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    /*
+     * First, deduplicate existing services by keeping the oldest one (smallest _id / earliest createdAt).
+     * Reassign any foreign key references from duplicate services to the kept service,
+     * then delete the duplicates.
+     */
+
+    /*
+     * Find and delete duplicate services, keeping the one with the earliest createdAt.
+     * For each (projectId, name) group with duplicates, keep the min(_id) row.
+     */
+    await queryRunner.query(`
+      DELETE FROM "Service"
+      WHERE "_id" IN (
+        SELECT s."_id"
+        FROM "Service" s
+        INNER JOIN (
+          SELECT "projectId", LOWER("name") as lower_name, MIN("createdAt") as min_created
+          FROM "Service"
+          WHERE "deletedAt" IS NULL
+          GROUP BY "projectId", LOWER("name")
+          HAVING COUNT(*) > 1
+        ) dups
+        ON s."projectId" = dups."projectId"
+        AND LOWER(s."name") = dups.lower_name
+        AND s."createdAt" > dups.min_created
+        AND s."deletedAt" IS NULL
+      )
+    `);
+
+    // Now add a unique index on (projectId, name) for non-deleted rows.
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_SERVICE_PROJECT_NAME_UNIQUE" ON "Service" ("projectId", LOWER("name")) WHERE "deletedAt" IS NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS "IDX_SERVICE_PROJECT_NAME_UNIQUE"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1775735059360-MigrationName.ts

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1775735059360 implements MigrationInterface {
+  public name = "MigrationName1775735059360";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_SERVICE_PROJECT_NAME_UNIQUE"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Workflow" ALTER COLUMN "webhookSecretKey" TYPE character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Workflow" ALTER COLUMN "webhookSecretKey" TYPE text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_SERVICE_PROJECT_NAME_UNIQUE" ON "Service" ("projectId") WHERE ("deletedAt" IS NULL)`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -275,6 +275,8 @@ import { MigrationName1774524742178 } from "./1774524742178-MigrationName";
 import { MigrationName1774524742179 } from "./1774524742179-MigrationName";
 import { MigrationName1774559064919 } from "./1774559064919-MigrationName";
 import { MigrationName1774559064920 } from "./1774559064920-MigrationName";
+import { MigrationName1774559064921 } from "./1774559064921-MigrationName";
+import { MigrationName1775735059360 } from "./1775735059360-MigrationName";
 
 export default [
   InitialMigration,
@@ -554,4 +556,6 @@ export default [
   MigrationName1774524742179,
   MigrationName1774559064919,
   MigrationName1774559064920,
+  MigrationName1774559064921,
+  MigrationName1775735059360,
 ];

package/Server/Middleware/NotificationMiddleware.ts

@@ -6,7 +6,7 @@ import {
 } from "../Utils/Express";
 import JSONWebToken from "../Utils/JsonWebToken";
 import Response from "../Utils/Response";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import { OnCallInputRequest } from "../../Types/Call/CallRequest";
 import BadDataException from "../../Types/Exception/BadDataException";
 import JSONFunctions from "../../Types/JSONFunctions";
@@ -62,7 +62,7 @@ export default class NotificationMiddleware {
         JSONWebToken.decodeJsonPayload(token),
       );
     } catch (e) {
-      logger.error(e);
+      logger.error(e, getLogAttributesFromRequest(req as any));
       return Response.sendErrorResponse(
         req,
         res,

package/Server/Middleware/ProjectAuthorization.ts

@@ -19,6 +19,7 @@ import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig";
 import User from "../../Models/DatabaseModels/User";
 import APIKeyAccessPermission from "../Utils/APIKey/AccessPermission";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import SpanUtil from "../Utils/Telemetry/SpanUtil";
 
 export default class ProjectMiddleware {
   @CaptureSpan()
@@ -75,6 +76,11 @@ export default class ProjectMiddleware {
 
       if (tenantId) {
         (req as OneUptimeRequest).tenantId = tenantId;
+
+        // Tag the current span with project context for observability
+        SpanUtil.addAttributesToCurrentSpan({
+          projectId: tenantId.toString(),
+        });
       }
 
       if (!apiKey) {

package/Server/Middleware/SCIMAuthorization.ts

@@ -12,7 +12,7 @@ import StatusPageSCIM from "../../Models/DatabaseModels/StatusPageSCIM";
 import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
 import BadRequestException from "../../Types/Exception/BadRequestException";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 
 export default class SCIMMiddleware {
   @CaptureSpan()
@@ -44,6 +44,7 @@ export default class SCIMMiddleware {
         `SCIM Authorization: scimId=${scimId}, bearerToken=${
           bearerToken ? "***" : "missing"
         }`,
+        getLogAttributesFromRequest(req as OneUptimeRequest),
       );
 
       if (!bearerToken) {

package/Server/Middleware/SlackAuthorization.ts

@@ -7,7 +7,7 @@ import Response from "../Utils/Response";
 import BadDataException from "../../Types/Exception/BadDataException";
 import { SlackAppSigningSecret } from "../EnvironmentConfig";
 import crypto from "crypto";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class SlackAuthorization {
@@ -17,10 +17,16 @@ export default class SlackAuthorization {
     res: ExpressResponse,
     next: NextFunction,
   ): Promise<void> {
-    logger.debug("Starting Slack request authorization");
+    logger.debug(
+      "Starting Slack request authorization",
+      getLogAttributesFromRequest(req),
+    );
 
     if (!SlackAppSigningSecret) {
-      logger.error("SLACK_APP_SIGNING_SECRET env variable not found.");
+      logger.error(
+        "SLACK_APP_SIGNING_SECRET env variable not found.",
+        getLogAttributesFromRequest(req),
+      );
       return Response.sendErrorResponse(
         req,
         res,
@@ -43,15 +49,21 @@ export default class SlackAuthorization {
       (req as OneUptimeRequest).rawFormUrlEncodedBody ||
       "";
 
-    logger.debug(`slackSignature: ${slackSignature}`);
-    logger.debug(`timestamp: ${timestamp}`);
-    logger.debug(`requestBody: `);
-    logger.debug(requestBody);
+    logger.debug(
+      `slackSignature: ${slackSignature}`,
+      getLogAttributesFromRequest(req),
+    );
+    logger.debug(`timestamp: ${timestamp}`, getLogAttributesFromRequest(req));
+    logger.debug(`requestBody: `, getLogAttributesFromRequest(req));
+    logger.debug(requestBody, getLogAttributesFromRequest(req));
 
     const baseString: string = `v0:${timestamp}:${requestBody}`;
     const signature: string = `v0=${crypto.createHmac("sha256", slackSigningSecret).update(baseString).digest("hex")}`;
 
-    logger.debug(`Generated signature: ${signature}`);
+    logger.debug(
+      `Generated signature: ${signature}`,
+      getLogAttributesFromRequest(req),
+    );
 
     // check if the signature is valid
     if (
@@ -60,7 +72,10 @@ export default class SlackAuthorization {
         Buffer.from(slackSignature) as Uint8Array,
       )
     ) {
-      logger.error("Slack Signature Verification Failed.");
+      logger.error(
+        "Slack Signature Verification Failed.",
+        getLogAttributesFromRequest(req),
+      );
       return Response.sendErrorResponse(
         req,
         res,
@@ -68,7 +83,10 @@ export default class SlackAuthorization {
       );
     }
 
-    logger.debug("Slack request authorized successfully");
+    logger.debug(
+      "Slack request authorized successfully",
+      getLogAttributesFromRequest(req),
+    );
     next();
   }
 }

package/Server/Middleware/TelemetryIngest.ts

@@ -9,8 +9,9 @@ import {
 import TelemetryIngestionKeyService from "../../Server/Services/TelemetryIngestionKeyService";
 import TelemetryIngestionKey from "../../Models/DatabaseModels/TelemetryIngestionKey";
 import Response from "../Utils/Response";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import SpanUtil from "../Utils/Telemetry/SpanUtil";
 
 export interface TelemetryRequest extends ExpressRequest {
   projectId: ObjectID; // Project ID
@@ -41,7 +42,10 @@ export default class TelemetryIngest {
       }
 
       if (!oneuptimeToken) {
-        logger.error("Missing header: x-oneuptime-token");
+        logger.error(
+          "Missing header: x-oneuptime-token",
+          getLogAttributesFromRequest(req as any),
+        );
 
         if (isOpenTelemetryAPI) {
           /*
@@ -70,7 +74,10 @@ export default class TelemetryIngest {
         });
 
       if (!token) {
-        logger.error("Invalid service token: " + oneuptimeToken);
+        logger.error(
+          "Invalid service token: " + oneuptimeToken,
+          getLogAttributesFromRequest(req as any),
+        );
 
         if (isOpenTelemetryAPI) {
           /*
@@ -90,6 +97,7 @@ export default class TelemetryIngest {
       if (!projectId) {
         logger.error(
           "Project ID not found for service token: " + oneuptimeToken,
+          getLogAttributesFromRequest(req as any),
         );
 
         if (isOpenTelemetryAPI) {
@@ -107,6 +115,11 @@ export default class TelemetryIngest {
 
       (req as TelemetryRequest).projectId = projectId as ObjectID;
 
+      // Tag span with project context for telemetry ingestion observability
+      SpanUtil.addAttributesToCurrentSpan({
+        projectId: projectId.toString(),
+      });
+
       next();
     } catch (err) {
       return next(err);

package/Server/Middleware/UserAuthorization.ts

@@ -11,9 +11,10 @@ import {
 } from "../Utils/Express";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import JSONWebToken from "../Utils/JsonWebToken";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import Response from "../Utils/Response";
 import ProjectMiddleware from "./ProjectAuthorization";
+import SpanUtil from "../Utils/Telemetry/SpanUtil";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import OneUptimeDate from "../../Types/Date";
 import Dictionary from "../../Types/Dictionary";
@@ -104,7 +105,10 @@ export default class UserMiddleware {
             value as string,
           ).projectId?.toString();
         } catch (err) {
-          logger.error(err);
+          logger.error(
+            err,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           continue;
         }
 
@@ -146,12 +150,15 @@ export default class UserMiddleware {
               ssoTokens[projectId] = token;
             }
           } catch (err) {
-            logger.error(err);
+            logger.error(
+              err,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
+            );
             continue;
           }
         }
       } catch (err) {
-        logger.error(err);
+        logger.error(err, getLogAttributesFromRequest(req as OneUptimeRequest));
       }
     }
 
@@ -217,7 +224,7 @@ export default class UserMiddleware {
       oneuptimeRequest.userAuthorization = JSONWebToken.decode(accessToken);
     } catch (err) {
       // if the token is invalid or expired, return 401 so clients can refresh the token.
-      logger.error(err);
+      logger.error(err, getLogAttributesFromRequest(oneuptimeRequest));
       return Response.sendErrorResponse(
         req,
         res,
@@ -235,6 +242,16 @@ export default class UserMiddleware {
 
     const userId: string = oneuptimeRequest.userAuthorization.userId.toString();
 
+    // Tag the current span with user and project context for observability
+    SpanUtil.addAttributesToCurrentSpan({
+      userId: userId,
+      userType: oneuptimeRequest.userType,
+      ...(tenantId ? { projectId: tenantId.toString() } : {}),
+      ...(oneuptimeRequest.requestId
+        ? { requestId: oneuptimeRequest.requestId }
+        : {}),
+    });
+
     await UserService.updateOneBy({
       query: {
         _id: userId,

package/Server/Middleware/WhatsAppAuthorization.ts

@@ -9,7 +9,7 @@ import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig";
 import GlobalConfigService from "../Services/GlobalConfigService";
 import ObjectID from "../../Types/ObjectID";
 import crypto from "crypto";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class WhatsAppAuthorization {
@@ -19,7 +19,10 @@ export default class WhatsAppAuthorization {
     res: ExpressResponse,
     next: NextFunction,
   ): Promise<void> {
-    logger.debug("Starting WhatsApp webhook signature verification");
+    logger.debug(
+      "Starting WhatsApp webhook signature verification",
+      getLogAttributesFromRequest(req),
+    );
 
     const signature: string | undefined = req.headers["x-hub-signature-256"] as
       | string
@@ -28,6 +31,7 @@ export default class WhatsAppAuthorization {
     if (!signature) {
       logger.error(
         "WhatsApp webhook request missing X-Hub-Signature-256 header.",
+        getLogAttributesFromRequest(req),
       );
       return Response.sendErrorResponse(
         req,
@@ -55,6 +59,7 @@ export default class WhatsAppAuthorization {
     if (!appSecret) {
       logger.error(
         "Meta WhatsApp App Secret is not configured. Cannot verify webhook signature.",
+        getLogAttributesFromRequest(req),
       );
       return Response.sendErrorResponse(
         req,
@@ -73,7 +78,10 @@ export default class WhatsAppAuthorization {
         Buffer.from(signature) as Uint8Array,
       )
     ) {
-      logger.error("WhatsApp webhook signature verification failed.");
+      logger.error(
+        "WhatsApp webhook signature verification failed.",
+        getLogAttributesFromRequest(req),
+      );
       return Response.sendErrorResponse(
         req,
         res,
@@ -81,7 +89,10 @@ export default class WhatsAppAuthorization {
       );
     }
 
-    logger.debug("WhatsApp webhook signature verified successfully");
+    logger.debug(
+      "WhatsApp webhook signature verified successfully",
+      getLogAttributesFromRequest(req),
+    );
     next();
   }
 }

package/Server/Services/AIAgentService.ts

@@ -19,7 +19,7 @@ import Dictionary from "../../Types/Dictionary";
 import OneUptimeDate from "../../Types/Date";
 import UserNotificationSettingService from "./UserNotificationSettingService";
 import NotificationSettingEventType from "../../Types/NotificationSetting/NotificationSettingEventType";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import { CallRequestMessage } from "../../Types/Call/CallRequest";
 import { SMSMessage } from "../../Types/SMS/SMS";
 import { EmailEnvelope } from "../../Types/Email/EmailMessage";
@@ -56,8 +56,10 @@ export class Service extends DatabaseService<Model> {
         OneUptimeDate.toString(lastAlive),
       );
     } catch (err) {
-      logger.error("Error in saving last alive in cache");
-      logger.error(err);
+      logger.error("Error in saving last alive in cache", {
+        aiAgentId: aiAgentId?.toString(),
+      } as LogAttributes);
+      logger.error(err, { aiAgentId: aiAgentId?.toString() } as LogAttributes);
     }
   }
 
@@ -95,8 +97,10 @@ export class Service extends DatabaseService<Model> {
       await this.saveLastAliveInCache(aiAgentId, now);
     } catch (err) {
       // failed to hit the cache, so we will hit the database
-      logger.error("Error in getting last alive from cache");
-      logger.error(err);
+      logger.error("Error in getting last alive from cache", {
+        aiAgentId: aiAgentId?.toString(),
+      } as LogAttributes);
+      logger.error(err, { aiAgentId: aiAgentId?.toString() } as LogAttributes);
     }
 
     return true;
@@ -485,8 +489,11 @@ export class Service extends DatabaseService<Model> {
       } catch (e) {
         logger.error(
           "Error in sending AI agent status changed resource notification",
+          { projectId: aiAgent.projectId?.toString() } as LogAttributes,
         );
-        logger.error(e);
+        logger.error(e, {
+          projectId: aiAgent.projectId?.toString(),
+        } as LogAttributes);
       }
     }
   }

package/Server/Services/AIService.ts

@@ -16,7 +16,7 @@ import LlmLogStatus from "../../Types/LlmLogStatus";
 import ObjectID from "../../Types/ObjectID";
 import BadDataException from "../../Types/Exception/BadDataException";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 
 export interface AILogRequest {
   projectId: ObjectID;
@@ -200,8 +200,14 @@ export class Service extends BaseService {
           // Check if auto-recharge is needed (do this async, don't wait)
           AIBillingService.rechargeIfBalanceIsLow(request.projectId).catch(
             (err: Error) => {
-              logger.error("Error during AI balance auto-recharge check:");
-              logger.error(err);
+              logger.error("Error during AI balance auto-recharge check:", {
+                projectId: request.projectId?.toString(),
+                userId: request.userId?.toString(),
+              } as LogAttributes);
+              logger.error(err, {
+                projectId: request.projectId?.toString(),
+                userId: request.userId?.toString(),
+              } as LogAttributes);
             },
           );
         }

package/Server/Services/AlertEpisodeFeedService.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, {
   AlertEpisodeFeedEventType,
@@ -107,12 +107,24 @@ 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(),
+          alertEpisodeId: data.alertEpisodeId?.toString(),
+        } as LogAttributes);
+        logger.error(e, {
+          projectId: data.projectId?.toString(),
+          alertEpisodeId: data.alertEpisodeId?.toString(),
+        } as LogAttributes);
       }
     } catch (error) {
-      logger.error("AlertEpisodeFeedService.createAlertEpisodeFeedItem");
-      logger.error(error);
+      logger.error("AlertEpisodeFeedService.createAlertEpisodeFeedItem", {
+        projectId: data.projectId?.toString(),
+        alertEpisodeId: data.alertEpisodeId?.toString(),
+      } as LogAttributes);
+      logger.error(error, {
+        projectId: data.projectId?.toString(),
+        alertEpisodeId: data.alertEpisodeId?.toString(),
+      } as LogAttributes);
       // we dont want to throw the error here, as this is a non-critical operation
     }
   }

package/Server/Services/AlertEpisodeService.ts

@@ -10,7 +10,7 @@ import AlertState from "../../Models/DatabaseModels/AlertState";
 import AlertSeverity from "../../Models/DatabaseModels/AlertSeverity";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import AlertEpisodeStateTimeline from "../../Models/DatabaseModels/AlertEpisodeStateTimeline";
 import AlertEpisodeStateTimelineService from "./AlertEpisodeStateTimelineService";
@@ -134,6 +134,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Workspace operations failed in AlertEpisodeService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertEpisodeId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
         }
       })
@@ -152,6 +156,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Handle episode state change failed in AlertEpisodeService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertEpisodeId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
         }
       })
@@ -161,6 +169,10 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `Create episode feed failed in AlertEpisodeService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertEpisodeId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
         }
       })
@@ -171,12 +183,20 @@ export class Service extends DatabaseService<Model> {
         } catch (error) {
           logger.error(
             `On-call duty policy execution failed in AlertEpisodeService.onCreateSuccess: ${error}`,
+            {
+              projectId: createdItem.projectId?.toString(),
+              alertEpisodeId: createdItem.id?.toString(),
+            } as LogAttributes,
           );
         }
       })
       .catch((error: Error) => {
         logger.error(
           `Critical error in AlertEpisodeService.onCreateSuccess: ${error}`,
+          {
+            projectId: createdItem.projectId?.toString(),
+            alertEpisodeId: createdItem.id?.toString(),
+          } as LogAttributes,
         );
       });
 
@@ -223,7 +243,10 @@ export class Service extends DatabaseService<Model> {
         });
       }
     } catch (error) {
-      logger.error(`Error in handleEpisodeWorkspaceOperationsAsync: ${error}`);
+      logger.error(`Error in handleEpisodeWorkspaceOperationsAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        alertEpisodeId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -350,7 +373,10 @@ export class Service extends DatabaseService<Model> {
         feedInfoInMarkdown: feedInfoInMarkdown,
       });
     } catch (error) {
-      logger.error(`Error in executeEpisodeOnCallDutyPoliciesAsync: ${error}`);
+      logger.error(`Error in executeEpisodeOnCallDutyPoliciesAsync: ${error}`, {
+        projectId: createdItem.projectId?.toString(),
+        alertEpisodeId: createdItem.id?.toString(),
+      } as LogAttributes);
       throw error;
     }
   }
@@ -485,6 +511,11 @@ export class Service extends DatabaseService<Model> {
       } catch (error) {
         logger.error(
           `Failed to cascade state change to alert ${member.alertId.toString()}: ${error}`,
+          {
+            projectId: projectId.toString(),
+            alertEpisodeId: episodeId.toString(),
+            alertId: member.alertId.toString(),
+          } as LogAttributes,
         );
       }
     }