@oneuptime/common 7.0.2990 → 7.0.3010

package/Server/API/StatusAPI.ts

@@ -6,7 +6,7 @@ import Express, {
 } from "../Utils/Express";
 import logger from "../Utils/Logger";
 import Response from "../Utils/Response";
-import Telemetry from "../Utils/Telemetry";
+import Telemetry, { Span, TelemetryCounter } from "../Utils/Telemetry";
 import Exception from "Common/Types/Exception/Exception";
 import ServerException from "Common/Types/Exception/ServerException";
 
@@ -16,36 +16,36 @@ export interface StatusAPIOptions {
 }
 
 export default class StatusAPI {
-  public static statusCheckSuccessCounter = Telemetry.getCounter({
-    name: "status.check.success",
-    description: "Status check counter",
-  });
-
-  // ready counter
-  public static stausReadySuccess = Telemetry.getCounter({
-    name: "status.ready.success",
-    description: "Ready check counter",
-  });
-  // live counter
-
-  public static stausLiveSuccess = Telemetry.getCounter({
-    name: "status.live.success",
-    description: "Live check counter",
-  });
-
-  // ready failed counter
-  public static stausReadyFailed = Telemetry.getCounter({
-    name: "status.ready.failed",
-    description: "Ready check counter",
-  });
-
-  // live failed counter
-  public static stausLiveFailed = Telemetry.getCounter({
-    name: "status.live.failed",
-    description: "Live check counter",
-  });
-
   public static init(options: StatusAPIOptions): ExpressRouter {
+    const statusCheckSuccessCounter: TelemetryCounter = Telemetry.getCounter({
+      name: "status.check.success",
+      description: "Status check counter",
+    });
+
+    // ready counter
+    const stausReadySuccess: TelemetryCounter = Telemetry.getCounter({
+      name: "status.ready.success",
+      description: "Ready check counter",
+    });
+    // live counter
+
+    const stausLiveSuccess: TelemetryCounter = Telemetry.getCounter({
+      name: "status.live.success",
+      description: "Live check counter",
+    });
+
+    // ready failed counter
+    const stausReadyFailed: TelemetryCounter = Telemetry.getCounter({
+      name: "status.ready.failed",
+      description: "Ready check counter",
+    });
+
+    // live failed counter
+    const stausLiveFailed: TelemetryCounter = Telemetry.getCounter({
+      name: "status.live.failed",
+      description: "Live check counter",
+    });
+
     const router: ExpressRouter = Express.getRouter();
 
     router.get("/app-name", (_req: ExpressRequest, res: ExpressResponse) => {
@@ -54,7 +54,7 @@ export default class StatusAPI {
 
     // General status
     router.get("/status", (req: ExpressRequest, res: ExpressResponse) => {
-      this.statusCheckSuccessCounter.add(1);
+      statusCheckSuccessCounter.add(1);
 
       logger.info("Status check: ok");
 
@@ -67,24 +67,35 @@ export default class StatusAPI {
     router.get(
       "/status/ready",
       async (req: ExpressRequest, res: ExpressResponse) => {
-        try {
-          logger.debug("Ready check");
-          await options.readyCheck();
-          logger.info("Ready check: ok");
-          this.stausReadySuccess.add(1);
-          Response.sendJsonObjectResponse(req, res, {
-            status: "ok",
-          });
-        } catch (e) {
-          this.stausReadyFailed.add(1);
-          Response.sendErrorResponse(
-            req,
-            res,
-            e instanceof Exception
-              ? e
-              : new ServerException("Server is not ready"),
-          );
-        }
+        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);
+
+              span.recordException(new ServerException("Server is ready"));
+
+              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();
+            }
+          },
+        });
       },
     );
 
@@ -96,12 +107,13 @@ export default class StatusAPI {
           logger.debug("Live check");
           await options.readyCheck();
           logger.info("Live check: ok");
-          this.stausLiveSuccess.add(1);
+          stausLiveSuccess.add(1);
+
           Response.sendJsonObjectResponse(req, res, {
             status: "ok",
           });
         } catch (e) {
-          this.stausLiveFailed.add(1);
+          stausLiveFailed.add(1);
           Response.sendErrorResponse(
             req,
             res,

package/Server/EnvironmentConfig.ts

@@ -255,3 +255,6 @@ export const AccountsClientUrl: URL = new URL(
   Host,
   AccountsRoute,
 );
+
+export const DisableTelemetry: boolean =
+  process.env["DISABLE_TELEMETRY"] === "true";

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

@@ -0,0 +1,93 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1724610006927 implements MigrationInterface {
+  public name = "MigrationName1724610006927";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "TelemetryException" ("_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, "telemetryServiceId" uuid NOT NULL, "message" character varying, "stackTrace" character varying, "exceptionType" character varying, "fingerprint" character varying(100), "createdByUserId" uuid, "deletedByUserId" uuid, "markedAsResolvedAt" TIMESTAMP WITH TIME ZONE, "markedAsMutedAt" TIMESTAMP WITH TIME ZONE, "firstSeenAt" TIMESTAMP WITH TIME ZONE, "lastSeenAt" TIMESTAMP WITH TIME ZONE, "assignToUserId" uuid, "assignToTeamId" uuid, "markedAsResolvedByUserId" uuid, "markedAsMutedByUserId" uuid, CONSTRAINT "PK_53717afe73c3e72c11713e5e25f" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_3310c3a807a7e8bca9d1bd8e0e" ON "TelemetryException" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6470c69cb5f53c5899c0483df5" ON "TelemetryException" ("telemetryServiceId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_e270eb229cd583c653c2176db9" ON "TelemetryException" ("fingerprint") `,
+    );
+    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 "TelemetryException" ADD CONSTRAINT "FK_3310c3a807a7e8bca9d1bd8e0eb" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_6470c69cb5f53c5899c0483df5f" FOREIGN KEY ("telemetryServiceId") REFERENCES "TelemetryService"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_d2e1b4f5dcaebbf14ed6cbd303d" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_757f473e68b584bc42fcfbd9373" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_f7ec3f51dae2b4963cfb8fe5c46" FOREIGN KEY ("assignToUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_63221e8bd973ab71a49598d6c88" FOREIGN KEY ("assignToTeamId") REFERENCES "Team"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_10c7733499d5afa9b857f4a00c5" FOREIGN KEY ("markedAsResolvedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_199e3572d19b75e59f2082251f8" FOREIGN KEY ("markedAsMutedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_199e3572d19b75e59f2082251f8"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_10c7733499d5afa9b857f4a00c5"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_63221e8bd973ab71a49598d6c88"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_f7ec3f51dae2b4963cfb8fe5c46"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_757f473e68b584bc42fcfbd9373"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_d2e1b4f5dcaebbf14ed6cbd303d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_6470c69cb5f53c5899c0483df5f"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_3310c3a807a7e8bca9d1bd8e0eb"`,
+    );
+    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(
+      `DROP INDEX "public"."IDX_e270eb229cd583c653c2176db9"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_6470c69cb5f53c5899c0483df5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_3310c3a807a7e8bca9d1bd8e0e"`,
+    );
+    await queryRunner.query(`DROP TABLE "TelemetryException"`);
+  }
+}

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

@@ -0,0 +1,60 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1724613666632 implements MigrationInterface {
+  public name = "MigrationName1724613666632";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_199e3572d19b75e59f2082251f8"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "markedAsMutedAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "markedAsMutedByUserId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "markedAsArchivedAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "markedAsArchivedByUserId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "isResolved" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "isArchived" boolean NOT NULL DEFAULT false`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_3def22373f0cb84e16cb355b5e5" FOREIGN KEY ("markedAsArchivedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP CONSTRAINT "FK_3def22373f0cb84e16cb355b5e5"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "isArchived"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "isResolved"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "markedAsArchivedByUserId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "markedAsArchivedAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "markedAsMutedByUserId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "markedAsMutedAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD CONSTRAINT "FK_199e3572d19b75e59f2082251f8" FOREIGN KEY ("markedAsMutedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+}

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

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1724659071843 implements MigrationInterface {
+  public name = "MigrationName1724659071843";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" ADD "occuranceCount" integer NOT NULL DEFAULT '1'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" DROP COLUMN "occuranceCount"`,
+    );
+  }
+}

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

@@ -41,6 +41,9 @@ import { MigrationName1722892318363 } from "./1722892318363-MigrationName";
 import { MigrationName1723825511054 } from "./1723825511054-MigrationName";
 import { MigrationName1723828588502 } from "./1723828588502-MigrationName";
 import { MigrationName1724078044172 } from "./1724078044172-MigrationName";
+import { MigrationName1724610006927 } from "./1724610006927-MigrationName";
+import { MigrationName1724613666632 } from "./1724613666632-MigrationName";
+import { MigrationName1724659071843 } from "./1724659071843-MigrationName";
 
 export default [
   InitialMigration,
@@ -86,4 +89,7 @@ export default [
   MigrationName1723825511054,
   MigrationName1723828588502,
   MigrationName1724078044172,
+  MigrationName1724610006927,
+  MigrationName1724613666632,
+  MigrationName1724659071843,
 ];

package/Server/Infrastructure/Queue.ts

@@ -1,7 +1,16 @@
-import { RedisHostname, RedisPassword, RedisPort } from "../EnvironmentConfig";
+import {
+  ClusterKey,
+  RedisHostname,
+  RedisPassword,
+  RedisPort,
+} from "../EnvironmentConfig";
 import Dictionary from "Common/Types/Dictionary";
 import { JSONObject } from "Common/Types/JSON";
 import { Queue as BullQueue, Job, JobsOptions } from "bullmq";
+import { ExpressAdapter } from "@bull-board/express";
+import { createBullBoard } from "@bull-board/api";
+import { BullMQAdapter } from "@bull-board/api/bullMQAdapter";
+import { ExpressRouter } from "../Utils/Express";
 
 export enum QueueName {
   Workflow = "Workflow",
@@ -51,6 +60,32 @@ export default class Queue {
     await this.getQueue(queueName).removeRepeatableByKey(jobId);
   }
 
+  public static getInspectorRoute(): string {
+    return "/api/inspect/queue/:clusterKey";
+  }
+
+  public static getQueueInspectorRouter(): ExpressRouter {
+    const serverAdapter: ExpressAdapter = new ExpressAdapter();
+
+    createBullBoard({
+      queues: [
+        ...Object.values(QueueName).map((queueName: QueueName) => {
+          return new BullMQAdapter(this.getQueue(queueName));
+        }),
+      ],
+      serverAdapter: serverAdapter,
+    });
+
+    serverAdapter.setBasePath(
+      this.getInspectorRoute().replace(
+        "/:clusterKey",
+        "/" + ClusterKey.toString(),
+      ),
+    );
+
+    return serverAdapter.getRouter();
+  }
+
   public static async addJob(
     queueName: QueueName,
     jobId: string,

package/Server/Infrastructure/QueueWorker.ts

@@ -31,7 +31,7 @@ export default class QueueWorker {
   }
 
   public static async runJobWithTimeout(
-    timeout: number,
+    timeoutInMS: number,
     jobCallback: PromiseVoidFunction,
   ): Promise<void> {
     type TimeoutPromise = (ms: number) => Promise<void>;
@@ -46,6 +46,6 @@ export default class QueueWorker {
       );
     };
 
-    return await Promise.race([timeoutPromise(timeout), jobCallback()]);
+    return await Promise.race([timeoutPromise(timeoutInMS), jobCallback()]);
   }
 }

package/Server/Services/DatabaseService.ts

@@ -59,7 +59,6 @@ import Typeof from "../../Types/Typeof";
 import API from "Common/Utils/API";
 import Slug from "Common/Utils/Slug";
 import { DataSource, Repository, SelectQueryBuilder } from "typeorm";
-import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
 import { FindWhere } from "../../Types/BaseDatabase/Query";
 
 class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
@@ -427,10 +426,10 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
   }
 
   private async sanitizeCreateOrUpdate(
-    data: TBaseModel | QueryDeepPartialEntity<TBaseModel>,
+    data: TBaseModel | PartialEntity<TBaseModel>,
     props: DatabaseCommonInteractionProps,
     isUpdate: boolean = false,
-  ): Promise<TBaseModel | QueryDeepPartialEntity<TBaseModel>> {
+  ): Promise<TBaseModel | PartialEntity<TBaseModel>> {
     data = this.checkMaxLengthOfFields(data as TBaseModel);
 
     const columns: Columns = this.model.getTableColumns();
@@ -1274,12 +1273,12 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
         beforeUpdateBy.props,
       );
 
-      const data: QueryDeepPartialEntity<TBaseModel> =
+      const data: PartialEntity<TBaseModel> =
         (await this.sanitizeCreateOrUpdate(
           beforeUpdateBy.data,
           updateBy.props,
           true,
-        )) as QueryDeepPartialEntity<TBaseModel>;
+        )) as PartialEntity<TBaseModel>;
 
       if (!(updateBy.skip instanceof PositiveNumber)) {
         updateBy.skip = new PositiveNumber(updateBy.skip);

package/Server/Services/ExceptionInstanceService.ts

@@ -0,0 +1,11 @@
+import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
+import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
+import ExceptionInstance from "Common/Models/AnalyticsModels/ExceptionInstance";
+
+export class ExceptionInstanceService extends AnalyticsDatabaseService<ExceptionInstance> {
+  public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) {
+    super({ modelType: ExceptionInstance, database: clickhouseDatabase });
+  }
+}
+
+export default new ExceptionInstanceService();

package/Server/Services/Index.ts

@@ -130,6 +130,8 @@ import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel
 import CopilotPullRequestService from "./CopilotPullRequestService";
 import ServiceCatalogDependencyService from "./ServiceCatalogDependencyService";
 import TelemetryAttributeService from "./TelemetryAttributeService";
+import TelemetryExceptionService from "./TelemetryExceptionService";
+import ExceptionInstanceService from "./ExceptionInstanceService";
 
 const services: Array<BaseService> = [
   AcmeCertificateService,
@@ -271,6 +273,8 @@ const services: Array<BaseService> = [
   CopilotActionService,
   ServiceCopilotCodeRepositoryService,
   CopilotPullRequestService,
+
+  TelemetryExceptionService,
 ];
 
 export const AnalyticsServices: Array<
@@ -281,6 +285,7 @@ export const AnalyticsServices: Array<
   MetricService,
   MonitorMetricsByMinuteService,
   TelemetryAttributeService,
+  ExceptionInstanceService,
 ];
 
 export default services;