@oneuptime/common 7.0.3840 → 7.0.3864

package/Server/Infrastructure/SocketIO.ts

@@ -4,6 +4,7 @@ import { RealtimeRoute } from "Common/ServiceRoute";
 import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException";
 import http from "http";
 import SocketIO from "socket.io";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export type Socket = SocketIO.Socket;
 export type SocketServer = SocketIO.Server;
@@ -11,6 +12,7 @@ export type SocketServer = SocketIO.Server;
 export default abstract class IO {
   private static socketServer: SocketIO.Server | null = null;
 
+  @CaptureSpan()
   public static init(): void {
     const server: http.Server = Express.getHttpServer();
 
@@ -30,6 +32,7 @@ export default abstract class IO {
     // this.socketServer.adapter(createAdapter(pubClient, subClient));
   }
 
+  @CaptureSpan()
   public static getSocketServer(): SocketIO.Server | null {
     if (!this.socketServer) {
       this.init();

package/Server/Infrastructure/Status.ts

@@ -5,8 +5,10 @@ import { ClickhouseAppInstance } from "./ClickhouseDatabase";
 import PostgresAppInstance from "./PostgresDatabase";
 import Redis from "./Redis";
 import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class InfrastructureStatus {
+  @CaptureSpan()
   public static async checkStatus(data: {
     checkRedisStatus: boolean;
     checkPostgresStatus: boolean;
@@ -42,6 +44,7 @@ export default class InfrastructureStatus {
     }
   }
 
+  @CaptureSpan()
   public static async checkStatusWithRetry(data: {
     retryCount: number;
     checkRedisStatus: boolean;

package/Server/Middleware/BearerTokenAuthorization.ts

@@ -7,8 +7,10 @@ import {
 import JSONWebToken from "../Utils/JsonWebToken";
 import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException";
 import { JSONObject } from "Common/Types/JSON";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class BearerTokenAuthorization {
+  @CaptureSpan()
   public static async isAuthorizedBearerToken(
     req: ExpressRequest,
     _res: ExpressResponse,

package/Server/Middleware/ClusterKeyAuthorization.ts

@@ -7,19 +7,23 @@ import {
 import Response from "../Utils/Response";
 import Dictionary from "Common/Types/Dictionary";
 import BadDataException from "Common/Types/Exception/BadDataException";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class ClusterKeyAuthorization {
+  @CaptureSpan()
   public static getClusterKeyHeaders(): Dictionary<string> {
     return {
       clusterkey: ClusterKeyAuthorization.getClusterKey(),
     };
   }
 
+  @CaptureSpan()
   public static getClusterKey(): string {
     // we encode uri component because a lot of people use special characters in their cluster key secret
     return encodeURIComponent(ONEUPTIME_SECRET.toString());
   }
 
+  @CaptureSpan()
   public static async isAuthorizedServiceMiddleware(
     req: ExpressRequest,
     res: ExpressResponse,

package/Server/Middleware/CodeRepositoryAuthorization.ts

@@ -7,8 +7,10 @@ import {
 import CopilotCodeRepository from "Common/Models/DatabaseModels/CopilotCodeRepository";
 import CopilotCodeRepositoryService from "../Services/CopilotCodeRepositoryService";
 import ObjectID from "Common/Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class CopilotCodeRepositoryAuthorization {
+  @CaptureSpan()
   public static async isAuthorizedRepository(
     req: ExpressRequest,
     _res: ExpressResponse,

package/Server/Middleware/NotificationMiddleware.ts

@@ -10,8 +10,10 @@ import { OnCallInputRequest } from "Common/Types/Call/CallRequest";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import VoiceResponse from "twilio/lib/twiml/VoiceResponse";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class NotificationMiddleware {
+  @CaptureSpan()
   public static async sendResponse(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -28,6 +30,7 @@ export default class NotificationMiddleware {
     return Response.sendXmlResponse(req, res, response.toString());
   }
 
+  @CaptureSpan()
   public static async isValidCallNotificationRequest(
     req: ExpressRequest,
     res: ExpressResponse,

package/Server/Middleware/ProjectAuthorization.ts

@@ -18,8 +18,10 @@ import ApiKey from "Common/Models/DatabaseModels/ApiKey";
 import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
 import User from "Common/Models/DatabaseModels/User";
 import APIKeyAccessPermission from "../Utils/APIKey/AccessPermission";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class ProjectMiddleware {
+  @CaptureSpan()
   public static getProjectId(req: ExpressRequest): ObjectID | null {
     let projectId: ObjectID | null = null;
     if (req.params && req.params["tenantid"]) {
@@ -39,6 +41,7 @@ export default class ProjectMiddleware {
     return projectId;
   }
 
+  @CaptureSpan()
   public static getApiKey(req: ExpressRequest): ObjectID | null {
     if (req.headers && req.headers["apikey"]) {
       return new ObjectID(req.headers["apikey"] as string);
@@ -47,14 +50,17 @@ export default class ProjectMiddleware {
     return null;
   }
 
+  @CaptureSpan()
   public static hasApiKey(req: ExpressRequest): boolean {
     return Boolean(this.getApiKey(req));
   }
 
+  @CaptureSpan()
   public static hasProjectID(req: ExpressRequest): boolean {
     return Boolean(this.getProjectId(req));
   }
 
+  @CaptureSpan()
   public static async isValidProjectIdAndApiKeyMiddleware(
     req: ExpressRequest,
     _res: ExpressResponse,

package/Server/Middleware/SlackAuthorization.ts

@@ -8,8 +8,10 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import { SlackAppSigningSecret } from "../EnvironmentConfig";
 import crypto from "crypto";
 import logger from "../Utils/Logger";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class SlackAuthorization {
+  @CaptureSpan()
   public static async isAuthorizedSlackRequest(
     req: OneUptimeRequest,
     res: ExpressResponse,

package/Server/Middleware/TelemetryIngest.ts

@@ -10,6 +10,7 @@ import TelemetryIngestionKeyService from "../../Server/Services/TelemetryIngesti
 import TelemetryIngestionKey from "../../Models/DatabaseModels/TelemetryIngestionKey";
 import Response from "../Utils/Response";
 import logger from "../Utils/Logger";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export interface TelemetryRequest extends ExpressRequest {
   projectId: ObjectID; // Project ID
@@ -17,6 +18,7 @@ export interface TelemetryRequest extends ExpressRequest {
 }
 
 export default class TelemetryIngest {
+  @CaptureSpan()
   public static async isAuthorizedServiceMiddleware(
     req: ExpressRequest,
     res: ExpressResponse,

package/Server/Middleware/UserAuthorization.ts

@@ -9,6 +9,7 @@ import {
   NextFunction,
   OneUptimeRequest,
 } from "../Utils/Express";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import JSONWebToken from "../Utils/JsonWebToken";
 import logger from "../Utils/Logger";
 import Response from "../Utils/Response";
@@ -41,6 +42,7 @@ export default class UserMiddleware {
    * Returns: 401: User is unauthorized since unauthorized token was present.
    */
 
+  @CaptureSpan()
   public static getAccessTokenFromCookie(
     req: ExpressRequest,
   ): string | undefined {
@@ -58,6 +60,7 @@ export default class UserMiddleware {
     return accessToken;
   }
 
+  @CaptureSpan()
   public static getAccessTokenFromExpressRequest(
     req: ExpressRequest,
   ): string | undefined {
@@ -75,6 +78,7 @@ export default class UserMiddleware {
     return accessToken;
   }
 
+  @CaptureSpan()
   public static getSsoTokens(req: ExpressRequest): Dictionary<string> {
     const ssoTokens: Dictionary<string> = {};
 
@@ -110,6 +114,7 @@ export default class UserMiddleware {
     return ssoTokens;
   }
 
+  @CaptureSpan()
   public static doesSsoTokenForProjectExist(
     req: ExpressRequest,
     projectId: ObjectID,
@@ -132,6 +137,7 @@ export default class UserMiddleware {
     return false;
   }
 
+  @CaptureSpan()
   public static async getUserMiddleware(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -283,6 +289,7 @@ export default class UserMiddleware {
     return next();
   }
 
+  @CaptureSpan()
   public static async getUserTenantAccessPermissionWithTenantId(data: {
     req: ExpressRequest;
     tenantId: ObjectID;
@@ -327,6 +334,7 @@ export default class UserMiddleware {
     );
   }
 
+  @CaptureSpan()
   public static async getUserTenantAccessPermissionForMultiTenant(
     req: ExpressRequest,
     userId: ObjectID,

package/Server/Services/AccessTokenService.ts

@@ -16,12 +16,14 @@ import TeamPermission from "Common/Models/DatabaseModels/TeamPermission";
 import UserPermissionUtil from "../Utils/UserPermission/UserPermission";
 import PermissionNamespace from "../Types/Permission/PermissionNamespace";
 import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class AccessTokenService extends BaseService {
   public constructor() {
     super();
   }
 
+  @CaptureSpan()
   public async refreshUserAllPermissions(userId: ObjectID): Promise<void> {
     await this.refreshUserGlobalAccessPermission(userId);
 
@@ -60,6 +62,7 @@ export class AccessTokenService extends BaseService {
     }
   }
 
+  @CaptureSpan()
   public async refreshUserGlobalAccessPermission(
     userId: ObjectID,
   ): Promise<UserGlobalAccessPermission> {
@@ -104,6 +107,7 @@ export class AccessTokenService extends BaseService {
     return permissionToStore;
   }
 
+  @CaptureSpan()
   public async getUserGlobalAccessPermission(
     userId: ObjectID,
   ): Promise<UserGlobalAccessPermission | null> {
@@ -117,6 +121,7 @@ export class AccessTokenService extends BaseService {
     return json;
   }
 
+  @CaptureSpan()
   public async refreshUserTenantAccessPermission(
     userId: ObjectID,
     projectId: ObjectID,
@@ -199,6 +204,7 @@ export class AccessTokenService extends BaseService {
     return permission;
   }
 
+  @CaptureSpan()
   public async getDatabaseCommonInteractionPropsByUserAndProject(data: {
     userId: ObjectID;
     projectId: ObjectID;
@@ -219,6 +225,7 @@ export class AccessTokenService extends BaseService {
     };
   }
 
+  @CaptureSpan()
   public async getUserTenantAccessPermission(
     userId: ObjectID,
     projectId: ObjectID,

package/Server/Services/AlertFeedService.ts

@@ -3,11 +3,8 @@ import Color from "../../Types/Color";
 import OneUptimeDate from "../../Types/Date";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
-import WorkspaceMessagePayload from "../../Types/Workspace/WorkspaceMessagePayload";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import logger from "../Utils/Logger";
-import { WorkspaceChannel } from "../Utils/Workspace/WorkspaceBase";
-import AlertService from "./AlertService";
 import DatabaseService from "./DatabaseService";
 import Model, {
   AlertFeedEventType,
@@ -15,9 +12,7 @@ import Model, {
 import WorkspaceNotificationRuleService, {
   MessageBlocksByWorkspaceType,
 } from "./WorkspaceNotificationRuleService";
-import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/EventType";
-import WorkspaceUtil from "../Utils/Workspace/Workspace";
-import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -28,6 +23,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
+  @CaptureSpan()
   public async createAlertFeedItem(data: {
     alertId: ObjectID;
     feedInfoInMarkdown: string;
@@ -97,76 +93,11 @@ export class Service extends DatabaseService<Model> {
       try {
         // send notification to slack and teams
         if (data.workspaceNotification?.sendWorkspaceNotification) {
-          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 WorkspaceNotificationRuleService.getExistingChannelNamesBasedOnEventType(
-                {
-                  projectId: data.projectId,
-                  notificationRuleEventType: NotificationRuleEventType.Alert,
-                  workspaceType: messageBlocksByWorkspaceType.workspaceType,
-                },
-              );
-
-            const alertChannels: Array<WorkspaceChannel> =
-              await AlertService.getWorkspaceChannelForAlert({
-                alertId: data.alertId,
-                workspaceType: messageBlocksByWorkspaceType.workspaceType,
-              });
-
-            const workspaceMessagePayload: WorkspaceMessagePayload = {
-              _type: "WorkspaceMessagePayload",
-              workspaceType: messageBlocksByWorkspaceType.workspaceType,
-              messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
-              channelNames: existingChannels,
-              channelIds:
-                alertChannels.map((channel: WorkspaceChannel) => {
-                  return channel.id;
-                }) || [],
-            };
-
-            workspaceNotificationPaylaods.push(workspaceMessagePayload);
-          }
-
-          await WorkspaceUtil.postMessageToAllWorkspaceChannelsAsBot({
+          await this.sendWorkspaceNotification({
             projectId: data.projectId,
-            messagePayloadsByWorkspace: workspaceNotificationPaylaods,
+            alertId: data.alertId,
+            feedInfoInMarkdown: data.feedInfoInMarkdown,
+            workspaceNotification: data.workspaceNotification,
           });
         }
       } catch (e) {
@@ -181,6 +112,29 @@ export class Service extends DatabaseService<Model> {
       // we dont want to throw the error here, as this is a non-critical operation
     }
   }
+
+  @CaptureSpan()
+  public async sendWorkspaceNotification(data: {
+    projectId: ObjectID;
+    alertId: ObjectID;
+    feedInfoInMarkdown: string;
+    workspaceNotification: {
+      notifyUserId?: ObjectID | undefined; // this is oneuptime user id.
+      sendWorkspaceNotification: boolean;
+      appendMessageBlocks?: Array<MessageBlocksByWorkspaceType> | undefined;
+    };
+  }): Promise<void> {
+    return await WorkspaceNotificationRuleService.sendWorkspaceMarkdownNotification(
+      {
+        projectId: data.projectId,
+        notificationFor: {
+          alertId: data.alertId,
+        },
+        feedInfoInMarkdown: data.feedInfoInMarkdown,
+        workspaceNotification: data.workspaceNotification,
+      },
+    );
+  }
 }
 
 export default new Service();

package/Server/Services/AlertInternalNoteService.ts

@@ -8,12 +8,14 @@ import { Blue500 } from "../../Types/BrandColors";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import Alert from "../../Models/DatabaseModels/Alert";
 import AlertService from "./AlertService";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
   public async addNote(data: {
     userId: ObjectID;
     alertId: ObjectID;
@@ -34,6 +36,7 @@ export class Service extends DatabaseService<Model> {
     });
   }
 
+  @CaptureSpan()
   public override async onCreateSuccess(
     _onCreate: OnCreate<Model>,
     createdItem: Model,
@@ -67,6 +70,7 @@ ${createdItem.note}
     return createdItem;
   }
 
+  @CaptureSpan()
   public override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,
     _updatedItemIds: Array<ObjectID>,

package/Server/Services/AlertOwnerTeamService.ts

@@ -13,12 +13,14 @@ import WorkspaceNotificationRule from "../../Models/DatabaseModels/WorkspaceNoti
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
 import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/EventType";
 import logger from "../Utils/Logger";
+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>> {
@@ -44,6 +46,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onDeleteSuccess(
     onDelete: OnDelete<Model>,
     _itemIdsBeforeDelete: Array<ObjectID>,
@@ -92,6 +95,7 @@ export class Service extends DatabaseService<Model> {
     return onDelete;
   }
 
+  @CaptureSpan()
   public override async onCreateSuccess(
     onCreate: OnCreate<Model>,
     createdItem: Model,

package/Server/Services/AlertOwnerUserService.ts

@@ -13,12 +13,14 @@ import WorkspaceNotificationRule from "../../Models/DatabaseModels/WorkspaceNoti
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
 import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/EventType";
 import logger from "../Utils/Logger";
+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>> {
@@ -44,6 +46,7 @@ export class Service extends DatabaseService<Model> {
     };
   }
 
+  @CaptureSpan()
   protected override async onDeleteSuccess(
     onDelete: OnDelete<Model>,
     _itemIdsBeforeDelete: Array<ObjectID>,
@@ -94,6 +97,7 @@ export class Service extends DatabaseService<Model> {
     return onDelete;
   }
 
+  @CaptureSpan()
   public override async onCreateSuccess(
     onCreate: OnCreate<Model>,
     createdItem: Model,