@oneuptime/common 7.0.3840 → 7.0.3871

package/Server/API/SlackAPI.ts

@@ -33,6 +33,7 @@ import SlackIncidentActions from "../Utils/Workspace/Slack/Actions/Incident";
 import SlackAlertActions from "../Utils/Workspace/Slack/Actions/Alert";
 import SlackScheduledMaintenanceActions from "../Utils/Workspace/Slack/Actions/ScheduledMaintenance";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
+import SlackMonitorActions from "../Utils/Workspace/Slack/Actions/Monitor";
 
 export default class SlackAPI {
   public getRouter(): ExpressRouter {
@@ -363,6 +364,19 @@ export default class SlackAPI {
             });
           }
 
+          if (
+            SlackMonitorActions.isMonitorAction({
+              actionType: action.actionType,
+            })
+          ) {
+            return SlackMonitorActions.handleMonitorAction({
+              slackRequest: authResult,
+              action: action,
+              req: req,
+              res: res,
+            });
+          }
+
           if (
             SlackScheduledMaintenanceActions.isScheduledMaintenanceAction({
               actionType: action.actionType,

package/Server/API/StatusAPI.ts

@@ -7,9 +7,10 @@ import Express, {
 } from "../Utils/Express";
 import logger from "../Utils/Logger";
 import Response from "../Utils/Response";
-import Telemetry, { Span, TelemetryCounter } from "../Utils/Telemetry";
+import Telemetry, { TelemetryCounter } from "../Utils/Telemetry";
 import Exception from "Common/Types/Exception/Exception";
 import ServerException from "Common/Types/Exception/ServerException";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export interface StatusAPIOptions {
   readyCheck: () => Promise<void>;
@@ -20,6 +21,7 @@ export interface StatusAPIOptions {
 }
 
 export default class StatusAPI {
+  @CaptureSpan()
   public static init(options: StatusAPIOptions): ExpressRouter {
     const statusCheckSuccessCounter: TelemetryCounter = Telemetry.getCounter({
       name: "status.check.success",
@@ -68,153 +70,196 @@ export default class StatusAPI {
     });
 
     //Healthy probe
-    router.get(
-      "/status/ready",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        return Telemetry.startActiveSpan({
-          name: "/status/ready",
-          fn: async (span: Span) => {
-            try {
-              logger.debug("Ready check");
-              await options.readyCheck();
-              logger.info("Ready check: ok");
-              stausReadySuccess.add(1);
-
-              Response.sendJsonObjectResponse(req, res, {
-                status: "ok",
-              });
-              span.end();
-            } catch (e) {
-              span.recordException(e as Exception);
-              stausReadyFailed.add(1);
-              Response.sendErrorResponse(
-                req,
-                res,
-                e instanceof Exception
-                  ? e
-                  : new ServerException("Server is not ready"),
-              );
-              span.end();
-            }
-          },
-        });
-      },
-    );
+    router.get("/status/ready", (req: ExpressRequest, res: ExpressResponse) => {
+      return this.handleReadyCheck(
+        options,
+        stausReadySuccess,
+        stausReadyFailed,
+        req,
+        res,
+      );
+    });
 
     //Liveness probe
-    router.get(
-      "/status/live",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        try {
-          logger.debug("Live check");
-          await options.liveCheck();
-          logger.info("Live check: ok");
-          stausLiveSuccess.add(1);
-
-          Response.sendJsonObjectResponse(req, res, {
-            status: "ok",
-          });
-        } catch (e) {
-          stausLiveFailed.add(1);
-          Response.sendErrorResponse(
-            req,
-            res,
-            e instanceof Exception
-              ? e
-              : new ServerException("Server is not ready"),
-          );
-        }
-      },
-    );
+    router.get("/status/live", (req: ExpressRequest, res: ExpressResponse) => {
+      return this.handleLiveCheck(
+        options,
+        stausLiveSuccess,
+        stausLiveFailed,
+        req,
+        res,
+      );
+    });
 
     // Global cache check
     router.get(
       "/status/global-cache",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        try {
-          logger.debug("Global cache check");
-          if (options.globalCacheCheck) {
-            await options.globalCacheCheck();
-          } else {
-            throw new BadRequestException("Global cache check not implemented");
-          }
-          logger.info("Global cache check: ok");
-
-          Response.sendJsonObjectResponse(req, res, {
-            status: "ok",
-          });
-        } catch (e) {
-          Response.sendErrorResponse(
-            req,
-            res,
-            e instanceof Exception
-              ? e
-              : new ServerException("Global cache is not ready"),
-          );
-        }
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return this.handleGlobalCacheCheck(options, req, res);
       },
     );
 
     // Analytics database check
     router.get(
       "/status/analytics-database",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        try {
-          logger.debug("Analytics database check");
-          if (options.analyticsDatabaseCheck) {
-            await options.analyticsDatabaseCheck();
-          } else {
-            throw new BadRequestException(
-              "Analytics database check not implemented",
-            );
-          }
-          logger.info("Analytics database check: ok");
-
-          Response.sendJsonObjectResponse(req, res, {
-            status: "ok",
-          });
-        } catch (e) {
-          Response.sendErrorResponse(
-            req,
-            res,
-            e instanceof Exception
-              ? e
-              : new ServerException("Analytics database is not ready"),
-          );
-        }
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return this.handleAnalyticsDatabaseCheck(options, req, res);
       },
     );
 
     // Database check
     router.get(
       "/status/database",
-      async (req: ExpressRequest, res: ExpressResponse) => {
-        try {
-          logger.debug("Database check");
-
-          if (options.databaseCheck) {
-            await options.databaseCheck();
-          } else {
-            throw new BadRequestException("Database check not implemented");
-          }
-
-          logger.info("Database check: ok");
-
-          Response.sendJsonObjectResponse(req, res, {
-            status: "ok",
-          });
-        } catch (e) {
-          Response.sendErrorResponse(
-            req,
-            res,
-            e instanceof Exception
-              ? e
-              : new ServerException("Database is not ready"),
-          );
-        }
+      (req: ExpressRequest, res: ExpressResponse) => {
+        return this.handleDatabaseCheck(options, req, res);
       },
     );
 
     return router;
   }
+
+  @CaptureSpan()
+  private static async handleReadyCheck(
+    options: StatusAPIOptions,
+    stausReadySuccess: TelemetryCounter,
+    stausReadyFailed: TelemetryCounter,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Ready check");
+      await options.readyCheck();
+      logger.info("Ready check: ok");
+      stausReadySuccess.add(1);
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      stausReadyFailed.add(1);
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception ? e : new ServerException("Server is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleLiveCheck(
+    options: StatusAPIOptions,
+    stausLiveSuccess: TelemetryCounter,
+    stausLiveFailed: TelemetryCounter,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Live check");
+      await options.liveCheck();
+      logger.info("Live check: ok");
+      stausLiveSuccess.add(1);
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      stausLiveFailed.add(1);
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception ? e : new ServerException("Server is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleGlobalCacheCheck(
+    options: StatusAPIOptions,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Global cache check");
+      if (options.globalCacheCheck) {
+        await options.globalCacheCheck();
+      } else {
+        throw new BadRequestException("Global cache check not implemented");
+      }
+      logger.info("Global cache check: ok");
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception
+          ? e
+          : new ServerException("Global cache is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleAnalyticsDatabaseCheck(
+    options: StatusAPIOptions,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Analytics database check");
+      if (options.analyticsDatabaseCheck) {
+        await options.analyticsDatabaseCheck();
+      } else {
+        throw new BadRequestException(
+          "Analytics database check not implemented",
+        );
+      }
+      logger.info("Analytics database check: ok");
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception
+          ? e
+          : new ServerException("Analytics database is not ready"),
+      );
+    }
+  }
+
+  @CaptureSpan()
+  private static async handleDatabaseCheck(
+    options: StatusAPIOptions,
+    req: ExpressRequest,
+    res: ExpressResponse,
+  ): Promise<void> {
+    try {
+      logger.debug("Database check");
+
+      if (options.databaseCheck) {
+        await options.databaseCheck();
+      } else {
+        throw new BadRequestException("Database check not implemented");
+      }
+
+      logger.info("Database check: ok");
+
+      Response.sendJsonObjectResponse(req, res, {
+        status: "ok",
+      });
+    } catch (e) {
+      Response.sendErrorResponse(
+        req,
+        res,
+        e instanceof Exception
+          ? e
+          : new ServerException("Database is not ready"),
+      );
+    }
+  }
 }

package/Server/API/StatusPageAPI.ts

@@ -78,6 +78,7 @@ import StatusPageResourceUptimeUtil from "../../Utils/StatusPage/ResourceUptime"
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
 import { Green } from "../../Types/BrandColors";
 import UptimeUtil from "../../Utils/Uptime/UptimeUtil";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default class StatusPageAPI extends BaseAPI<
   StatusPage,
@@ -1505,6 +1506,7 @@ export default class StatusPageAPI extends BaseAPI<
     );
   }
 
+  @CaptureSpan()
   public async getScheduledMaintenanceEvents(
     statusPageId: ObjectID,
     scheduledMaintenanceId: ObjectID | null,
@@ -1822,6 +1824,7 @@ export default class StatusPageAPI extends BaseAPI<
     return response;
   }
 
+  @CaptureSpan()
   public async getAnnouncements(
     statusPageId: ObjectID,
     announcementId: ObjectID | null,
@@ -1937,6 +1940,7 @@ export default class StatusPageAPI extends BaseAPI<
     return response;
   }
 
+  @CaptureSpan()
   public async subscribeToStatusPage(req: ExpressRequest): Promise<void> {
     const objectId: ObjectID = new ObjectID(
       req.params["statusPageId"] as string,
@@ -2163,6 +2167,7 @@ export default class StatusPageAPI extends BaseAPI<
     );
   }
 
+  @CaptureSpan()
   public async getSubscriber(
     req: ExpressRequest,
   ): Promise<StatusPageSubscriber> {
@@ -2229,6 +2234,7 @@ export default class StatusPageAPI extends BaseAPI<
     return statusPageSubscriber;
   }
 
+  @CaptureSpan()
   public async getIncidents(
     statusPageId: ObjectID,
     incidentId: ObjectID | null,
@@ -2539,6 +2545,7 @@ export default class StatusPageAPI extends BaseAPI<
     return currentStatus;
   }
 
+  @CaptureSpan()
   public async getStatusPageResourcesAndTimelines(data: {
     statusPageId: ObjectID;
     startDateForMonitorTimeline: Date;

package/Server/DatabaseConfig.ts

@@ -7,8 +7,10 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import { JSONValue } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
 import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
+import CaptureSpan from "./Utils/Telemetry/CaptureSpan";
 
 export default class DatabaseConfig {
+  @CaptureSpan()
   public static async getFromGlobalConfig(key: string): Promise<JSONValue> {
     const globalConfig: GlobalConfig | null =
       await GlobalConfigService.findOneBy({
@@ -30,6 +32,7 @@ export default class DatabaseConfig {
     return globalConfig.getColumnValue(key);
   }
 
+  @CaptureSpan()
   public static async getHomeUrl(): Promise<URL> {
     const host: Hostname = await DatabaseConfig.getHost();
 
@@ -38,21 +41,25 @@ export default class DatabaseConfig {
     return new URL(httpProtocol, host);
   }
 
+  @CaptureSpan()
   public static async getHost(): Promise<Hostname> {
     return Promise.resolve(new Hostname(process.env["HOST"] || "localhost"));
   }
 
+  @CaptureSpan()
   public static async getHttpProtocol(): Promise<Protocol> {
     return Promise.resolve(
       process.env["HTTP_PROTOCOL"] === "https" ? Protocol.HTTPS : Protocol.HTTP,
     );
   }
 
+  @CaptureSpan()
   public static async getAccountsUrl(): Promise<URL> {
     const host: Hostname = await DatabaseConfig.getHost();
     return new URL(await DatabaseConfig.getHttpProtocol(), host, AccountsRoute);
   }
 
+  @CaptureSpan()
   public static async getDashboardUrl(): Promise<URL> {
     const host: Hostname = await DatabaseConfig.getHost();
     return new URL(
@@ -62,6 +69,7 @@ export default class DatabaseConfig {
     );
   }
 
+  @CaptureSpan()
   public static async shouldDisableSignup(): Promise<boolean> {
     return (await DatabaseConfig.getFromGlobalConfig(
       "disableSignup",

package/Server/Infrastructure/ClickhouseDatabase.ts

@@ -12,6 +12,7 @@ import URL from "../../Types/API/URL";
 import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse";
 import HTTPResponse from "../../Types/API/HTTPResponse";
 import { JSONObject } from "../../Types/JSON";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export type ClickhouseClient = ClickHouseClient;
 
@@ -34,6 +35,7 @@ export default class ClickhouseDatabase {
     return Boolean(this.dataSource);
   }
 
+  @CaptureSpan()
   public async connect(
     dataSourceOptions: ClickHouseClientConfigOptions,
   ): Promise<ClickhouseClient> {
@@ -95,6 +97,7 @@ export default class ClickhouseDatabase {
     }
   }
 
+  @CaptureSpan()
   public async disconnect(): Promise<void> {
     if (this.dataSource) {
       await this.dataSource.close();
@@ -102,6 +105,7 @@ export default class ClickhouseDatabase {
     }
   }
 
+  @CaptureSpan()
   public async checkConnnectionStatus(): Promise<boolean> {
     // Ping clickhouse to check if the connection is still alive
     try {

package/Server/Infrastructure/GlobalCache.ts

@@ -5,8 +5,10 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException";
 import { JSONArray, JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default abstract class GlobalCache {
+  @CaptureSpan()
   public static async getJSONObject(
     namespace: string,
     key: string,
@@ -27,6 +29,7 @@ export default abstract class GlobalCache {
     return json;
   }
 
+  @CaptureSpan()
   public static async getStringArray(
     namespace: string,
     key: string,
@@ -48,6 +51,7 @@ export default abstract class GlobalCache {
     return stringArr;
   }
 
+  @CaptureSpan()
   public static async setStringArray(
     namespace: string,
     key: string,
@@ -56,6 +60,7 @@ export default abstract class GlobalCache {
     await this.setString(namespace, key, JSON.stringify(value));
   }
 
+  @CaptureSpan()
   public static async getJSONArray(
     namespace: string,
     key: string,
@@ -106,6 +111,7 @@ export default abstract class GlobalCache {
     }
   }
 
+  @CaptureSpan()
   public static async getString(
     namespace: string,
     key: string,
@@ -125,6 +131,7 @@ export default abstract class GlobalCache {
     return value;
   }
 
+  @CaptureSpan()
   public static async setJSON(
     namespace: string,
     key: string,
@@ -137,6 +144,7 @@ export default abstract class GlobalCache {
     );
   }
 
+  @CaptureSpan()
   public static async setString(
     namespace: string,
     key: string,

package/Server/Infrastructure/LocalCache.ts

@@ -1,10 +1,12 @@
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import Dictionary from "Common/Types/Dictionary";
 import { JSONValue } from "Common/Types/JSON";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export default abstract class LocalCache {
   private static cache: Dictionary<JSONValue | BaseModel> = {};
 
+  @CaptureSpan()
   public static setJSON(
     namespace: string,
     key: string,
@@ -13,14 +15,17 @@ export default abstract class LocalCache {
     this.cache[namespace + "." + key] = value;
   }
 
+  @CaptureSpan()
   public static setString(namespace: string, key: string, value: string): void {
     this.cache[namespace + "." + key] = value;
   }
 
+  @CaptureSpan()
   public static setNumber(namespace: string, key: string, value: number): void {
     this.cache[namespace + "." + key] = value;
   }
 
+  @CaptureSpan()
   public static setModel(
     namespace: string,
     key: string,
@@ -29,6 +34,7 @@ export default abstract class LocalCache {
     this.cache[namespace + "." + key] = value;
   }
 
+  @CaptureSpan()
   public static getModel<TBaseModel extends BaseModel>(
     namespace: string,
     key: string,
@@ -36,18 +42,22 @@ export default abstract class LocalCache {
     return this.cache[namespace + "." + key] as TBaseModel;
   }
 
+  @CaptureSpan()
   public static getJSON(namespace: string, key: string): JSONValue {
     return this.cache[namespace + "." + key] as JSONValue;
   }
 
+  @CaptureSpan()
   public static getString(namespace: string, key: string): string {
     return this.cache[namespace + "." + key] as string;
   }
 
+  @CaptureSpan()
   public static getNumber(namespace: string, key: string): number {
     return this.cache[namespace + "." + key] as number;
   }
 
+  @CaptureSpan()
   public static async getOrSetString(
     namespace: string,
     key: string,
@@ -60,6 +70,7 @@ export default abstract class LocalCache {
     return LocalCache.getString(namespace, key);
   }
 
+  @CaptureSpan()
   public static hasValue(namespace: string, key: string): boolean {
     return Boolean(this.cache[namespace + "." + key]);
   }

package/Server/Infrastructure/Postgres/SchemaMigrations/1717605043663-InitialMigration.ts

@@ -1,8 +1,10 @@
 import { MigrationInterface, QueryRunner, Table } from "typeorm";
+import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
 
 export default class InitialMigration implements MigrationInterface {
   public name: string = "InitialMigration1717605043663";
 
+  @CaptureSpan()
   public async up(queryRunner: QueryRunner): Promise<void> {
     // check if File table already exists, then dont run the migration
     const fileTable: Table | undefined = await queryRunner.getTable("File");
@@ -2776,6 +2778,7 @@ export default class InitialMigration implements MigrationInterface {
     );
   }
 
+  @CaptureSpan()
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
       `ALTER TABLE "WorkflowLabel" DROP CONSTRAINT "FK_4e72fad380eca9abfa3b9895546"`,

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

@@ -1,8 +1,10 @@
 import { MigrationInterface, QueryRunner, Table, TableColumn } from "typeorm";
+import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
 
 export class MigrationName1717678334852 implements MigrationInterface {
   public name: string = "MigrationName1717678334852";
 
+  @CaptureSpan()
   public async up(queryRunner: QueryRunner): Promise<void> {
     // check if the column exists
 
@@ -41,6 +43,7 @@ export class MigrationName1717678334852 implements MigrationInterface {
     }
   }
 
+  @CaptureSpan()
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
       `ALTER TABLE "TeamPermission" DROP COLUMN "isBlockPermission"`,

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

@@ -1,8 +1,10 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
+import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
 
 export class MigrationName1717839110671 implements MigrationInterface {
   public name = "MigrationName1717839110671";
 
+  @CaptureSpan()
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
       `CREATE TABLE "ServiceCatalog" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP, "version" integer NOT NULL, "projectId" uuid NOT NULL, "name" character varying(100) NOT NULL, "slug" character varying(100) NOT NULL, "description" character varying(500), "createdByUserId" uuid, "deletedByUserId" uuid, "serviceColor" character varying, CONSTRAINT "PK_5186d54b1b97610ea80b5c55aad" PRIMARY KEY ("_id"))`,
@@ -36,6 +38,7 @@ export class MigrationName1717839110671 implements MigrationInterface {
     );
   }
 
+  @CaptureSpan()
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
       `ALTER TABLE "ServiceCatalogLabel" DROP CONSTRAINT "FK_701f84e45404bdddcffdcaaba20"`,