@oneuptime/common 7.0.3840 → 7.0.3864

package/Server/Services/AlertService.ts

@@ -51,6 +51,7 @@ import AlertWorkspaceMessages from "../Utils/Workspace/WorkspaceMessages/Alert";
 import Monitor from "../../Models/DatabaseModels/Monitor";
 import MonitorService from "./MonitorService";
 import { MessageBlocksByWorkspaceType } from "./WorkspaceNotificationRuleService";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -60,6 +61,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   public async isAlertAcknowledged(data: {
     alertId: ObjectID;
   }): Promise<boolean> {
@@ -104,6 +106,7 @@ export class Service extends DatabaseService<Model> {
     return false;
   }
 
+  @CaptureSpan()
   public async getExistingAlertNumberForProject(data: {
     projectId: ObjectID;
   }): Promise<number> {
@@ -127,9 +130,10 @@ export class Service extends DatabaseService<Model> {
       return 0;
     }
 
-    return lastAlert.alertNumber || 0;
+    return lastAlert.alertNumber ? Number(lastAlert.alertNumber) : 0;
   }
 
+  @CaptureSpan()
   public async acknowledgeAlert(
     alertId: ObjectID,
     acknowledgedByUserId: ObjectID,
@@ -181,6 +185,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
@@ -248,6 +253,7 @@ export class Service extends DatabaseService<Model> {
     return { createBy, carryForward: null };
   }
 
+  @CaptureSpan()
   protected override async onCreateSuccess(
     onCreate: OnCreate<Model>,
     createdItem: Model,
@@ -279,6 +285,9 @@ export class Service extends DatabaseService<Model> {
         currentAlertState: {
           name: true,
         },
+        labels: {
+          name: true,
+        },
         monitor: {
           name: true,
           _id: true,
@@ -434,6 +443,7 @@ ${createdItem.remediationNotes || "No remediation notes provided."}
     return createdItem;
   }
 
+  @CaptureSpan()
   public async getWorkspaceChannelForAlert(data: {
     alertId: ObjectID;
     workspaceType?: WorkspaceType | null;
@@ -463,6 +473,7 @@ ${createdItem.remediationNotes || "No remediation notes provided."}
     );
   }
 
+  @CaptureSpan()
   public async getAlertIdentifiedDate(alertId: ObjectID): Promise<Date> {
     const timeline: AlertStateTimeline | null =
       await AlertStateTimelineService.findOneBy({
@@ -487,6 +498,7 @@ ${createdItem.remediationNotes || "No remediation notes provided."}
     return timeline.startsAt;
   }
 
+  @CaptureSpan()
   public async findOwners(alertId: ObjectID): Promise<Array<User>> {
     if (!alertId) {
       throw new BadDataException("alertId is required");
@@ -560,6 +572,7 @@ ${createdItem.remediationNotes || "No remediation notes provided."}
     return users;
   }
 
+  @CaptureSpan()
   public async addOwners(
     projectId: ObjectID,
     alertId: ObjectID,
@@ -601,6 +614,7 @@ ${createdItem.remediationNotes || "No remediation notes provided."}
     }
   }
 
+  @CaptureSpan()
   public async getAlertLinkInDashboard(
     projectId: ObjectID,
     alertId: ObjectID,
@@ -612,6 +626,7 @@ ${createdItem.remediationNotes || "No remediation notes provided."}
     );
   }
 
+  @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,
     updatedItemIds: ObjectID[],
@@ -790,6 +805,7 @@ ${alertSeverity.name}
     return onUpdate;
   }
 
+  @CaptureSpan()
   public async doesMonitorHasMoreActiveManualAlerts(
     monitorId: ObjectID,
     proojectId: ObjectID,
@@ -824,6 +840,7 @@ ${alertSeverity.name}
     return alertCount.toNumber() > 0;
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<Model>,
   ): Promise<OnDelete<Model>> {
@@ -850,6 +867,7 @@ ${alertSeverity.name}
     };
   }
 
+  @CaptureSpan()
   public async changeAlertState(data: {
     projectId: ObjectID;
     alertId: ObjectID;
@@ -917,6 +935,7 @@ ${alertSeverity.name}
     });
   }
 
+  @CaptureSpan()
   public async refreshAlertMetrics(data: { alertId: ObjectID }): Promise<void> {
     const alert: Model | null = await this.findOneById({
       id: data.alertId,
@@ -1177,6 +1196,7 @@ ${alertSeverity.name}
     });
   }
 
+  @CaptureSpan()
   public async isAlertResolved(data: { alertId: ObjectID }): Promise<boolean> {
     const alert: Model | null = await this.findOneBy({
       query: {
@@ -1219,6 +1239,7 @@ ${alertSeverity.name}
     return false;
   }
 
+  @CaptureSpan()
   public async getAlertNumber(data: {
     alertId: ObjectID;
   }): Promise<number | null> {
@@ -1236,9 +1257,10 @@ ${alertSeverity.name}
       throw new BadDataException("Alert not found.");
     }
 
-    return alert.alertNumber || null;
+    return alert.alertNumber ? Number(alert.alertNumber) : null;
   }
 
+  @CaptureSpan()
   public async resolveAlert(
     alertId: ObjectID,
     resolvedByUserId: ObjectID,

package/Server/Services/AlertSeverityService.ts

@@ -9,12 +9,13 @@ import LIMIT_MAX from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import Model from "Common/Models/DatabaseModels/AlertSeverity";
-
+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>> {
@@ -38,6 +39,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<Model>,
   ): Promise<OnDelete<Model>> {
@@ -68,6 +70,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onDeleteSuccess(
     onDelete: OnDelete<Model>,
     _itemIdsBeforeDelete: ObjectID[],
@@ -91,6 +94,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onBeforeUpdate(
     updateBy: UpdateBy<Model>,
   ): Promise<OnUpdate<Model>> {

package/Server/Services/AlertStateService.ts

@@ -10,12 +10,14 @@ import LIMIT_MAX from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import AlertState from "Common/Models/DatabaseModels/AlertState";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<AlertState> {
   public constructor() {
     super(AlertState);
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<AlertState>,
   ): Promise<OnCreate<AlertState>> {
@@ -39,6 +41,7 @@ export class Service extends DatabaseService<AlertState> {
     };
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<AlertState>,
   ): Promise<OnDelete<AlertState>> {
@@ -69,6 +72,7 @@ export class Service extends DatabaseService<AlertState> {
     };
   }
 
+  @CaptureSpan()
   protected override async onDeleteSuccess(
     onDelete: OnDelete<AlertState>,
     _itemIdsBeforeDelete: ObjectID[],
@@ -92,6 +96,7 @@ export class Service extends DatabaseService<AlertState> {
     };
   }
 
+  @CaptureSpan()
   protected override async onBeforeUpdate(
     updateBy: UpdateBy<AlertState>,
   ): Promise<OnUpdate<AlertState>> {
@@ -152,6 +157,7 @@ export class Service extends DatabaseService<AlertState> {
     }
   }
 
+  @CaptureSpan()
   public async getAllAlertStates(data: {
     projectId: ObjectID;
     props: DatabaseCommonInteractionProps;
@@ -178,6 +184,7 @@ export class Service extends DatabaseService<AlertState> {
     return alertStates;
   }
 
+  @CaptureSpan()
   public async getUnresolvedAlertStates(
     projectId: ObjectID,
     props: DatabaseCommonInteractionProps,
@@ -200,6 +207,7 @@ export class Service extends DatabaseService<AlertState> {
     return unresolvedAlertStates;
   }
 
+  @CaptureSpan()
   public async getResolvedAlertState(data: {
     projectId: ObjectID;
     props: DatabaseCommonInteractionProps;
@@ -224,6 +232,7 @@ export class Service extends DatabaseService<AlertState> {
     return resolvedAlertState;
   }
 
+  @CaptureSpan()
   public async getAcknowledgedAlertState(data: {
     projectId: ObjectID;
     props: DatabaseCommonInteractionProps;

package/Server/Services/AlertStateTimelineService.ts

@@ -17,6 +17,7 @@ import { IsBillingEnabled } from "../EnvironmentConfig";
 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 AlertFeedService from "./AlertFeedService";
 import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
@@ -29,6 +30,7 @@ export class Service extends DatabaseService<AlertStateTimeline> {
     }
   }
 
+  @CaptureSpan()
   public async getResolvedStateIdForProject(
     projectId: ObjectID,
   ): Promise<ObjectID> {
@@ -52,6 +54,7 @@ export class Service extends DatabaseService<AlertStateTimeline> {
     return resolvedState.id!;
   }
 
+  @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<AlertStateTimeline>,
   ): Promise<OnCreate<AlertStateTimeline>> {
@@ -173,6 +176,7 @@ export class Service extends DatabaseService<AlertStateTimeline> {
     };
   }
 
+  @CaptureSpan()
   protected override async onCreateSuccess(
     onCreate: OnCreate<AlertStateTimeline>,
     createdItem: AlertStateTimeline,
@@ -335,6 +339,7 @@ ${createdItem.rootCause}`,
     return createdItem;
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<AlertStateTimeline>,
   ): Promise<OnDelete<AlertStateTimeline>> {
@@ -472,6 +477,7 @@ ${createdItem.rootCause}`,
     return { deleteBy, carryForward: null };
   }
 
+  @CaptureSpan()
   protected override async onDeleteSuccess(
     onDelete: OnDelete<AlertStateTimeline>,
     _itemIdsBeforeDelete: ObjectID[],

package/Server/Services/AnalyticsDatabaseService.ts

@@ -11,6 +11,7 @@ import DeleteBy from "../Types/AnalyticsDatabase/DeleteBy";
 import FindBy from "../Types/AnalyticsDatabase/FindBy";
 import FindOneBy from "../Types/AnalyticsDatabase/FindOneBy";
 import FindOneByID from "../Types/AnalyticsDatabase/FindOneByID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import {
   DatabaseTriggerType,
   OnCreate,
@@ -84,6 +85,7 @@ export default class AnalyticsDatabaseService<
     });
   }
 
+  @CaptureSpan()
   public async doesColumnExistInDatabase(columnName: string): Promise<boolean> {
     const statement: string =
       this.statementGenerator.toDoesColumnExistStatement(columnName);
@@ -97,6 +99,7 @@ export default class AnalyticsDatabaseService<
     return strResult.trim().length > 0;
   }
 
+  @CaptureSpan()
   public async getColumnTypeInDatabase(
     column: AnalyticsTableColumn,
   ): Promise<TableColumnType | null> {
@@ -134,6 +137,7 @@ export default class AnalyticsDatabaseService<
     );
   }
 
+  @CaptureSpan()
   public async countBy(countBy: CountBy<TBaseModel>): Promise<PositiveNumber> {
     try {
       const checkReadPermissionType: CheckReadPermissionType<TBaseModel> =
@@ -179,6 +183,7 @@ export default class AnalyticsDatabaseService<
     }
   }
 
+  @CaptureSpan()
   public async addColumnInDatabase(
     column: AnalyticsTableColumn,
   ): Promise<void> {
@@ -187,16 +192,19 @@ export default class AnalyticsDatabaseService<
     await this.execute(statement);
   }
 
+  @CaptureSpan()
   public async dropColumnInDatabase(columnName: string): Promise<void> {
     await this.execute(
       this.statementGenerator.toDropColumnStatement(columnName),
     );
   }
 
+  @CaptureSpan()
   public async findBy(findBy: FindBy<TBaseModel>): Promise<Array<TBaseModel>> {
     return await this._findBy(findBy);
   }
 
+  @CaptureSpan()
   public async aggregateBy(
     aggregateBy: AggregateBy<TBaseModel>,
   ): Promise<AggregatedResult> {
@@ -660,6 +668,7 @@ export default class AnalyticsDatabaseService<
     return statement;
   }
 
+  @CaptureSpan()
   public async findOneBy(
     findOneBy: FindOneBy<TBaseModel>,
   ): Promise<TBaseModel | null> {
@@ -675,6 +684,7 @@ export default class AnalyticsDatabaseService<
     return null;
   }
 
+  @CaptureSpan()
   public async deleteBy(deleteBy: DeleteBy<TBaseModel>): Promise<void> {
     return await this._deleteBy(deleteBy);
   }
@@ -715,6 +725,7 @@ export default class AnalyticsDatabaseService<
     }
   }
 
+  @CaptureSpan()
   public async findOneById(
     findOneById: FindOneByID<TBaseModel>,
   ): Promise<TBaseModel | null> {
@@ -731,6 +742,7 @@ export default class AnalyticsDatabaseService<
     });
   }
 
+  @CaptureSpan()
   public async updateBy(updateBy: UpdateBy<TBaseModel>): Promise<void> {
     await this._updateBy(updateBy);
   }
@@ -793,6 +805,7 @@ export default class AnalyticsDatabaseService<
     this.databaseClient = this.database.getDataSource() as ClickhouseClient;
   }
 
+  @CaptureSpan()
   public async execute(
     statement: Statement | string,
   ): Promise<ExecResult<Stream>> {
@@ -810,6 +823,7 @@ export default class AnalyticsDatabaseService<
   }
 
 
+  @CaptureSpan()
   public async executeQuery(
     statement: Statement | string,
   ): Promise<ResultSet<"JSON">> {
@@ -910,6 +924,7 @@ export default class AnalyticsDatabaseService<
     return await this.onBeforeCreate(createBy);
   }
 
+  @CaptureSpan()
   public async createMany(
     createBy: CreateManyBy<TBaseModel>,
   ): Promise<Array<TBaseModel>> {
@@ -1053,6 +1068,7 @@ export default class AnalyticsDatabaseService<
     }
   }
 
+  @CaptureSpan()
   public async create(createBy: CreateBy<TBaseModel>): Promise<TBaseModel> {
     const items: Array<TBaseModel> = await this.createMany({
       props: createBy.props,
@@ -1098,6 +1114,7 @@ export default class AnalyticsDatabaseService<
     return true;
   }
 
+  @CaptureSpan()
   public async onTrigger(
     id: ObjectID,
     projectId: ObjectID,

package/Server/Services/ApiKeyPermissionService.ts

@@ -5,12 +5,13 @@ import DatabaseService from "./DatabaseService";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Model from "Common/Models/DatabaseModels/ApiKeyPermission";
-
+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>> {
@@ -87,6 +88,7 @@ export class Service extends DatabaseService<Model> {
     return { createBy, carryForward: null };
   }
 
+  @CaptureSpan()
   protected override async onBeforeUpdate(
     updateBy: UpdateBy<Model>,
   ): Promise<OnUpdate<Model>> {

package/Server/Services/ApiKeyService.ts

@@ -3,12 +3,13 @@ import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import ObjectID from "../../Types/ObjectID";
 import Model from "Common/Models/DatabaseModels/ApiKey";
-
+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>> {

package/Server/Services/BillingInvoiceService.ts

@@ -15,6 +15,7 @@ import ObjectID from "../../Types/ObjectID";
 import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore";
 import logger from "../Utils/Logger";
 import OneUptimeDate from "../../Types/Date";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -22,6 +23,7 @@ export class Service extends DatabaseService<Model> {
     this.setDoNotAllowDelete(true);
   }
 
+  @CaptureSpan()
   public async refreshSubscriptionStatus(data: {
     projectId: ObjectID;
   }): Promise<void> {
@@ -182,6 +184,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   protected override async onBeforeFind(
     findBy: FindBy<Model>,
   ): Promise<OnFind<Model>> {

package/Server/Services/BillingPaymentMethodService.ts

@@ -8,12 +8,14 @@ import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Model from "Common/Models/DatabaseModels/BillingPaymentMethod";
 import Project from "Common/Models/DatabaseModels/Project";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   protected override async onBeforeFind(
     findBy: FindBy<Model>,
   ): Promise<OnFind<Model>> {
@@ -80,6 +82,7 @@ export class Service extends DatabaseService<Model> {
     return { findBy, carryForward: paymentMethods };
   }
 
+  @CaptureSpan()
   protected override async onBeforeDelete(
     deleteBy: DeleteBy<Model>,
   ): Promise<OnDelete<Model>> {