@oneuptime/common 7.0.3840 → 7.0.3864

package/Server/Utils/LocalFile.ts

@@ -1,7 +1,9 @@
 import { PromiseRejectErrorFunction } from "Common/Types/FunctionTypes";
 import fs from "fs";
+import CaptureSpan from "./Telemetry/CaptureSpan";
 
 export default class LocalFile {
+  @CaptureSpan()
   public static async copyDirectory(data: {
     source: string;
     destination: string;
@@ -22,6 +24,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async copyFile(data: {
     source: string;
     destination: string;
@@ -38,16 +41,19 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static sanitizeFilePath(filePath: string): string {
     // remove double slashes
     return filePath.replace(/\/\//g, "/");
   }
 
+  @CaptureSpan()
   public static getFileExtension(filePath: string): string {
     const fileExtention: Array<string> = filePath.split(".");
     return fileExtention[fileExtention.length - 1]?.toLowerCase() || "";
   }
 
+  @CaptureSpan()
   public static async deleteFile(filePath: string): Promise<void> {
     if ((await this.doesFileExist(filePath)) === false) {
       return;
@@ -65,6 +71,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async getListOfDirectories(path: string): Promise<string[]> {
     return new Promise(
       (
@@ -94,6 +101,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async doesFileExist(path: string): Promise<boolean> {
     return new Promise(
       (
@@ -116,6 +124,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async doesDirectoryExist(path: string): Promise<boolean> {
     return new Promise(
       (
@@ -138,6 +147,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async deleteAllDataInDirectory(path: string): Promise<void> {
     if ((await this.doesDirectoryExist(path)) === false) {
       return;
@@ -163,6 +173,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async makeDirectory(path: string): Promise<void> {
     return new Promise(
       (resolve: VoidFunction, reject: PromiseRejectErrorFunction) => {
@@ -176,6 +187,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async write(path: string, data: string): Promise<void> {
     return new Promise(
       (resolve: VoidFunction, reject: PromiseRejectErrorFunction) => {
@@ -189,6 +201,7 @@ export default class LocalFile {
     );
   }
 
+  @CaptureSpan()
   public static async read(path: string): Promise<string> {
     return new Promise(
       (resolve: (data: string) => void, reject: PromiseRejectErrorFunction) => {

package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts

@@ -9,8 +9,10 @@ import {
 } from "Common/Types/Monitor/CriteriaFilter";
 import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import Typeof from "Common/Types/Typeof";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class APIRequestCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/CompareCriteria.ts

@@ -6,8 +6,10 @@ import {
   FilterType,
 } from "Common/Types/Monitor/CriteriaFilter";
 import Typeof from "Common/Types/Typeof";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class CompareCriteria {
+  @CaptureSpan()
   public static greaterThan(data: {
     value: number | Array<number>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -27,6 +29,7 @@ export default class CompareCriteria {
     return data.value > data.threshold;
   }
 
+  @CaptureSpan()
   public static isTrue(data: {
     value: boolean | Array<boolean>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -47,6 +50,7 @@ export default class CompareCriteria {
     return data.value === true;
   }
 
+  @CaptureSpan()
   public static isFalse(data: {
     value: boolean | Array<boolean>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -67,6 +71,7 @@ export default class CompareCriteria {
     return data.value === false;
   }
 
+  @CaptureSpan()
   public static lessThan(data: {
     value: number | Array<number>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -86,6 +91,7 @@ export default class CompareCriteria {
     return data.value < data.threshold;
   }
 
+  @CaptureSpan()
   public static greaterThanOrEqual(data: {
     value: number | Array<number>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -105,6 +111,7 @@ export default class CompareCriteria {
     return data.value >= data.threshold;
   }
 
+  @CaptureSpan()
   public static lessThanOrEqual(data: {
     value: number | Array<number>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -124,6 +131,7 @@ export default class CompareCriteria {
     return data.value <= data.threshold;
   }
 
+  @CaptureSpan()
   public static equalTo(data: {
     value: number | Array<number>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -143,6 +151,7 @@ export default class CompareCriteria {
     return data.value === data.threshold;
   }
 
+  @CaptureSpan()
   public static notEqualTo(data: {
     value: number | Array<number>;
     evaluationType?: EvaluateOverTimeType | undefined;
@@ -162,6 +171,7 @@ export default class CompareCriteria {
     return data.value !== data.threshold;
   }
 
+  @CaptureSpan()
   public static convertToNumber(
     threshold: string | number | undefined,
   ): number | null {
@@ -185,6 +195,7 @@ export default class CompareCriteria {
     return threshold as number;
   }
 
+  @CaptureSpan()
   public static checkEqualToOrNotEqualTo(data: {
     value: string | number;
     threshold: string | number;
@@ -209,6 +220,7 @@ export default class CompareCriteria {
     return null;
   }
 
+  @CaptureSpan()
   public static compareEmptyAndNotEmpty(data: {
     value: any;
     criteriaFilter: CriteriaFilter;
@@ -232,6 +244,7 @@ export default class CompareCriteria {
     return null;
   }
 
+  @CaptureSpan()
   public static compareCriteriaStrings(data: {
     value: string;
     threshold: string;
@@ -304,6 +317,7 @@ export default class CompareCriteria {
     return null;
   }
 
+  @CaptureSpan()
   public static compareCriteriaBoolean(data: {
     value: Array<boolean> | boolean;
     criteriaFilter: CriteriaFilter;
@@ -355,6 +369,7 @@ export default class CompareCriteria {
     return null;
   }
 
+  @CaptureSpan()
   public static compareCriteriaNumbers(data: {
     value: Array<number> | number;
     threshold: number;
@@ -491,6 +506,7 @@ export default class CompareCriteria {
     return null;
   }
 
+  @CaptureSpan()
   public static getCompareMessage(data: {
     values: Array<number | boolean> | number | boolean | string;
     threshold: number | string | boolean;

package/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts

@@ -1,8 +1,10 @@
 import CompareCriteria from "./CompareCriteria";
 import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter";
 import CustomCodeMonitorResponse from "Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class CustomCodeMonitoringCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     monitorResponse: CustomCodeMonitorResponse;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts

@@ -12,8 +12,10 @@ import ObjectID from "Common/Types/ObjectID";
 import Metric from "../../../../Models/AnalyticsModels/Metric";
 import MonitorMetricTypeUtil from "../../../../Utils/Monitor/MonitorMetricType";
 import MetricService from "../../../Services/MetricService";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class EvaluateOverTime {
+  @CaptureSpan()
   public static async getValueOverTime(data: {
     monitorId: ObjectID;
     evaluateOverTimeOptions: EvaluateOverTimeOptions;

package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts

@@ -12,8 +12,10 @@ import Typeof from "Common/Types/Typeof";
 import EvaluateOverTime from "./EvaluateOverTime";
 import CompareCriteria from "./CompareCriteria";
 import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class IncomingRequestCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts

@@ -1,9 +1,11 @@
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 import DataToProcess from "../DataToProcess";
 import CompareCriteria from "./CompareCriteria";
 import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter";
 import LogMonitorResponse from "Common/Types/Monitor/LogMonitor/LogMonitorResponse";
 
 export default class LogMonitorCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.ts

@@ -11,8 +11,10 @@ import {
   CriteriaFilter,
   EvaluateOverTimeType,
 } from "Common/Types/Monitor/CriteriaFilter";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class MetricMonitorCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts

@@ -9,8 +9,10 @@ import {
 import SslMonitorResponse from "Common/Types/Monitor/SSLMonitor/SslMonitorResponse";
 import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
 import EvaluateOverTime from "./EvaluateOverTime";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class ServerMonitorCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts

@@ -13,8 +13,10 @@ import ServerMonitorResponse, {
   ServerProcess,
 } from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse";
 import logger from "../../Logger";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class ServerMonitorCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/SyntheticMonitor.ts

@@ -1,9 +1,11 @@
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 import CompareCriteria from "./CompareCriteria";
 import CustomCodeMonitoringCriteria from "./CustomCodeMonitorCriteria";
 import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter";
 import SyntheticMonitorResponse from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitorResponse";
 
 export default class SyntheticMonitoringCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     monitorResponse: Array<SyntheticMonitorResponse>;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/Criteria/TraceMonitorCriteria.ts

@@ -1,9 +1,11 @@
 import TraceMonitorResponse from "../../../../Types/Monitor/TraceMonitor/TraceMonitorResponse";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
 import DataToProcess from "../DataToProcess";
 import CompareCriteria from "./CompareCriteria";
 import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter";
 
 export default class TraceMonitorCriteria {
+  @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
     dataToProcess: DataToProcess;
     criteriaFilter: CriteriaFilter;

package/Server/Utils/Monitor/MonitorAlert.ts

@@ -17,9 +17,11 @@ import AlertService from "../../Services/AlertService";
 import AlertSeverityService from "../../Services/AlertSeverityService";
 import AlertStateTimelineService from "../../Services/AlertStateTimelineService";
 import logger from "../Logger";
+import CaptureSpan from "../Telemetry/CaptureSpan";
 import DataToProcess from "./DataToProcess";
 
 export default class MonitorAlert {
+  @CaptureSpan()
   public static async checkOpenAlertsAndCloseIfResolved(input: {
     monitorId: ObjectID;
     autoResolveCriteriaInstanceIdAlertIdsDictionary: Dictionary<Array<string>>;
@@ -70,6 +72,7 @@ export default class MonitorAlert {
     return openAlerts;
   }
 
+  @CaptureSpan()
   public static async criteriaMetCreateAlertsAndUpdateMonitorStatus(input: {
     criteriaInstance: MonitorCriteriaInstance;
     monitor: Monitor;

package/Server/Utils/Monitor/MonitorIncident.ts

@@ -17,9 +17,11 @@ import IncidentService from "../../Services/IncidentService";
 import IncidentSeverityService from "../../Services/IncidentSeverityService";
 import IncidentStateTimelineService from "../../Services/IncidentStateTimelineService";
 import logger from "../Logger";
+import CaptureSpan from "../Telemetry/CaptureSpan";
 import DataToProcess from "./DataToProcess";
 
 export default class MonitorIncident {
+  @CaptureSpan()
   public static async checkOpenIncidentsAndCloseIfResolved(input: {
     monitorId: ObjectID;
     autoResolveCriteriaInstanceIdIncidentIdsDictionary: Dictionary<
@@ -73,6 +75,7 @@ export default class MonitorIncident {
     return openIncidents;
   }
 
+  @CaptureSpan()
   public static async criteriaMetCreateIncidentsAndUpdateMonitorStatus(input: {
     criteriaInstance: MonitorCriteriaInstance;
     monitor: Monitor;

package/Server/Utils/Monitor/MonitorResource.ts

@@ -54,8 +54,10 @@ import TelemetryUtil from "../Telemetry/Telemetry";
 import MetricMonitorCriteria from "./Criteria/MetricMonitorCriteria";
 import MetricMonitorResponse from "../../../Types/Monitor/MetricMonitor/MetricMonitorResponse";
 import FilterCondition from "../../../Types/Filter/FilterCondition";
+import CaptureSpan from "../Telemetry/CaptureSpan";
 
 export default class MonitorResourceUtil {
+  @CaptureSpan()
   public static async monitorResource(
     dataToProcess: DataToProcess,
   ): Promise<ProbeApiIngestResponse> {
@@ -595,6 +597,7 @@ export default class MonitorResourceUtil {
     return response;
   }
 
+  @CaptureSpan()
   public static async saveMonitorMetrics(data: {
     monitorId: ObjectID;
     projectId: ObjectID;

package/Server/Utils/Monitor/MonitorStatusTimeline.ts

@@ -7,9 +7,11 @@ import ObjectID from "../../../Types/ObjectID";
 import { TelemetryQuery } from "../../../Types/Telemetry/TelemetryQuery";
 import MonitorStatusTimelineService from "../../Services/MonitorStatusTimelineService";
 import logger from "../Logger";
+import CaptureSpan from "../Telemetry/CaptureSpan";
 import DataToProcess from "./DataToProcess";
 
 export default class MonitorStatusTimelineUtil {
+  @CaptureSpan()
   public static async updateMonitorStatusTimeline(input: {
     criteriaInstance: MonitorCriteriaInstance;
     monitor: Monitor;

package/Server/Utils/Realtime.ts

@@ -22,10 +22,12 @@ import EventName from "../../Types/Realtime/EventName";
 import CookieUtil from "./Cookie";
 import Dictionary from "../../Types/Dictionary";
 import UserPermissionUtil from "./UserPermission/UserPermission";
+import CaptureSpan from "./Telemetry/CaptureSpan";
 
 export default abstract class Realtime {
   private static socketServer: SocketServer | null = null;
 
+  @CaptureSpan()
   public static isInitialized(): boolean {
     logger.debug("Checking if socket server is initialized");
     const isInitialized: boolean = this.socketServer !== null;
@@ -33,6 +35,7 @@ export default abstract class Realtime {
     return isInitialized;
   }
 
+  @CaptureSpan()
   public static async init(): Promise<SocketServer | null> {
     if (!this.socketServer) {
       logger.debug("Initializing socket server");
@@ -76,6 +79,7 @@ export default abstract class Realtime {
     return this.socketServer;
   }
 
+  @CaptureSpan()
   public static async listenToModelEvent(
     socket: Socket,
     data: ListenToModelEventJSON,
@@ -204,6 +208,7 @@ export default abstract class Realtime {
     }
   }
 
+  @CaptureSpan()
   public static async stopListeningToModelEvent(
     socket: Socket,
     data: ListenToModelEventJSON,
@@ -228,6 +233,7 @@ export default abstract class Realtime {
     await socket.leave(roomId);
   }
 
+  @CaptureSpan()
   public static async emitModelEvent(data: {
     tenantId: string | ObjectID;
     eventType: ModelEventType;
@@ -275,6 +281,7 @@ export default abstract class Realtime {
     this.socketServer!.to(modelRoomId).emit(modelRoomId, jsonObject);
   }
 
+  @CaptureSpan()
   public static hasPermissionsByModelName(
     userProjectPermissions: UserTenantAccessPermission | Array<Permission>,
     modelName: string,
@@ -303,6 +310,7 @@ export default abstract class Realtime {
     );
   }
 
+  @CaptureSpan()
   public static getAccessTokenFromSocket(socket: Socket): string | undefined {
     let accessToken: string | undefined = undefined;
 

package/Server/Utils/Response.ts

@@ -23,8 +23,10 @@ import { JSONArray, JSONObject } from "Common/Types/JSON";
 import ListData from "Common/Types/ListData";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import Route from "../../Types/API/Route";
+import CaptureSpan from "./Telemetry/CaptureSpan";
 
 export default class Response {
+  @CaptureSpan()
   public static sendEmptySuccessResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -34,6 +36,7 @@ export default class Response {
     oneUptimeResponse.status(200).send({} as EmptyResponse);
   }
 
+  @CaptureSpan()
   public static sendFileByPath(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -42,6 +45,7 @@ export default class Response {
     res.sendFile(path);
   }
 
+  @CaptureSpan()
   public static sendCustomResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -60,6 +64,7 @@ export default class Response {
     oneUptimeResponse.status(statusCode).send(body);
   }
 
+  @CaptureSpan()
   public static async sendFileResponse(
     _req: ExpressRequest | ExpressRequest,
     res: ExpressResponse,
@@ -78,6 +83,7 @@ export default class Response {
     oneUptimeResponse.send(file.file);
   }
 
+  @CaptureSpan()
   public static render(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -89,6 +95,7 @@ export default class Response {
     oneUptimeResponse.render(path, vars);
   }
 
+  @CaptureSpan()
   public static sendErrorResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -105,6 +112,7 @@ export default class Response {
     oneUptimeResponse.status(status).send({ message });
   }
 
+  @CaptureSpan()
   public static sendEntityArrayResponse(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -137,6 +145,7 @@ export default class Response {
     return this.sendJsonArrayResponse(req, res, jsonArray, count);
   }
 
+  @CaptureSpan()
   public static sendEntityResponse(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -168,6 +177,7 @@ export default class Response {
     return this.sendJsonObjectResponse(req, res, response);
   }
 
+  @CaptureSpan()
   public static redirect(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -176,6 +186,7 @@ export default class Response {
     return res.redirect(to.toString());
   }
 
+  @CaptureSpan()
   public static sendJsonArrayResponse(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -227,6 +238,7 @@ export default class Response {
     }
   }
 
+  @CaptureSpan()
   public static sendJsonObjectResponse(
     req: ExpressRequest,
     res: ExpressResponse,
@@ -251,6 +263,7 @@ export default class Response {
       .send(item);
   }
 
+  @CaptureSpan()
   public static sendTextResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -262,6 +275,7 @@ export default class Response {
     oneUptimeResponse.status(200).send(text);
   }
 
+  @CaptureSpan()
   public static sendHtmlResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -274,6 +288,7 @@ export default class Response {
     oneUptimeResponse.end(html);
   }
 
+  @CaptureSpan()
   public static sendMarkdownResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -282,6 +297,7 @@ export default class Response {
     return Response.sendHtmlResponse(_req, res, html);
   }
 
+  @CaptureSpan()
   public static sendXmlResponse(
     _req: ExpressRequest,
     res: ExpressResponse,
@@ -294,6 +310,7 @@ export default class Response {
     oneUptimeResponse.end(xml);
   }
 
+  @CaptureSpan()
   public static sendJavaScriptResponse(
     _req: ExpressRequest,
     res: ExpressResponse,

package/Server/Utils/Stream.ts

@@ -1,7 +1,9 @@
 import { PromiseRejectErrorFunction } from "Common/Types/FunctionTypes";
 import { Stream } from "stream";
+import CaptureSpan from "./Telemetry/CaptureSpan";
 
 export default class StreamUtil {
+  @CaptureSpan()
   public static convertStreamToText(stream: Stream): Promise<string> {
     return new Promise<string>(
       (
@@ -27,6 +29,7 @@ export default class StreamUtil {
     );
   }
 
+  @CaptureSpan()
   public static async toStringArray(stream: Stream): Promise<Array<string>> {
     const text: string = await StreamUtil.convertStreamToText(stream);
     return text.split("\n");