@oneuptime/common 10.8.2 → 11.0.1

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

@@ -0,0 +1,201 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/TelemetryEntity";
+import OneUptimeDate from "../../Types/Date";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import logger from "../Utils/Logger";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import { getEntityBudget, reconcileByNaturalKey, REGISTRY_PROMOTED_TYPES, shouldWarnEntityBudgetOnce, } from "../Utils/Telemetry/EntityRegistry";
+export class TelemetryEntityService extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+    /**
+     * Forward-only registry reconciliation: upsert a catalog row per
+     * discovered entity, bump `lastSeenAt`, merge descriptive attributes
+     * (last-writer-wins) and union labels. High-churn membership-only
+     * types (container / process / service.instance / telemetry.sdk — see
+     * `REGISTRY_PROMOTED_TYPES`) are skipped: their keys still flow into
+     * the `entityKeys` column on signals, they just never mint registry
+     * rows. New rows are additionally gated by a per-(project, type)
+     * entity budget. Resilient by design — a registry failure must never break
+     * signal ingest, so every error is swallowed (logged). Callers are
+     * expected to throttle this (it should not run on every batch); see
+     * `reconcileEntityRegistryThrottled` in
+     * `Common/Server/Utils/Telemetry/EntityRegistry`.
+     */
+    async reconcileEntities(data) {
+        /*
+         * Per-reconcile budget count cache: at most one countBy per entity
+         * type per reconcile (the fence already throttles reconciles to one
+         * per entity-set per window, so this stays cheap). Creates within
+         * this reconcile increment the cached count so a single batch cannot
+         * blow past the budget.
+         */
+        const countByType = new Map();
+        for (const entity of data.entities) {
+            if (!REGISTRY_PROMOTED_TYPES.has(entity.entityType)) {
+                continue;
+            }
+            try {
+                await this.upsertEntity({
+                    projectId: data.projectId,
+                    entity,
+                    countByType,
+                });
+            }
+            catch (err) {
+                logger.error(`TelemetryEntityService: failed to upsert entity ${entity.entityType}/${entity.entityKey}:`);
+                logger.error(err);
+            }
+        }
+    }
+    async upsertEntity(data) {
+        const { projectId, entity, countByType } = data;
+        const now = OneUptimeDate.getCurrentDate();
+        await reconcileByNaturalKey({
+            service: this,
+            query: {
+                projectId,
+                entityType: entity.entityType,
+                entityKey: entity.entityKey,
+            },
+            lastSeenAt: now,
+            describe: `entity ${entity.entityType}/${entity.entityKey}`,
+            select: { descriptiveAttributes: true, labels: true },
+            buildUpdate: (existing) => {
+                return TelemetryEntityService.buildDescriptiveUpdate(entity, existing);
+            },
+            /*
+             * Entity budget (doc §Edge Cases): existing rows always get their
+             * bump above; only NEW rows are gated. Counted via the
+             * (projectId, entityType) index; over budget the row is skipped —
+             * its key still flows in `entityKeys` on signals.
+             */
+            beforeCreate: async () => {
+                const budget = getEntityBudget(entity.entityType);
+                let count = countByType.get(entity.entityType);
+                if (count === undefined) {
+                    count = (await this.countBy({
+                        query: { projectId, entityType: entity.entityType },
+                        props: { isRoot: true },
+                    })).toNumber();
+                    countByType.set(entity.entityType, count);
+                }
+                if (count < budget) {
+                    countByType.set(entity.entityType, count + 1);
+                    return true;
+                }
+                if (await shouldWarnEntityBudgetOnce({
+                    projectId,
+                    entityType: entity.entityType,
+                })) {
+                    logger.warn(`TelemetryEntityService: entity budget reached for project ${projectId.toString()} type ${entity.entityType} (${count} >= ${budget}); skipping new registry rows. Membership keys still flow on signals.`);
+                }
+                return false;
+            },
+            buildModel: () => {
+                const model = new Model();
+                model.projectId = projectId;
+                model.entityType = entity.entityType;
+                model.entityKey = entity.entityKey;
+                model.identifyingAttributes = entity.identifyingAttributes;
+                if (entity.descriptiveAttributes &&
+                    Object.keys(entity.descriptiveAttributes).length > 0) {
+                    model.descriptiveAttributes = entity.descriptiveAttributes;
+                }
+                if (entity.labels && entity.labels.length > 0) {
+                    model.labels = TelemetryEntityService.normalizeLabels(entity.labels);
+                }
+                // varchar(ShortText) column; k8s names can run to 253 chars.
+                model.displayName = TelemetryEntityService.deriveDisplayName(entity).substring(0, ColumnLength.ShortText);
+                model.firstSeenAt = now;
+                model.lastSeenAt = now;
+                return model;
+            },
+        });
+    }
+    /**
+     * Extra fields for the `lastSeenAt` bump on an existing row:
+     * descriptive attributes merge last-writer-wins per key, labels merge
+     * as a set union. Both are written ONLY when the merge actually changes
+     * the stored value, so a stable resource keeps its bump a one-column
+     * update (no jsonb churn).
+     */
+    static buildDescriptiveUpdate(entity, existing) {
+        /*
+         * Built as a plain shape and cast once on return: assigning into
+         * QueryDeepPartialEntity<Model> directly forces TS to instantiate the
+         * recursive JSONObject mapping (TS2589).
+         */
+        const update = {};
+        const incoming = entity.descriptiveAttributes || {};
+        if (Object.keys(incoming).length > 0) {
+            const current = existing.descriptiveAttributes || {};
+            const differs = Object.keys(incoming).some((key) => {
+                return current[key] !== incoming[key];
+            });
+            if (differs) {
+                update.descriptiveAttributes = Object.assign(Object.assign({}, current), incoming);
+            }
+        }
+        const incomingLabels = entity.labels || [];
+        if (incomingLabels.length > 0) {
+            const currentLabels = existing.labels || [];
+            const currentSet = new Set(currentLabels);
+            const hasNew = incomingLabels.some((label) => {
+                return !currentSet.has(label);
+            });
+            if (hasNew) {
+                update.labels = TelemetryEntityService.normalizeLabels([
+                    ...currentLabels,
+                    ...incomingLabels,
+                ]);
+            }
+        }
+        return update;
+    }
+    /** Sorted + deduped for a stable stored value. */
+    static normalizeLabels(labels) {
+        return Array.from(new Set(labels)).sort();
+    }
+    /**
+     * Best-effort human-readable name for the entity explorer: prefer the
+     * most specific `*.name` identifying attribute (e.g. k8s.pod.name over
+     * k8s.cluster.name), else the last identifying value, else the key.
+     */
+    static deriveDisplayName(entity) {
+        const id = entity.identifyingAttributes || {};
+        const nameKeys = Object.keys(id)
+            .filter((k) => {
+            return k.endsWith(".name");
+        })
+            .sort((a, b) => {
+            return b.length - a.length;
+        });
+        if (nameKeys.length > 0 && id[nameKeys[0]]) {
+            return id[nameKeys[0]];
+        }
+        const keys = Object.keys(id);
+        if (keys.length > 0 && id[keys[keys.length - 1]]) {
+            return id[keys[keys.length - 1]];
+        }
+        return entity.entityKey;
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], TelemetryEntityService.prototype, "reconcileEntities", null);
+export default new TelemetryEntityService();
+//# sourceMappingURL=TelemetryEntityService.js.map

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

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

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

@@ -34,7 +34,7 @@ export class Service extends DatabaseService {
                 projectId: true,
                 message: true,
                 stackTrace: true,
-                serviceId: true,
+                primaryEntityId: true,
                 exceptionType: true,
             },
             props,
@@ -123,9 +123,9 @@ export class Service extends DatabaseService {
             lastSeenAt: true,
             firstSeenAt: true,
             environment: true,
-            // serviceId is polymorphic; the client resolves it per serviceType.
-            serviceId: true,
-            serviceType: true,
+            // primaryEntityId is polymorphic; the client resolves it per primaryEntityType.
+            primaryEntityId: true,
+            primaryEntityType: true,
         };
         const [unresolvedCount, resolvedCount, archivedCount, topExceptions, recentExceptions, serviceSummaries,] = await Promise.all([
             this.countBy({
@@ -203,8 +203,8 @@ export class Service extends DatabaseService {
             isArchived: false,
         }, null, props);
         const rows = (await this.getQueryBuilder("TelemetryException")
-            .select(`"TelemetryException"."serviceId"`, "serviceId")
-            .addSelect(`"TelemetryException"."serviceType"`, "serviceType")
+            .select(`"TelemetryException"."primaryEntityId"`, "primaryEntityId")
+            .addSelect(`"TelemetryException"."primaryEntityType"`, "primaryEntityType")
             .addSelect(`COUNT(*)`, "unresolvedCount")
             .addSelect(`COALESCE(SUM("TelemetryException"."occuranceCount"), 0)`, "totalOccurrences")
             .where(`"TelemetryException"."projectId" = :projectId`, {
@@ -213,30 +213,30 @@ export class Service extends DatabaseService {
             .andWhere(`"TelemetryException"."isResolved" = false`)
             .andWhere(`"TelemetryException"."isArchived" = false`)
             .andWhere(`"TelemetryException"."deletedAt" IS NULL`)
-            .andWhere(`"TelemetryException"."serviceId" IS NOT NULL`)
-            .groupBy(`"TelemetryException"."serviceId"`)
-            .addGroupBy(`"TelemetryException"."serviceType"`)
+            .andWhere(`"TelemetryException"."primaryEntityId" IS NOT NULL`)
+            .groupBy(`"TelemetryException"."primaryEntityId"`)
+            .addGroupBy(`"TelemetryException"."primaryEntityType"`)
             .orderBy(`"unresolvedCount"`, "DESC")
             .getRawMany());
         if (rows.length === 0) {
             return [];
         }
         /*
-         * serviceId is polymorphic — do NOT resolve it to a Service here. The
-         * old code looked each serviceId up in the Service table and dropped
+         * primaryEntityId is polymorphic — do NOT resolve it to a Service here. The
+         * old code looked each primaryEntityId up in the Service table and dropped
          * any that didn't match, which silently excluded Host / DockerHost /
          * KubernetesCluster and unattributed (Unknown) telemetry. Return the
-         * raw (serviceId, serviceType) + counts; the client resolves the
-         * display name per serviceType.
+         * raw (primaryEntityId, primaryEntityType) + counts; the client resolves the
+         * display name per primaryEntityType.
          */
         const summaries = [];
         for (const row of rows) {
-            if (!row.serviceId) {
+            if (!row.primaryEntityId) {
                 continue;
             }
             summaries.push({
-                serviceId: row.serviceId,
-                serviceType: (_a = row.serviceType) !== null && _a !== void 0 ? _a : null,
+                primaryEntityId: row.primaryEntityId,
+                primaryEntityType: (_a = row.primaryEntityType) !== null && _a !== void 0 ? _a : null,
                 unresolvedCount: parseInt(row.unresolvedCount, 10) || 0,
                 totalOccurrences: parseInt(row.totalOccurrences || "0", 10) || 0,
             });
@@ -255,8 +255,8 @@ export class Service extends DatabaseService {
         if (telemetryException.message) {
             metadata.errorMessage = telemetryException.message;
         }
-        if (telemetryException.serviceId) {
-            metadata.serviceId = telemetryException.serviceId.toString();
+        if (telemetryException.primaryEntityId) {
+            metadata.serviceId = telemetryException.primaryEntityId.toString();
         }
         return metadata;
     }

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

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

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

@@ -93,16 +93,16 @@ export class Service extends DatabaseService {
                 const bytes = row.estimatedBytes > 0
                     ? row.estimatedBytes
                     : row.rowCount * fallbackRowSizeInBytes;
-                const existing = usageByServiceId.get(row.serviceId);
+                const existing = usageByServiceId.get(row.primaryEntityId);
                 if (existing) {
                     existing.bytes += bytes;
-                    if (!existing.serviceType && row.serviceType) {
-                        existing.serviceType = row.serviceType;
+                    if (!existing.primaryEntityType && row.primaryEntityType) {
+                        existing.primaryEntityType = row.primaryEntityType;
                     }
                 }
                 else {
-                    usageByServiceId.set(row.serviceId, {
-                        serviceType: row.serviceType,
+                    usageByServiceId.set(row.primaryEntityId, {
+                        primaryEntityType: row.primaryEntityType,
                         bytes,
                     });
                 }
@@ -157,7 +157,13 @@ export class Service extends DatabaseService {
         catch (error) {
             logger.error(`Failed to aggregate telemetry usage for project ${data.projectId.toString()} (${data.productType}):`);
             logger.error(error);
-            return;
+            /*
+             * Rethrow so the failure is loud: nothing has been staged for this
+             * day yet (staging below is skipped entirely), so a later retry of
+             * the cron can re-stage the full day. Swallowing here would
+             * silently bill the day as zero.
+             */
+            throw error;
         }
         if (usageByServiceId.size === 0) {
             return;
@@ -173,7 +179,7 @@ export class Service extends DatabaseService {
         /*
          * Skip serviceIds already staged for this day so re-runs of the cron
          * don't double-count (updateUsageBilling accumulates into the day's
-         * row). One query instead of a findOneBy per serviceId.
+         * row). One query instead of a findOneBy per primaryEntityId.
          */
         const alreadyStaged = await this.findBy({
             query: {
@@ -182,7 +188,7 @@ export class Service extends DatabaseService {
                 day: usageDayString,
             },
             select: {
-                serviceId: true,
+                primaryEntityId: true,
             },
             skip: 0,
             limit: LIMIT_MAX,
@@ -193,7 +199,7 @@ export class Service extends DatabaseService {
         const stagedServiceIds = new Set(alreadyStaged
             .map((row) => {
             var _a;
-            return (_a = row.serviceId) === null || _a === void 0 ? void 0 : _a.toString();
+            return (_a = row.primaryEntityId) === null || _a === void 0 ? void 0 : _a.toString();
         })
             .filter((id) => {
             return Boolean(id);
@@ -204,9 +210,9 @@ export class Service extends DatabaseService {
              * Alert/Incident telemetry is OneUptime's own operational data —
              * neither is charged as ingested telemetry volume.
              */
-            if (usage.serviceType === ServiceType.Monitor ||
-                usage.serviceType === ServiceType.Alert ||
-                usage.serviceType === ServiceType.Incident) {
+            if (usage.primaryEntityType === ServiceType.Monitor ||
+                usage.primaryEntityType === ServiceType.Alert ||
+                usage.primaryEntityType === ServiceType.Incident) {
                 continue;
             }
             if (stagedServiceIds.has(serviceIdStr)) {
@@ -218,16 +224,16 @@ export class Service extends DatabaseService {
             }
             const retentionInDays = (_a = retentionByServiceId.get(serviceIdStr)) !== null && _a !== void 0 ? _a : projectDefaultRetentionInDays;
             /*
-             * Legacy rows (pre-discriminator) and any null serviceType are
-             * treated as OpenTelemetry — historically every billed serviceId was
+             * Legacy rows (pre-discriminator) and any null primaryEntityType are
+             * treated as OpenTelemetry — historically every billed primaryEntityId was
              * a real Service.
              */
-            const serviceType = (_b = usage.serviceType) !== null && _b !== void 0 ? _b : ServiceType.OpenTelemetry;
+            const primaryEntityType = (_b = usage.primaryEntityType) !== null && _b !== void 0 ? _b : ServiceType.OpenTelemetry;
             await this.updateUsageBilling({
                 projectId: data.projectId,
                 productType: data.productType,
-                serviceId: new ObjectID(serviceIdStr),
-                serviceType: serviceType,
+                primaryEntityId: new ObjectID(serviceIdStr),
+                primaryEntityType: primaryEntityType,
                 dataIngestedInGB: estimatedGigabytes,
                 retentionInDays: retentionInDays,
                 usageDate: usageDate,
@@ -322,7 +328,7 @@ export class Service extends DatabaseService {
             query: {
                 projectId: data.projectId,
                 productType: data.productType,
-                serviceId: data.serviceId,
+                primaryEntityId: data.primaryEntityId,
                 isReportedToBillingProvider: false,
                 day: usageDayString,
             },
@@ -363,9 +369,9 @@ export class Service extends DatabaseService {
             usageBilling.projectId = data.projectId;
             usageBilling.productType = data.productType;
             usageBilling.dataIngestedInGB = new Decimal(data.dataIngestedInGB);
-            usageBilling.serviceId = data.serviceId;
-            if (data.serviceType) {
-                usageBilling.serviceType = data.serviceType;
+            usageBilling.primaryEntityId = data.primaryEntityId;
+            if (data.primaryEntityType) {
+                usageBilling.primaryEntityType = data.primaryEntityType;
             }
             usageBilling.retainTelemetryDataForDays = data.retentionInDays;
             usageBilling.isReportedToBillingProvider = false;

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

@@ -1 +1 @@
-{"version":3,"file":"TelemetryUsageBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryUsageBillingService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAE/E,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,SAAS,MAAM,+BAA+B,CAAC;AACtD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,WAAW,MAAM,qCAAqC,CAAC;AAC9D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,EAAE,EACZ,yBAAyB,GAC1B,MAAM,mDAAmD,CAAC;AAC3D,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAIlE,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,2BAA2B,EAC3B,8BAA8B,EAC9B,4BAA4B,EAC5B,kCAAkC,EAClC,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,yBAAyB,CAAC,IAGtC;QACC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;YACvB,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,2BAA2B,EAAE,KAAK;aACnC;YACD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS,EAAE,uDAAuD;YACzE,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,cAAc,EAAE,IAAI;aACrB;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAGY,AAAN,KAAK,CAAC,6BAA6B,CAAC,IAI1C;;QACC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAS,IAAI,CAAC,SAAS;YACpC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;YAC1C,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpE,MAAM,qBAAqB,GAAW,IAAI,CAAC,2BAA2B,CACpE,IAAI,CAAC,WAAW,CACjB,CAAC;QACF,MAAM,8BAA8B,GAClC,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAEpC,MAAM,kCAAkC,GACtC,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAExC,IACE,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,MAAM;YACvC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,QAAQ;YACzC,qBAAqB,IAAI,CAAC,EAC1B,CAAC;YACD,OAAO;QACT,CAAC;QAED,IACE,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,MAAM;YACvC,qBAAqB,IAAI,CAAC;YAC1B,8BAA8B,IAAI,CAAC,EACnC,CAAC;YACD,OAAO;QACT,CAAC;QAED,IACE,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,QAAQ;YACzC,qBAAqB,IAAI,CAAC;YAC1B,kCAAkC,IAAI,CAAC,EACvC,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAW,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,UAAU,GAAS,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAS,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAgB5D,MAAM,gBAAgB,GAA8B,IAAI,GAAG,EAAE,CAAC;QAE9D,MAAM,QAAQ,GAQF,CACV,IAKE,EACF,sBAA8B,EACxB,EAAE;YACR,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,KAAK,GACT,GAAG,CAAC,cAAc,GAAG,CAAC;oBACpB,CAAC,CAAC,GAAG,CAAC,cAAc;oBACpB,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,sBAAsB,CAAC;gBAC5C,MAAM,QAAQ,GAA6B,gBAAgB,CAAC,GAAG,CAC7D,GAAG,CAAC,SAAS,CACd,CAAC;gBACF,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC;oBACxB,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;wBAC7C,QAAQ,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;oBACzC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE;wBAClC,WAAW,EAAE,GAAG,CAAC,WAAW;wBAC5B,KAAK;qBACN,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;gBAC5C,QAAQ,CACN,MAAM,WAAW,CAAC,4BAA4B,CAAC;oBAC7C,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,mBAAmB,EAAE,WAAW;oBAChC,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,QAAQ;iBAClB,CAAC,EACF,qBAAqB,CACtB,CAAC;gBACF,QAAQ,CACN,MAAM,wBAAwB,CAAC,4BAA4B,CAAC;oBAC1D,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,mBAAmB,EAAE,MAAM;oBAC3B,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,QAAQ;iBAClB,CAAC,EACF,8BAA8B,CAC/B,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;gBACjD,QAAQ,CACN,MAAM,UAAU,CAAC,4BAA4B,CAAC;oBAC5C,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,mBAAmB,EAAE,MAAM;oBAC3B,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,QAAQ;iBAClB,CAAC,EACF,qBAAqB,CACtB,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;gBACpD,QAAQ,CACN,MAAM,aAAa,CAAC,4BAA4B,CAAC;oBAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,mBAAmB,EAAE,MAAM;oBAC3B,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,QAAQ;iBAClB,CAAC,EACF,qBAAqB,CACtB,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACrD,QAAQ,CACN,MAAM,cAAc,CAAC,4BAA4B,CAAC;oBAChD,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,mBAAmB,EAAE,WAAW;oBAChC,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,QAAQ;iBAClB,CAAC,EACF,qBAAqB,CACtB,CAAC;gBACF,QAAQ,CACN,MAAM,oBAAoB,CAAC,4BAA4B,CAAC;oBACtD,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,mBAAmB,EAAE,MAAM;oBAC3B,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,QAAQ;iBAClB,CAAC,EACF,kCAAkC,CACnC,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,mDAAmD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,WAAW,IAAI,CACtG,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED;;;;;WAKG;QACH,MAAM,oBAAoB,GACxB,MAAM,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,MAAM,6BAA6B,GACjC,MAAM,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9D;;;;WAIG;QACH,MAAM,aAAa,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;YACpD,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,GAAG,EAAE,cAAc;aACpB;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,IAAI;aAChB;YACD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAgB,IAAI,GAAG,CAC3C,aAAa;aACV,GAAG,CAAC,CAAC,GAAU,EAAE,EAAE;;YAClB,OAAO,MAAA,GAAG,CAAC,SAAS,0CAAE,QAAQ,EAAE,CAAC;QACnC,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,EAAsB,EAAgB,EAAE;YAC/C,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC,CACL,CAAC;QAEF,KAAK,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,gBAAgB,EAAE,CAAC;YACrD;;;;eAIG;YACH,IACE,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,OAAO;gBACzC,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,KAAK;gBACvC,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,QAAQ,EAC1C,CAAC;gBACD,SAAS;YACX,CAAC;YAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvC,SAAS;YACX,CAAC;YAED,MAAM,kBAAkB,GAAW,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,IAAI,CAAC,EAAE,CAAC;gBACpE,SAAS;YACX,CAAC;YAED,MAAM,eAAe,GACnB,MAAA,oBAAoB,CAAC,GAAG,CAAC,YAAY,CAAC,mCAAI,6BAA6B,CAAC;YAE1E;;;;eAIG;YACH,MAAM,WAAW,GACf,MAAC,KAAK,CAAC,WAAkC,mCAAI,WAAW,CAAC,aAAa,CAAC;YAEzE,MAAM,IAAI,CAAC,kBAAkB,CAAC;gBAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,SAAS,EAAE,IAAI,QAAQ,CAAC,YAAY,CAAC;gBACrC,WAAW,EAAE,WAAW;gBACxB,gBAAgB,EAAE,kBAAkB;gBACpC,eAAe,EAAE,eAAe;gBAChC,SAAS,EAAE,SAAS;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IAEW,AAAN,KAAK,CAAC,0BAA0B,CACtC,SAAmB;QAEnB,MAAM,oBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;QAE5D,MAAM,QAAQ,GAAwB,MAAM,cAAc,CAAC,MAAM,CAAC;YAChE,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;YAC/B,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE;YACvD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAC;QACH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,0BAA0B,EAAE,CAAC;gBACrD,oBAAoB,CAAC,GAAG,CACtB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,EACrB,OAAO,CAAC,0BAA0B,CACnC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAgB,MAAM,WAAW,CAAC,MAAM,CAAC;YAClD,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;YAC/B,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE;YACvD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAC;QACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,0BAA0B,EAAE,CAAC;gBAC/C,oBAAoB,CAAC,GAAG,CACtB,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAClB,IAAI,CAAC,0BAA0B,CAChC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GAAsB,MAAM,iBAAiB,CAAC,MAAM,CAAC;YACpE,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;YAC/B,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE;YACvD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAC;QACH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,UAAU,CAAC,EAAE,IAAI,UAAU,CAAC,0BAA0B,EAAE,CAAC;gBAC3D,oBAAoB,CAAC,GAAG,CACtB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,EACxB,UAAU,CAAC,0BAA0B,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GACZ,MAAM,wBAAwB,CAAC,MAAM,CAAC;YACpC,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;YAC/B,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE;YACvD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAC;QACL,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,0BAA0B,EAAE,CAAC;gBACrD,oBAAoB,CAAC,GAAG,CACtB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,EACrB,OAAO,CAAC,0BAA0B,CACnC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAGa,AAAN,KAAK,CAAC,gCAAgC,CAC5C,SAAmB;QAEnB,MAAM,OAAO,GAAmB,MAAM,cAAc,CAAC,WAAW,CAAC;YAC/D,EAAE,EAAE,SAAS;YACb,MAAM,EAAE,EAAE,+BAA+B,EAAE,IAAI,EAAE;YACjD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAC;QACH,OAAO,CACL,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,+BAA+B,KAAI,yBAAyB,CACtE,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,kBAAkB,CAAC,IAQ/B;;QACC,IACE,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,MAAM;YACvC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,OAAO;YACxC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,IAAI;YACrC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,QAAQ,EACzC,CAAC;YACD,MAAM,IAAI,gBAAgB,CACxB,oDAAoD,CACrD,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GACrB,eAAe,CAAC,2BAA2B,CACzC,IAAI,CAAC,WAAW,CACO,CAAC;QAE5B,MAAM,SAAS,GAAS,IAAI,CAAC,SAAS;YACpC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;YAC1C,CAAC,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QAEnC,MAAM,cAAc,GAAW,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEtE,MAAM,6BAA6B,GACjC,iBAAiB,CAAC,iBAAiB,CAAC;YAClC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAC;QAEL,MAAM,YAAY,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YACtD,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,2BAA2B,EAAE,KAAK;gBAClC,GAAG,EAAE,cAAc;aACpB;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,IAAI;aACrB;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,IAAI,EAAE;gBACJ,SAAS,EAAE,SAAS,CAAC,UAAU;aAChC;SACF,CAAC,CAAC;QAEH,IAAI,YAAY,IAAI,YAAY,CAAC,EAAE,EAAE,CAAC;YACpC,IAAI,cAAc,GAAW,CAAA,MAAA,YAAY,CAAC,cAAc,0CAAE,KAAK,KAAI,CAAC,CAAC;YAErE,IACE,KAAK,CAAC,cAAc,CAAC;gBACrB,cAAc,KAAK,SAAS;gBAC5B,cAAc,KAAK,IAAI;gBACvB,CAAC,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,KAAK,KAAK,CAAC,EAChE,CAAC;gBACD,cAAc,GAAG,CAAC,CAAC;YACrB,CAAC;YAED,MAAM,IAAI,CAAC,aAAa,CAAC;gBACvB,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,IAAI,EAAE;oBACJ,gBAAgB,EAAE,IAAI,OAAO,CAC3B,CAAC,CAAA,MAAA,YAAY,CAAC,gBAAgB,0CAAE,KAAK,KAAI,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CACpE;oBACD,cAAc,EAAE,IAAI,OAAO,CACzB,cAAc,GAAG,6BAA6B,CAC/C;oBACD,0BAA0B,EAAE,IAAI,CAAC,eAAe;iBACjD;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAU,IAAI,KAAK,EAAE,CAAC;YACxC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACxC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC5C,YAAY,CAAC,gBAAgB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACnE,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACxC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC9C,CAAC;YACD,YAAY,CAAC,0BAA0B,GAAG,IAAI,CAAC,eAAe,CAAC;YAC/D,YAAY,CAAC,2BAA2B,GAAG,KAAK,CAAC;YACjD,YAAY,CAAC,SAAS,GAAG,SAAS,CAAC;YAEnC,YAAY,CAAC,GAAG,GAAG,cAAc,CAAC;YAElC,YAAY,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAAC;YAEzE,MAAM,IAAI,CAAC,MAAM,CAAC;gBAChB,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,2BAA2B,CAAC,WAAwB;;QAC1D,MAAM,YAAY,GAAW,IAAI,CAAC;QAElC,0EAA0E;QAC1E,IACE,WAAW,KAAK,WAAW,CAAC,MAAM;YAClC,WAAW,KAAK,WAAW,CAAC,IAAI;YAChC,WAAW,KAAK,WAAW,CAAC,OAAO;YACnC,WAAW,KAAK,WAAW,CAAC,QAAQ,EACpC,CAAC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,KAAK,GACT,MAAA;YACE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,yBAAyB;YAC/C,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,wBAAwB;YAC5C,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,2BAA2B;YAClD,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4BAA4B;SACrD,CAAC,WAAW,CAAC,mCAAI,YAAY,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YAC1C,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,0BAA0B;QAChC,MAAM,YAAY,GAAW,IAAI,CAAC;QAElC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;YACrD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,IAAI,8BAA8B,IAAI,CAAC,EAAE,CAAC;YACxC,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,OAAO,8BAA8B,CAAC;IACxC,CAAC;IAEO,8BAA8B;QACpC,MAAM,YAAY,GAAW,GAAG,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,EAAE,CAAC;YACzD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,IAAI,kCAAkC,IAAI,CAAC,EAAE,CAAC;YAC5C,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,OAAO,kCAAkC,CAAC;IAC5C,CAAC;CACF;AAriBc;IADZ,WAAW,EAAE;;;;wDAqBb;AAGY;IADZ,WAAW,EAAE;;;;4DAuQb;AAUa;IADb,WAAW,EAAE;;qCAED,QAAQ;;yDAsEpB;AAGa;IADb,WAAW,EAAE;;qCAED,QAAQ;;+DAUpB;AAGY;IADZ,WAAW,EAAE;;;;iDA8Gb;AA2DH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"TelemetryUsageBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryUsageBillingService.ts"],"names":[],"mappings":"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"}