@oneuptime/common 7.0.3840 → 7.0.3864

package/Server/Services/UserNotificationRuleService.ts

@@ -48,12 +48,14 @@ import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService
 import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/EventType";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 import logger from "../Utils/Logger";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   public async executeNotificationRuleItem(
     userNotificationRuleId: ObjectID,
     options: {
@@ -585,6 +587,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   public async generateCallTemplateForAlertCreated(
     to: Phone,
     alert: Alert,
@@ -635,6 +638,7 @@ export class Service extends DatabaseService<Model> {
     return callRequest;
   }
 
+  @CaptureSpan()
   public async generateCallTemplateForIncidentCreated(
     to: Phone,
     incident: Incident,
@@ -685,6 +689,7 @@ export class Service extends DatabaseService<Model> {
     return callRequest;
   }
 
+  @CaptureSpan()
   public async generateSmsTemplateForAlertCreated(
     to: Phone,
     alert: Alert,
@@ -714,6 +719,7 @@ export class Service extends DatabaseService<Model> {
     return sms;
   }
 
+  @CaptureSpan()
   public async generateSmsTemplateForIncidentCreated(
     to: Phone,
     incident: Incident,
@@ -743,6 +749,7 @@ export class Service extends DatabaseService<Model> {
     return sms;
   }
 
+  @CaptureSpan()
   public async generateEmailTemplateForAlertCreated(
     to: Email,
     alert: Alert,
@@ -782,6 +789,7 @@ export class Service extends DatabaseService<Model> {
     return emailMessage;
   }
 
+  @CaptureSpan()
   public async generateEmailTemplateForIncidentCreated(
     to: Email,
     incident: Incident,
@@ -826,6 +834,7 @@ export class Service extends DatabaseService<Model> {
     return emailMessage;
   }
 
+  @CaptureSpan()
   public async startUserNotificationRulesExecution(
     userId: ObjectID,
     options: {
@@ -911,6 +920,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   public async runWorkspaceRulesForOnCallNotification(data: {
     projectId: ObjectID;
     incidentId?: ObjectID | undefined;
@@ -969,6 +979,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
@@ -989,6 +1000,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   public async addDefaultIncidentNotificationRuleForUser(data: {
     projectId: ObjectID;
     userId: ObjectID;
@@ -1049,6 +1061,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   public async addDefaultAlertNotificationRulesForUser(data: {
     projectId: ObjectID;
     userId: ObjectID;
@@ -1109,6 +1122,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   public async addDefaultNotificationRuleForUser(
     projectId: ObjectID,
     userId: ObjectID,

package/Server/Services/UserNotificationSettingService.ts

@@ -21,12 +21,14 @@ import UserCall from "Common/Models/DatabaseModels/UserCall";
 import UserEmail from "Common/Models/DatabaseModels/UserEmail";
 import UserNotificationSetting from "Common/Models/DatabaseModels/UserNotificationSetting";
 import UserSMS from "Common/Models/DatabaseModels/UserSMS";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<UserNotificationSetting> {
   public constructor() {
     super(UserNotificationSetting);
   }
 
+  @CaptureSpan()
   public async sendUserNotification(data: {
     userId: ObjectID;
     projectId: ObjectID;
@@ -158,6 +160,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     }
   }
 
+  @CaptureSpan()
   public async removeDefaultNotificationSettingsForUser(
     userId: ObjectID,
     projectId: ObjectID,
@@ -189,6 +192,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     }
   }
 
+  @CaptureSpan()
   public async addDefaultNotificationSettingsForUser(
     userId: ObjectID,
     projectId: ObjectID,
@@ -464,6 +468,7 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     }
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<UserNotificationSetting>,
   ): Promise<OnCreate<UserNotificationSetting>> {

package/Server/Services/UserOnCallLogService.ts

@@ -8,6 +8,7 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import NotificationRuleType from "../../Types/NotificationRule/NotificationRuleType";
 import ObjectID from "../../Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus";
 import PositiveNumber from "../../Types/PositiveNumber";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
@@ -27,6 +28,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
@@ -38,6 +40,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,
     _updatedItemIds: ObjectID[],
@@ -95,6 +98,7 @@ export class Service extends DatabaseService<Model> {
     return onUpdate;
   }
 
+  @CaptureSpan()
   protected override async onCreateSuccess(
     _onCreate: OnCreate<Model>,
     createdItem: Model,

package/Server/Services/UserOnCallLogTimelineService.ts

@@ -8,6 +8,7 @@ import UserService from "./UserService";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus";
 import OnCallDutyPolicyStatus from "../../Types/OnCallDutyPolicy/OnCallDutyPolicyStatus";
 import UserNotificationExecutionStatus from "../../Types/UserNotification/UserNotificationExecutionStatus";
@@ -20,6 +21,7 @@ export class Service extends DatabaseService<Model> {
     super(Model);
   }
 
+  @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,
     _updatedItemIds: ObjectID[],

package/Server/Services/UserService.ts

@@ -33,12 +33,14 @@ import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
 import UserTwoFactorAuthService from "./UserTwoFactorAuthService";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Name from "../../Types/Name";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   public async getUserMarkdownString(data: {
     userId: ObjectID;
     projectId: ObjectID;
@@ -63,6 +65,7 @@ export class Service extends DatabaseService<Model> {
     return `[${user.name?.toString() || user.email?.toString() || "User"}](${(await this.getUserLinkInDashboard(data.projectId, data.userId)).toString()})`;
   }
 
+  @CaptureSpan()
   public async getUserLinkInDashboard(
     projectId: ObjectID,
     userId: ObjectID,
@@ -74,6 +77,7 @@ export class Service extends DatabaseService<Model> {
     );
   }
 
+  @CaptureSpan()
   protected override async onCreateSuccess(
     _onCreate: OnCreate<Model>,
     createdItem: Model,
@@ -96,6 +100,7 @@ export class Service extends DatabaseService<Model> {
     return Promise.resolve(createdItem);
   }
 
+  @CaptureSpan()
   public async findByEmail(
     email: Email,
     props: DatabaseCommonInteractionProps,
@@ -111,6 +116,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   protected override async onBeforeUpdate(
     updateBy: UpdateBy<Model>,
   ): Promise<OnUpdate<Model>> {
@@ -175,6 +181,7 @@ export class Service extends DatabaseService<Model> {
     return { updateBy, carryForward: carryForward };
   }
 
+  @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,
     _updatedItemIds: ObjectID[],
@@ -326,6 +333,7 @@ export class Service extends DatabaseService<Model> {
     return onUpdate;
   }
 
+  @CaptureSpan()
   public async createByEmail(data: {
     email: Email;
     name: Name | undefined;

package/Server/Services/UserSmsService.ts

@@ -13,12 +13,14 @@ import ObjectID from "../../Types/ObjectID";
 import Text from "../../Types/Text";
 import Project from "Common/Models/DatabaseModels/Project";
 import Model from "Common/Models/DatabaseModels/UserSMS";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<Model>,
   ): Promise<OnDelete<Model>> {
@@ -55,6 +57,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
@@ -97,6 +100,7 @@ export class Service extends DatabaseService<Model> {
     return { carryForward: null, createBy };
   }
 
+  @CaptureSpan()
   protected override async onCreateSuccess(
     _onCreate: OnCreate<Model>,
     createdItem: Model,
@@ -108,6 +112,7 @@ export class Service extends DatabaseService<Model> {
     return createdItem;
   }
 
+  @CaptureSpan()
   public async resendVerificationCode(itemId: ObjectID): Promise<void> {
     const item: Model | null = await this.findOneById({
       id: itemId,

package/Server/Services/UserTwoFactorAuthService.ts

@@ -8,12 +8,14 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import User from "Common/Models/DatabaseModels/User";
 import DeleteBy from "../Types/Database/DeleteBy";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
@@ -54,6 +56,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<Model>,
   ): Promise<OnDelete<Model>> {

package/Server/Services/WorkflowService.ts

@@ -8,6 +8,7 @@ import Route from "../../Types/API/Route";
 import URL from "../../Types/API/URL";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import {
   ComponentType,
   NodeDataProp,
@@ -22,6 +23,7 @@ export class Service extends DatabaseService<Model> {
     super(Model);
   }
 
+  @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,
     _updatedItemIds: ObjectID[],

package/Server/Services/WorkspaceNotificationRuleService.ts

@@ -14,8 +14,6 @@ import Alert from "../../Models/DatabaseModels/Alert";
 import AlertService from "./AlertService";
 import ScheduledMaintenanceService from "./ScheduledMaintenanceService";
 import ScheduledMaintenance from "../../Models/DatabaseModels/ScheduledMaintenance";
-import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline";
-import MonitorStatusTimelineService from "./MonitorStatusTimelineService";
 import { WorkspaceNotificationRuleUtil } from "../../Types/Workspace/NotificationRules/NotificationRuleUtil";
 import TeamMemberService from "./TeamMemberService";
 import User from "../../Models/DatabaseModels/User";
@@ -25,7 +23,7 @@ import { WorkspaceChannel } from "../Utils/Workspace/WorkspaceBase";
 import WorkspaceUtil from "../Utils/Workspace/Workspace";
 import WorkspaceUserAuthToken from "../../Models/DatabaseModels/WorkspaceUserAuthToken";
 import WorkspaceUserAuthTokenService from "./WorkspaceUserAuthTokenService";
-import {
+import WorkspaceMessagePayload, {
   WorkspaceMessageBlock,
   WorkspacePayloadMarkdown,
 } from "../../Types/Workspace/WorkspaceMessagePayload";
@@ -38,6 +36,8 @@ import logger from "../Utils/Logger";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 import WorkspaceNotificationRule from "Common/Models/DatabaseModels/WorkspaceNotificationRule";
 import UserService from "./UserService";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import Monitor from "../../Models/DatabaseModels/Monitor";
 
 export interface MessageBlocksByWorkspaceType {
   workspaceType: WorkspaceType;
@@ -48,7 +48,7 @@ export interface NotificationFor {
   incidentId?: ObjectID | undefined;
   alertId?: ObjectID | undefined;
   scheduledMaintenanceId?: ObjectID | undefined;
-  monitorStatusTimelineId?: ObjectID | undefined;
+  monitorId?: ObjectID | undefined;
 }
 
 export class Service extends DatabaseService<WorkspaceNotificationRule> {
@@ -56,6 +56,114 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     super(WorkspaceNotificationRule);
   }
 
+  @CaptureSpan()
+  public async sendWorkspaceMarkdownNotification(data: {
+    projectId: ObjectID;
+    notificationFor: NotificationFor;
+    feedInfoInMarkdown: string;
+    workspaceNotification: {
+      notifyUserId?: ObjectID | undefined; // this is oneuptime user id.
+      sendWorkspaceNotification: boolean;
+      appendMessageBlocks?: Array<MessageBlocksByWorkspaceType> | undefined;
+    };
+  }): Promise<void> {
+    let messageBlocksByWorkspaceTypes: Array<MessageBlocksByWorkspaceType> = [];
+
+    // use markdown to create blocks
+    messageBlocksByWorkspaceTypes =
+      await WorkspaceUtil.getMessageBlocksByMarkdown({
+        userId: data.workspaceNotification.notifyUserId,
+        markdown: data.feedInfoInMarkdown,
+        projectId: data.projectId,
+      });
+
+    if (data.workspaceNotification.appendMessageBlocks) {
+      for (const messageBlocksByWorkspaceType of data.workspaceNotification
+        .appendMessageBlocks) {
+        const workspaceType: WorkspaceType =
+          messageBlocksByWorkspaceType.workspaceType;
+
+        messageBlocksByWorkspaceTypes
+          .find(
+            (messageBlocksByWorkspaceType: MessageBlocksByWorkspaceType) => {
+              return (
+                messageBlocksByWorkspaceType.workspaceType === workspaceType
+              );
+            },
+          )
+          ?.messageBlocks.push(...messageBlocksByWorkspaceType.messageBlocks);
+      }
+    }
+
+    const workspaceNotificationPaylaods: Array<WorkspaceMessagePayload> = [];
+
+    for (const messageBlocksByWorkspaceType of messageBlocksByWorkspaceTypes) {
+      const existingChannels: Array<string> =
+        await this.getExistingChannelNamesBasedOnEventType({
+          projectId: data.projectId,
+          notificationRuleEventType: NotificationRuleEventType.Monitor,
+          workspaceType: messageBlocksByWorkspaceType.workspaceType,
+        });
+
+      let monitorChannels: Array<WorkspaceChannel> = [];
+
+      if (data.notificationFor.monitorId) {
+        monitorChannels = await MonitorService.getWorkspaceChannelForMonitor({
+          monitorId: data.notificationFor.monitorId,
+          workspaceType: messageBlocksByWorkspaceType.workspaceType,
+        });
+      }
+
+      // incidents
+      if (data.notificationFor.incidentId) {
+        monitorChannels = await IncidentService.getWorkspaceChannelForIncident({
+          incidentId: data.notificationFor.incidentId,
+          workspaceType: messageBlocksByWorkspaceType.workspaceType,
+        });
+      }
+
+      // alerts
+      if (data.notificationFor.alertId) {
+        monitorChannels = await AlertService.getWorkspaceChannelForAlert({
+          alertId: data.notificationFor.alertId,
+          workspaceType: messageBlocksByWorkspaceType.workspaceType,
+        });
+      }
+
+      // scheduled maintenance
+
+      if (data.notificationFor.scheduledMaintenanceId) {
+        monitorChannels =
+          await ScheduledMaintenanceService.getWorkspaceChannelForScheduledMaintenance(
+            {
+              scheduledMaintenanceId:
+                data.notificationFor.scheduledMaintenanceId,
+              workspaceType: messageBlocksByWorkspaceType.workspaceType,
+            },
+          );
+      }
+
+      const workspaceMessagePayload: WorkspaceMessagePayload = {
+        _type: "WorkspaceMessagePayload",
+        workspaceType: messageBlocksByWorkspaceType.workspaceType,
+        messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
+        channelNames: existingChannels,
+        channelIds:
+          monitorChannels.map((channel: WorkspaceChannel) => {
+            return channel.id;
+          }) || [],
+      };
+
+      workspaceNotificationPaylaods.push(workspaceMessagePayload);
+    }
+
+    await WorkspaceUtil.postMessageToAllWorkspaceChannelsAsBot({
+      projectId: data.projectId,
+      messagePayloadsByWorkspace: workspaceNotificationPaylaods,
+    });
+  }
+
+  @CaptureSpan()
   public static getAllWorkspaceTypes(): Array<WorkspaceType> {
     return [WorkspaceType.Slack, WorkspaceType.MicrosoftTeams];
   }
@@ -85,6 +193,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     throw new BadDataException("Workspace type not supported");
   }
 
+  @CaptureSpan()
   public async getExistingChannelNamesBasedOnEventType(data: {
     projectId: ObjectID;
     workspaceType: WorkspaceType;
@@ -118,6 +227,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     return existingChannelNames;
   }
 
+  @CaptureSpan()
   public async createChannelsAndInviteUsersToChannelsBasedOnRules(data: {
     projectId: ObjectID;
     notificationRuleEventType: NotificationRuleEventType;
@@ -232,6 +342,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     };
   }
 
+  @CaptureSpan()
   public async getNotificationRulesWhereOnCallIsTrue(data: {
     projectId: ObjectID;
     notificationFor: NotificationFor;
@@ -263,6 +374,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     return result;
   }
 
+  @CaptureSpan()
   public async getNotificationRulesWhereInviteOwnersIsTrue(data: {
     projectId: ObjectID;
     notificationFor: NotificationFor;
@@ -294,6 +406,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     return result;
   }
 
+  @CaptureSpan()
   public async inviteUsersAndTeamsToChannelsBasedOnRules(data: {
     projectId: ObjectID;
     projectAuth: WorkspaceProjectAuthToken;
@@ -402,6 +515,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     logger.debug("Users invited to channels successfully");
   }
 
+  @CaptureSpan()
   public async inviteUsersBasedOnRulesAndWorkspaceChannels(data: {
     workspaceChannels: Array<NotificationRuleWorkspaceChannel>;
     projectId: ObjectID;
@@ -555,6 +669,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     }
   }
 
+  @CaptureSpan()
   public async inviteTeamsBasedOnRulesAndWorkspaceChannels(data: {
     workspaceChannels: Array<NotificationRuleWorkspaceChannel>;
     projectId: ObjectID;
@@ -584,6 +699,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     });
   }
 
+  @CaptureSpan()
   public async getWorkspaceUserIdFromOneUptimeUserId(data: {
     projectId: ObjectID;
     workspaceType: WorkspaceType;
@@ -618,6 +734,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     return userAuth.workspaceUserId?.toString() || null;
   }
 
+  @CaptureSpan()
   public async createChannelsBasedOnRules(data: {
     projectOrUserAuthTokenForWorkspace: string;
     workspaceType: WorkspaceType;
@@ -690,6 +807,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     return createdWorkspaceChannels;
   }
 
+  @CaptureSpan()
   public async getUsersIdsToInviteToChannel(data: {
     notificationRules: Array<WorkspaceNotificationRule>;
   }): Promise<
@@ -1159,46 +1277,41 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
       };
     }
 
-    if (data.notificationFor.monitorStatusTimelineId) {
+    if (data.notificationFor.monitorId) {
       logger.debug("Fetching monitor status timeline details for ID:");
-      logger.debug(data.notificationFor.monitorStatusTimelineId);
+      logger.debug(data.notificationFor.monitorId);
 
-      const monitorStatusTimeline: MonitorStatusTimeline | null =
-        await MonitorStatusTimelineService.findOneById({
-          id: data.notificationFor.monitorStatusTimelineId,
-          select: {
-            monitor: {
-              name: true,
-              labels: true,
-              monitorType: true,
-            },
-            monitorStatus: true,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
+      const monitor: Monitor | null = await MonitorService.findOneById({
+        id: data.notificationFor.monitorId,
+        select: {
+          name: true,
+          labels: true,
+          monitorType: true,
+          currentMonitorStatusId: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
 
-      if (!monitorStatusTimeline) {
-        logger.debug("Monitor status timeline not found for ID:");
-        logger.debug(data.notificationFor.monitorStatusTimelineId);
-        throw new BadDataException("Monitor Status Timeline ID not found");
+      if (!monitor) {
+        logger.debug("Monitor not found for ID:");
+        logger.debug(data.notificationFor.monitorId);
+        throw new BadDataException("Monitor ID not found");
       }
 
-      const monitorLabels: Array<Label> =
-        monitorStatusTimeline.monitor?.labels || [];
+      const monitorLabels: Array<Label> = monitor?.labels || [];
 
       return {
-        [NotificationRuleConditionCheckOn.MonitorName]:
-          monitorStatusTimeline.monitor?.name || "",
+        [NotificationRuleConditionCheckOn.MonitorName]: monitor?.name || "",
         [NotificationRuleConditionCheckOn.IncidentTitle]: undefined,
         [NotificationRuleConditionCheckOn.IncidentDescription]: undefined,
         [NotificationRuleConditionCheckOn.IncidentSeverity]: undefined,
         [NotificationRuleConditionCheckOn.IncidentState]: undefined,
         [NotificationRuleConditionCheckOn.MonitorType]:
-          monitorStatusTimeline.monitor?.monitorType || undefined,
+          monitor?.monitorType || undefined,
         [NotificationRuleConditionCheckOn.MonitorStatus]:
-          monitorStatusTimeline.monitorStatus?._id?.toString() || "",
+          monitor?.currentMonitorStatusId?.toString() || "",
         [NotificationRuleConditionCheckOn.AlertTitle]: undefined,
         [NotificationRuleConditionCheckOn.AlertDescription]: undefined,
         [NotificationRuleConditionCheckOn.AlertSeverity]: undefined,
@@ -1216,7 +1329,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
         [NotificationRuleConditionCheckOn.ScheduledMaintenanceLabels]:
           undefined,
         [NotificationRuleConditionCheckOn.Monitors]: [
-          monitorStatusTimeline.monitor?._id?.toString() || "",
+          monitor?._id?.toString() || "",
         ],
       };
     }
@@ -1224,6 +1337,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
     throw new BadDataException("NotificationFor is not supported");
   }
 
+  @CaptureSpan()
   public async getMatchingNotificationRules(data: {
     projectId: ObjectID;
     workspaceType: WorkspaceType;

package/Server/Services/WorkspaceProjectAuthTokenService.ts

@@ -5,12 +5,14 @@ import Model, {
   SlackMiscData,
 } from "Common/Models/DatabaseModels/WorkspaceProjectAuthToken";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   public async getProjectAuth(data: {
     projectId: ObjectID;
     workspaceType: WorkspaceType;
@@ -32,6 +34,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   public async getProjectAuths(data: {
     projectId: ObjectID;
   }): Promise<Array<Model>> {
@@ -53,6 +56,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   public async doesExist(data: {
     projectId: ObjectID;
     workspaceType: WorkspaceType;
@@ -60,6 +64,7 @@ export class Service extends DatabaseService<Model> {
     return Boolean(await this.getProjectAuth(data));
   }
 
+  @CaptureSpan()
   public async refreshAuthToken(data: {
     projectId: ObjectID;
     workspaceType: WorkspaceType;