@oneuptime/common 8.0.5440 → 8.0.5466

package/build/dist/Server/Services/TelemetryUsageBillingService.js

@@ -8,16 +8,23 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { MeteredPlanUtil } from "../Types/Billing/MeteredPlan/AllMeteredPlans";
-import QueryHelper from "../Types/Database/QueryHelper";
 import DatabaseService from "./DatabaseService";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
-import LIMIT_MAX from "../../Types/Database/LimitMax";
+import LIMIT_MAX, { LIMIT_INFINITY } from "../../Types/Database/LimitMax";
 import OneUptimeDate from "../../Types/Date";
 import Decimal from "../../Types/Decimal";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ProductType from "../../Types/MeteredPlan/ProductType";
-import Model from "../../Models/DatabaseModels/TelemetryUsageBilling";
-import { IsBillingEnabled } from "../EnvironmentConfig";
+import Model, { DEFAULT_RETENTION_IN_DAYS, } from "../../Models/DatabaseModels/TelemetryUsageBilling";
+import TelemetryServiceService from "./TelemetryServiceService";
+import SpanService from "./SpanService";
+import LogService from "./LogService";
+import MetricService from "./MetricService";
+import ExceptionInstanceService from "./ExceptionInstanceService";
+import AnalyticsQueryHelper from "../Types/AnalyticsDatabase/QueryHelper";
+import DiskSize from "../../Types/DiskSize";
+import logger from "../Utils/Logger";
+import { AverageSpanRowSizeInBytes, AverageLogRowSizeInBytes, AverageMetricRowSizeInBytes, AverageExceptionRowSizeInBytes, IsBillingEnabled, } from "../EnvironmentConfig";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class Service extends DatabaseService {
     constructor() {
@@ -32,7 +39,6 @@ export class Service extends DatabaseService {
                 projectId: data.projectId,
                 productType: data.productType,
                 isReportedToBillingProvider: false,
-                createdAt: QueryHelper.lessThan(OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), -1)), // we need to get everything that's not today.
             },
             skip: 0,
             limit: LIMIT_MAX, /// because a project can have MANY telemetry services.
@@ -45,6 +51,164 @@ export class Service extends DatabaseService {
             },
         });
     }
+    async stageTelemetryUsageForProject(data) {
+        var _a;
+        if (!IsBillingEnabled) {
+            return;
+        }
+        const usageDate = data.usageDate
+            ? OneUptimeDate.fromString(data.usageDate)
+            : OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), -1);
+        const averageRowSizeInBytes = this.getAverageRowSizeForProduct(data.productType);
+        const averageExceptionRowSizeInBytes = this.getAverageExceptionRowSize();
+        if (data.productType !== ProductType.Traces && averageRowSizeInBytes <= 0) {
+            return;
+        }
+        if (data.productType === ProductType.Traces &&
+            averageRowSizeInBytes <= 0 &&
+            averageExceptionRowSizeInBytes <= 0) {
+            return;
+        }
+        const usageDayString = OneUptimeDate.getDateString(usageDate);
+        const startOfDay = OneUptimeDate.getStartOfDay(usageDate);
+        const endOfDay = OneUptimeDate.getEndOfDay(usageDate);
+        const telemetryServices = await TelemetryServiceService.findBy({
+            query: {
+                projectId: data.projectId,
+            },
+            select: {
+                _id: true,
+                retainTelemetryDataForDays: true,
+            },
+            skip: 0,
+            limit: LIMIT_MAX,
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!telemetryServices || telemetryServices.length === 0) {
+            return;
+        }
+        for (const telemetryService of telemetryServices) {
+            if (!(telemetryService === null || telemetryService === void 0 ? void 0 : telemetryService.id)) {
+                continue;
+            }
+            const existingEntry = await this.findOneBy({
+                query: {
+                    projectId: data.projectId,
+                    productType: data.productType,
+                    telemetryServiceId: telemetryService.id,
+                    day: usageDayString,
+                },
+                select: {
+                    _id: true,
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+            if (existingEntry) {
+                continue;
+            }
+            let estimatedBytes = 0;
+            try {
+                if (data.productType === ProductType.Traces) {
+                    const spanCount = await SpanService.countBy({
+                        query: {
+                            projectId: data.projectId,
+                            serviceId: telemetryService.id,
+                            startTime: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
+                        },
+                        skip: 0,
+                        limit: LIMIT_INFINITY,
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                    const exceptionCount = await ExceptionInstanceService.countBy({
+                        query: {
+                            projectId: data.projectId,
+                            serviceId: telemetryService.id,
+                            time: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
+                        },
+                        skip: 0,
+                        limit: LIMIT_INFINITY,
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                    const totalSpanCount = spanCount.toNumber();
+                    const totalExceptionCount = exceptionCount.toNumber();
+                    if (totalSpanCount <= 0 && totalExceptionCount <= 0) {
+                        continue;
+                    }
+                    estimatedBytes =
+                        totalSpanCount * averageRowSizeInBytes +
+                            totalExceptionCount * averageExceptionRowSizeInBytes;
+                }
+                else if (data.productType === ProductType.Logs) {
+                    const count = await LogService.countBy({
+                        query: {
+                            projectId: data.projectId,
+                            serviceId: telemetryService.id,
+                            time: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
+                        },
+                        skip: 0,
+                        limit: LIMIT_INFINITY,
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                    const totalRowCount = count.toNumber();
+                    if (totalRowCount <= 0) {
+                        continue;
+                    }
+                    estimatedBytes = totalRowCount * averageRowSizeInBytes;
+                }
+                else if (data.productType === ProductType.Metrics) {
+                    const count = await MetricService.countBy({
+                        query: {
+                            projectId: data.projectId,
+                            serviceId: telemetryService.id,
+                            time: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
+                        },
+                        skip: 0,
+                        limit: LIMIT_INFINITY,
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                    const totalRowCount = count.toNumber();
+                    if (totalRowCount <= 0) {
+                        continue;
+                    }
+                    estimatedBytes = totalRowCount * averageRowSizeInBytes;
+                }
+            }
+            catch (error) {
+                logger.error(`Failed to compute telemetry usage for service ${(_a = telemetryService.id) === null || _a === void 0 ? void 0 : _a.toString()}:`);
+                logger.error(error);
+                continue;
+            }
+            if (estimatedBytes <= 0) {
+                continue;
+            }
+            const estimatedGigabytes = DiskSize.byteSizeToGB(estimatedBytes);
+            if (!Number.isFinite(estimatedGigabytes) || estimatedGigabytes <= 0) {
+                continue;
+            }
+            const dataRetentionInDays = telemetryService.retainTelemetryDataForDays ||
+                DEFAULT_RETENTION_IN_DAYS;
+            await this.updateUsageBilling({
+                projectId: data.projectId,
+                productType: data.productType,
+                telemetryServiceId: telemetryService.id,
+                dataIngestedInGB: estimatedGigabytes,
+                retentionInDays: dataRetentionInDays,
+                usageDate: usageDate,
+            });
+        }
+    }
     async updateUsageBilling(data) {
         var _a, _b;
         if (data.productType !== ProductType.Traces &&
@@ -53,6 +217,10 @@ export class Service extends DatabaseService {
             throw new BadDataException("This product type is not a telemetry product type.");
         }
         const serverMeteredPlan = MeteredPlanUtil.getMeteredPlanByProductType(data.productType);
+        const usageDate = data.usageDate
+            ? OneUptimeDate.fromString(data.usageDate)
+            : OneUptimeDate.getCurrentDate();
+        const usageDayString = OneUptimeDate.getDateString(usageDate);
         const totalCostOfThisOperationInUSD = serverMeteredPlan.getTotalCostInUSD({
             dataIngestedInGB: data.dataIngestedInGB,
             retentionInDays: data.retentionInDays,
@@ -63,7 +231,7 @@ export class Service extends DatabaseService {
                 productType: data.productType,
                 telemetryServiceId: data.telemetryServiceId,
                 isReportedToBillingProvider: false,
-                createdAt: QueryHelper.inBetween(OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), -1), OneUptimeDate.getCurrentDate()),
+                day: usageDayString,
             },
             select: {
                 _id: true,
@@ -105,8 +273,8 @@ export class Service extends DatabaseService {
             usageBilling.telemetryServiceId = data.telemetryServiceId;
             usageBilling.retainTelemetryDataForDays = data.retentionInDays;
             usageBilling.isReportedToBillingProvider = false;
-            usageBilling.createdAt = OneUptimeDate.getCurrentDate();
-            usageBilling.day = OneUptimeDate.getDateString(OneUptimeDate.getCurrentDate());
+            usageBilling.createdAt = usageDate;
+            usageBilling.day = usageDayString;
             usageBilling.totalCostInUSD = new Decimal(totalCostOfThisOperationInUSD);
             await this.create({
                 data: usageBilling,
@@ -116,6 +284,35 @@ export class Service extends DatabaseService {
             });
         }
     }
+    getAverageRowSizeForProduct(productType) {
+        var _a;
+        const fallbackSize = 1024;
+        // Narrow to telemetry product types before indexing to satisfy TypeScript
+        if (productType !== ProductType.Traces &&
+            productType !== ProductType.Logs &&
+            productType !== ProductType.Metrics) {
+            return fallbackSize;
+        }
+        const value = (_a = {
+            [ProductType.Traces]: AverageSpanRowSizeInBytes,
+            [ProductType.Logs]: AverageLogRowSizeInBytes,
+            [ProductType.Metrics]: AverageMetricRowSizeInBytes,
+        }[productType]) !== null && _a !== void 0 ? _a : fallbackSize;
+        if (!Number.isFinite(value) || value <= 0) {
+            return fallbackSize;
+        }
+        return value;
+    }
+    getAverageExceptionRowSize() {
+        const fallbackSize = 1024;
+        if (!Number.isFinite(AverageExceptionRowSizeInBytes)) {
+            return fallbackSize;
+        }
+        if (AverageExceptionRowSizeInBytes <= 0) {
+            return fallbackSize;
+        }
+        return AverageExceptionRowSizeInBytes;
+    }
 }
 __decorate([
     CaptureSpan(),
@@ -123,6 +320,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "getUnreportedUsageBilling", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "stageTelemetryUsageForProject", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Services/TelemetryUsageBillingService.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryUsageBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryUsageBillingService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TelemetryUsageBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryUsageBillingService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.js

@@ -43,6 +43,10 @@ export default class TelemetryMeteredPlan extends ServerMeteredPlan {
     async reportQuantityToBillingProvider(projectId, options) {
         // get all unreported logs
         var _a;
+        await TelemetryUsageBillingService.stageTelemetryUsageForProject({
+            projectId: projectId,
+            productType: this.productType,
+        });
         const usageBillings = await TelemetryUsageBillingService.getUnreportedUsageBilling({
             projectId: projectId,
             productType: this.productType,

package/build/dist/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryMeteredPlan.js","sourceRoot":"","sources":["../../../../../../Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TelemetryMeteredPlan.js","sourceRoot":"","sources":["../../../../../../Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Telemetry/Telemetry.js

@@ -116,82 +116,106 @@ export default class TelemetryUtil {
         const { items } = data;
         let { prefixKeysWithString } = data;
         if (prefixKeysWithString) {
-            prefixKeysWithString = prefixKeysWithString + ".";
+            prefixKeysWithString = `${prefixKeysWithString}.`;
         }
-        let finalObj = {};
+        const finalObj = {};
         const attributes = items;
         if (!attributes) {
             return finalObj;
         }
         for (const attribute of attributes) {
-            if (attribute["key"] && typeof attribute["key"] === "string") {
-                const keyWithPrefix = `${prefixKeysWithString}${attribute["key"]}`;
-                const value = this.getAttributeValues(keyWithPrefix, attribute["value"]);
-                if (Array.isArray(value)) {
-                    finalObj = Object.assign(Object.assign({}, finalObj), { [keyWithPrefix]: value });
-                }
-                else if (typeof value === "object" && value !== null) {
-                    finalObj = Object.assign(Object.assign({}, finalObj), value);
-                }
-                else {
-                    finalObj[keyWithPrefix] = value;
+            if (!attribute["key"] || typeof attribute["key"] !== "string") {
+                continue;
+            }
+            const keyWithPrefix = `${prefixKeysWithString}${attribute["key"]}`;
+            const value = this.getAttributeValues(keyWithPrefix, attribute["value"]);
+            if (value === null) {
+                finalObj[keyWithPrefix] = null;
+                continue;
+            }
+            if (Array.isArray(value)) {
+                finalObj[keyWithPrefix] = value;
+                continue;
+            }
+            if (typeof value === "object") {
+                for (const [nestedKey, nestedValue] of Object.entries(value)) {
+                    finalObj[nestedKey] = nestedValue;
                 }
+                continue;
             }
+            finalObj[keyWithPrefix] = value;
         }
         return finalObj;
     }
     static getAttributeValues(prefixKeysWithString, value) {
-        var _a;
         let finalObj = null;
-        value = value;
-        if (value["stringValue"]) {
-            finalObj = value["stringValue"];
-        }
-        else if (value["intValue"]) {
-            finalObj = value["intValue"];
-        }
-        else if (value["doubleValue"]) {
-            finalObj = value["doubleValue"];
-        }
-        else if (value["boolValue"]) {
-            finalObj = value["boolValue"];
-        }
-        else if (value["arrayValue"] &&
-            value["arrayValue"]["values"]) {
-            const values = value["arrayValue"]["values"];
-            finalObj = values.map((v) => {
-                return this.getAttributeValues(prefixKeysWithString, v);
-            });
-        }
-        else if (value["mapValue"] &&
-            value["mapValue"]["fields"]) {
-            const fields = (_a = value["mapValue"]) === null || _a === void 0 ? void 0 : _a["fields"];
-            const flattenedFields = {};
-            for (const key in fields) {
-                const prefixKey = `${prefixKeysWithString}.${key}`;
-                const nestedValue = this.getAttributeValues(prefixKey, fields[key]);
-                if (typeof nestedValue === "object" && nestedValue !== null) {
-                    for (const nestedKey in nestedValue) {
-                        flattenedFields[`${prefixKey}.${nestedKey}`] = nestedValue[nestedKey];
-                    }
+        const jsonValue = value;
+        if (jsonValue && typeof jsonValue === "object") {
+            if (Object.prototype.hasOwnProperty.call(jsonValue, "stringValue")) {
+                const stringValue = jsonValue["stringValue"];
+                finalObj =
+                    stringValue !== undefined && stringValue !== null
+                        ? stringValue
+                        : "";
+            }
+            else if (Object.prototype.hasOwnProperty.call(jsonValue, "intValue")) {
+                const intValue = jsonValue["intValue"];
+                if (intValue !== undefined && intValue !== null) {
+                    finalObj = intValue;
                 }
-                else {
-                    flattenedFields[prefixKey] = nestedValue;
+            }
+            else if (Object.prototype.hasOwnProperty.call(jsonValue, "doubleValue")) {
+                const doubleValue = jsonValue["doubleValue"];
+                if (doubleValue !== undefined && doubleValue !== null) {
+                    finalObj = doubleValue;
                 }
             }
-            finalObj = flattenedFields;
-        }
-        // kvlistValue
-        else if (value["kvlistValue"] &&
-            value["kvlistValue"]["values"]) {
-            const values = value["kvlistValue"]["values"];
-            finalObj = this.getAttributes({
-                prefixKeysWithString,
-                items: values,
-            });
-        }
-        else if (value["nullValue"]) {
-            finalObj = null;
+            else if (Object.prototype.hasOwnProperty.call(jsonValue, "boolValue")) {
+                finalObj = jsonValue["boolValue"];
+            }
+            else if (jsonValue["arrayValue"] &&
+                jsonValue["arrayValue"]["values"]) {
+                const values = jsonValue["arrayValue"]["values"];
+                finalObj = values.map((v) => {
+                    return this.getAttributeValues(prefixKeysWithString, v);
+                });
+            }
+            else if (jsonValue["mapValue"] &&
+                jsonValue["mapValue"]["fields"]) {
+                const fields = jsonValue["mapValue"]["fields"];
+                const flattenedFields = {};
+                for (const key in fields) {
+                    const nestedPrefix = `${prefixKeysWithString}.${key}`;
+                    const nestedValue = this.getAttributeValues(nestedPrefix, fields[key]);
+                    if (nestedValue === null) {
+                        flattenedFields[nestedPrefix] = null;
+                        continue;
+                    }
+                    if (Array.isArray(nestedValue)) {
+                        flattenedFields[nestedPrefix] = nestedValue;
+                        continue;
+                    }
+                    if (typeof nestedValue === "object") {
+                        for (const [nestedKey, nestedEntry] of Object.entries(nestedValue)) {
+                            flattenedFields[nestedKey] = nestedEntry;
+                        }
+                        continue;
+                    }
+                    flattenedFields[nestedPrefix] = nestedValue;
+                }
+                finalObj = flattenedFields;
+            }
+            else if (jsonValue["kvlistValue"] &&
+                jsonValue["kvlistValue"]["values"]) {
+                const values = jsonValue["kvlistValue"]["values"];
+                finalObj = this.getAttributes({
+                    prefixKeysWithString,
+                    items: values,
+                });
+            }
+            else if ("nullValue" in jsonValue) {
+                finalObj = null;
+            }
         }
         return finalObj;
     }

package/build/dist/Server/Utils/Telemetry/Telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Telemetry.js","sourceRoot":"","sources":["../../../../../Server/Utils/Telemetry/Telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Telemetry.js","sourceRoot":"","sources":["../../../../../Server/Utils/Telemetry/Telemetry.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/VM/VMRunner.js

@@ -27,8 +27,8 @@ export default class VMRunner {
         }
         vm.createContext(sandbox); // Contextify the object.
         const script = `(async()=>{
-            ${code}
-        })()` || "";
+        ${code}
+      })()`;
         const returnVal = await vm.runInContext(script, sandbox, {
             timeout: options.timeout || 5000,
         }); // run the script

package/build/dist/Server/Utils/VM/VMRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"VMRunner.js","sourceRoot":"","sources":["../../../../../Server/Utils/VM/VMRunner.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAe,MAAM,SAAS,CAAC;AACtC,OAAO,WAAW,MAAM,0BAA0B,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEP,AAAb,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAOpC;QACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAE/B,MAAM,WAAW,GAAa,EAAE,CAAC;QAEjC,IAAI,OAAO,mBACT,OAAO,EAAE;gBACP,GAAG,EAAE,CAAC,GAAG,IAAiB,EAAE,EAAE;oBAC5B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnC,CAAC;aACF,EACD,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,IACrB,OAAO,CAAC,OAAO,CACnB,CAAC;QAEF,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,mCACF,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,IAAI,GACnB,CAAC;QACJ,CAAC;QAED,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB;QAEpD,MAAM,MAAM,GACV;cACQ,IAAI;aACL,IAAI,EAAE,CAAC;QAEhB,MAAM,SAAS,GAAQ,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE;YAC5D,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC,CAAC,CAAC,CAAC,iBAAiB;QAErB,OAAO;YACL,WAAW,EAAE,SAAS;YACtB,WAAW;SACZ,CAAC;IACJ,CAAC;CACF;AAnDqB;IADnB,WAAW,EAAE;;;;sCAmDb"}
+{"version":3,"file":"VMRunner.js","sourceRoot":"","sources":["../../../../../Server/Utils/VM/VMRunner.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAe,MAAM,SAAS,CAAC;AACtC,OAAO,WAAW,MAAM,0BAA0B,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEP,AAAb,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAOpC;QACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAE/B,MAAM,WAAW,GAAa,EAAE,CAAC;QAEjC,IAAI,OAAO,mBACT,OAAO,EAAE;gBACP,GAAG,EAAE,CAAC,GAAG,IAAiB,EAAE,EAAE;oBAC5B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnC,CAAC;aACF,EACD,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,IACrB,OAAO,CAAC,OAAO,CACnB,CAAC;QAEF,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,mCACF,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,IAAI,GACnB,CAAC;QACJ,CAAC;QAED,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB;QAEpD,MAAM,MAAM,GAAW;UACjB,IAAI;WACH,CAAC;QAER,MAAM,SAAS,GAAQ,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE;YAC5D,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC,CAAC,CAAC,CAAC,iBAAiB;QAErB,OAAO;YACL,WAAW,EAAE,SAAS;YACtB,WAAW;SACZ,CAAC;IACJ,CAAC;CACF;AAlDqB;IADnB,WAAW,EAAE;;;;sCAkDb"}

package/build/dist/Types/Date.js

@@ -1007,5 +1007,9 @@ export default class OneUptimeDate {
         date = this.fromString(date);
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
     }
+    static toClickhouseDateTime(date) {
+        const parsedDate = this.fromString(date);
+        return moment(parsedDate).utc().format("YYYY-MM-DD HH:mm:ss");
+    }
 }
 //# sourceMappingURL=Date.js.map