@oneuptime/common 12.0.5 → 12.0.7

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

@@ -15,6 +15,14 @@ import LIMIT_MAX from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Model from "../../Models/DatabaseModels/MonitorStatus";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+/*
+ * Statically imported despite the MonitorService <-> MonitorStatusService
+ * cycle: both modules reference each other only from method bodies (never at
+ * module-init time), so the default binding is always resolved by the time
+ * these methods run. A dynamic import() cannot be used here - the App build's
+ * TypeScript module target rejects it (TS1323).
+ */
+import MonitorService from "./MonitorService";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -36,6 +44,16 @@ export class Service extends DatabaseService {
         if (!deleteBy.query._id && !deleteBy.props.isRoot) {
             throw new BadDataException("_id should be present when deleting Monitor Status. Please try the delete with objectId");
         }
+        /*
+         * Clear dangling currentMonitorStatusId references held by ALREADY
+         * soft-deleted monitors before the hard-delete runs. A soft-deleted
+         * monitor keeps its row and its currentMonitorStatusId foreign key
+         * (ON DELETE NO ACTION), so a status a since-deleted monitor last adopted
+         * cannot be removed while that reference lingers - the intermittent
+         * "Monitor records still reference it" failure. Live monitors are left
+         * untouched (see repointDeletedMonitorsAwayFromStatuses).
+         */
+        await this.clearDeletedMonitorReferences(deleteBy.query);
         let monitorStatus = null;
         if (!deleteBy.props.isRoot) {
             monitorStatus = await this.findOneBy({
@@ -54,6 +72,117 @@ export class Service extends DatabaseService {
             carryForward: monitorStatus,
         };
     }
+    /**
+     * Repoints soft-deleted monitors that still reference the statuses matched
+     * by `query` to each project's default (lowest-priority) operational status,
+     * falling back to any other remaining status when no operational status
+     * survives. This keeps the Monitor.currentMonitorStatusId foreign key from
+     * blocking a monitor-status delete on dead rows.
+     */
+    async clearDeletedMonitorReferences(query) {
+        const statusesBeingDeleted = await this.findBy({
+            query: query,
+            select: {
+                _id: true,
+                projectId: true,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        // Group the statuses being deleted by project.
+        const byProject = new Map();
+        for (const status of statusesBeingDeleted) {
+            if (!status.id || !status.projectId) {
+                continue;
+            }
+            const key = status.projectId.toString();
+            if (!byProject.has(key)) {
+                byProject.set(key, { projectId: status.projectId, statusIds: [] });
+            }
+            byProject.get(key).statusIds.push(status.id);
+        }
+        if (byProject.size === 0) {
+            return;
+        }
+        for (const { projectId, statusIds } of byProject.values()) {
+            const deletedSet = new Set(statusIds.map((id) => {
+                return id.toString();
+            }));
+            const fallbackStatusId = await this.findFallbackStatusId(projectId, deletedSet);
+            if (!fallbackStatusId) {
+                // Nothing valid to repoint to - leave the referential guard in place.
+                continue;
+            }
+            await MonitorService.repointDeletedMonitorsAwayFromStatuses({
+                fromMonitorStatusIds: statusIds,
+                toMonitorStatusId: fallbackStatusId,
+                projectId: projectId,
+            });
+        }
+    }
+    /**
+     * Picks the status a repointed monitor should fall back to: the project's
+     * default (lowest-priority) operational status that is not itself being
+     * deleted, or - if none survives - any other remaining status.
+     */
+    async findFallbackStatusId(projectId, deletedStatusIds) {
+        const operationalStatuses = await this.findBy({
+            query: {
+                projectId: projectId,
+                isOperationalState: true,
+            },
+            select: {
+                _id: true,
+            },
+            sort: {
+                priority: SortOrder.Ascending,
+                createdAt: SortOrder.Ascending,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        const operationalFallback = this.firstSurvivingId(operationalStatuses, deletedStatusIds);
+        if (operationalFallback) {
+            return operationalFallback;
+        }
+        // No operational status survives - repoint to any other remaining status.
+        const anyStatuses = await this.findBy({
+            query: {
+                projectId: projectId,
+            },
+            select: {
+                _id: true,
+            },
+            sort: {
+                priority: SortOrder.Ascending,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        return this.firstSurvivingId(anyStatuses, deletedStatusIds);
+    }
+    /**
+     * Returns the id of the first status in `statuses` (already priority-sorted)
+     * that is not in `deletedStatusIds`, or undefined when none survives.
+     */
+    firstSurvivingId(statuses, deletedStatusIds) {
+        for (const status of statuses) {
+            const id = status.id;
+            if (id && !deletedStatusIds.has(id.toString())) {
+                return id;
+            }
+        }
+        return undefined;
+    }
     async onDeleteSuccess(onDelete, _itemIdsBeforeDelete) {
         const deleteBy = onDelete.deleteBy;
         const monitorStatus = onDelete.carryForward;

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

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

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

@@ -34,6 +34,7 @@ import CloudResourceService from "./CloudResourceService";
 import RumApplicationService from "./RumApplicationService";
 import IoTFleetService from "./IoTFleetService";
 import GlobalCache from "../Infrastructure/GlobalCache";
+import InProcessMemo from "../Utils/InProcessMemo";
 import ColumnLength from "../../Types/Database/ColumnLength";
 import EntityType from "../../Types/Telemetry/EntityType";
 import { reconcileEntityRegistryThrottled } from "../Utils/Telemetry/EntityRegistry";
@@ -117,6 +118,33 @@ const SERVICE_RESOLUTION_CACHE_NAMESPACE = "service-resolution";
  */
 const SERVICE_RESOLUTION_CACHE_TTL_SECONDS = 5 * 60;
 const serviceResolutionInProcessCache = new Map();
+/*
+ * Per-process memo for `(entityType, entityId) -> retention override`,
+ * mirroring the service-resolution memo above but with no Redis layer —
+ * the lookup underneath is a single-row findOneById by primary key, so the
+ * only cost worth removing is the per-resource-block Postgres round trip,
+ * and a Redis GET would cost the same round trip it saves.
+ *
+ * This memo is what actually removes those round trips. The signal
+ * services' per-batch `serviceDictionary` cannot: all three populate it
+ * AFTER `resolveTelemetryResource` returns and never consult it before
+ * calling in, so every resource block of every batch reached this lookup
+ * uncached — for hostmetrics payloads that is one Postgres SELECT per
+ * ResourceMetrics entry per job, fleet-wide.
+ *
+ * Staleness: a user editing a resource's retention settings is picked up
+ * within the 60-second TTL, which is acceptable — retention is applied at
+ * row-stamp time, so a minute of new rows carrying the previous retention
+ * matches the lag the project-retention cache above already accepts (and
+ * that one tolerates five minutes). Bounded at 10k entries because entity
+ * ids arrive from collector-controlled payloads.
+ */
+const RESOURCE_RETENTION_MEMO_TTL_IN_MS = 60 * 1000;
+const RESOURCE_RETENTION_MEMO_MAX_ENTRIES = 10000;
+const resourceRetentionInProcessMemo = new InProcessMemo({
+    ttlInMs: RESOURCE_RETENTION_MEMO_TTL_IN_MS,
+    maxEntries: RESOURCE_RETENTION_MEMO_MAX_ENTRIES,
+});
 export default class OTelIngestService {
     /*
      * Read a single string-valued OTel resource attribute out of the raw
@@ -526,168 +554,36 @@ export default class OTelIngestService {
         };
     }
     /*
-     * Look up per-resource retention overrides for non-Service telemetry.
-     * One small SELECT per batch — the caller caches the resulting
-     * TelemetryServiceMetadata under `serviceDictionary[serviceName]`
-     * so steady-state ingest skips this lookup after the first row.
+     * Look up per-resource retention overrides for non-Service telemetry,
+     * memoized per (entityType, entityId) for 60 seconds.
+     *
+     * The memo lives HERE, in the callee, because no caller caches this. An
+     * earlier comment claimed the signal services cache the resulting
+     * TelemetryServiceMetadata under `serviceDictionary[serviceName]` — they
+     * do store it there, but only AFTER `resolveTelemetryResource` has
+     * already run, and none of the three (logs / traces / metrics) reads the
+     * dictionary before calling in. Every resource block therefore reached
+     * this lookup uncached: one Postgres findOneById per ResourceMetrics /
+     * ResourceLogs / ResourceSpans entry per job. A retention edit made in
+     * the UI propagates to newly stamped rows within the memo TTL (60s),
+     * which is acceptable — see the memo declaration for the full staleness
+     * rationale.
+     *
+     * Lookup errors are NOT memoized: a transient Postgres failure falls
+     * back to "no override" for this call only, and the next resource block
+     * retries — the same per-call fallback behaviour as before the memo.
      */
     static async getResourceRetention(resourceId, primaryEntityType) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+        const memoKey = `${primaryEntityType}:${resourceId.toString()}`;
+        // L1: in-process memo. Zero network cost.
+        const memoedRetention = resourceRetentionInProcessMemo.get(memoKey);
+        if (memoedRetention) {
+            return memoedRetention;
+        }
         try {
-            if (primaryEntityType === ServiceType.Host) {
-                const host = await HostService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_a = host === null || host === void 0 ? void 0 : host.retainTelemetryDataForDays) !== null && _a !== void 0 ? _a : null,
-                    telemetryRetentionConfig: (_b = host === null || host === void 0 ? void 0 : host.telemetryRetentionConfig) !== null && _b !== void 0 ? _b : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.DockerHost) {
-                const dockerHost = await DockerHostService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_c = dockerHost === null || dockerHost === void 0 ? void 0 : dockerHost.retainTelemetryDataForDays) !== null && _c !== void 0 ? _c : null,
-                    telemetryRetentionConfig: (_d = dockerHost === null || dockerHost === void 0 ? void 0 : dockerHost.telemetryRetentionConfig) !== null && _d !== void 0 ? _d : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.PodmanHost) {
-                const podmanHost = await PodmanHostService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_e = podmanHost === null || podmanHost === void 0 ? void 0 : podmanHost.retainTelemetryDataForDays) !== null && _e !== void 0 ? _e : null,
-                    telemetryRetentionConfig: (_f = podmanHost === null || podmanHost === void 0 ? void 0 : podmanHost.telemetryRetentionConfig) !== null && _f !== void 0 ? _f : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.KubernetesCluster) {
-                const cluster = await KubernetesClusterService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_g = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _g !== void 0 ? _g : null,
-                    telemetryRetentionConfig: (_h = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _h !== void 0 ? _h : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.ProxmoxCluster) {
-                const cluster = await ProxmoxClusterService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_j = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _j !== void 0 ? _j : null,
-                    telemetryRetentionConfig: (_k = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _k !== void 0 ? _k : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.IoTDevice) {
-                const fleet = await IoTFleetService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_l = fleet === null || fleet === void 0 ? void 0 : fleet.retainTelemetryDataForDays) !== null && _l !== void 0 ? _l : null,
-                    telemetryRetentionConfig: (_m = fleet === null || fleet === void 0 ? void 0 : fleet.telemetryRetentionConfig) !== null && _m !== void 0 ? _m : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.CephCluster) {
-                const cluster = await CephClusterService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_o = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _o !== void 0 ? _o : null,
-                    telemetryRetentionConfig: (_p = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _p !== void 0 ? _p : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.DockerSwarmCluster) {
-                const cluster = await DockerSwarmClusterService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_q = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _q !== void 0 ? _q : null,
-                    telemetryRetentionConfig: (_r = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _r !== void 0 ? _r : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.ServerlessFunction) {
-                const serverlessFunction = await ServerlessFunctionService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_s = serverlessFunction === null || serverlessFunction === void 0 ? void 0 : serverlessFunction.retainTelemetryDataForDays) !== null && _s !== void 0 ? _s : null,
-                    telemetryRetentionConfig: (_t = serverlessFunction === null || serverlessFunction === void 0 ? void 0 : serverlessFunction.telemetryRetentionConfig) !== null && _t !== void 0 ? _t : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.CloudResource) {
-                const cloudResource = await CloudResourceService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_u = cloudResource === null || cloudResource === void 0 ? void 0 : cloudResource.retainTelemetryDataForDays) !== null && _u !== void 0 ? _u : null,
-                    telemetryRetentionConfig: (_v = cloudResource === null || cloudResource === void 0 ? void 0 : cloudResource.telemetryRetentionConfig) !== null && _v !== void 0 ? _v : null,
-                };
-            }
-            if (primaryEntityType === ServiceType.RealUserMonitor) {
-                const rumApplication = await RumApplicationService.findOneById({
-                    id: resourceId,
-                    select: {
-                        retainTelemetryDataForDays: true,
-                        telemetryRetentionConfig: true,
-                    },
-                    props: { isRoot: true },
-                });
-                return {
-                    retainTelemetryDataForDays: (_w = rumApplication === null || rumApplication === void 0 ? void 0 : rumApplication.retainTelemetryDataForDays) !== null && _w !== void 0 ? _w : null,
-                    telemetryRetentionConfig: (_x = rumApplication === null || rumApplication === void 0 ? void 0 : rumApplication.telemetryRetentionConfig) !== null && _x !== void 0 ? _x : null,
-                };
-            }
+            const retention = await this.findResourceRetention(resourceId, primaryEntityType);
+            resourceRetentionInProcessMemo.set(memoKey, retention);
+            return retention;
         }
         catch (err) {
             logger.warn(`Per-resource retention lookup failed for ${primaryEntityType} ${resourceId.toString()}: ${err instanceof Error ? err.message : String(err)}`);
@@ -697,6 +593,173 @@ export default class OTelIngestService {
             telemetryRetentionConfig: null,
         };
     }
+    /*
+     * The uncached per-entity-type lookup underneath getResourceRetention.
+     * Entity types that carry no retention override (Monitor, Unknown) fall
+     * through to the "no override" default — that result is memoized too,
+     * since re-deriving it is what the memo exists to avoid.
+     */
+    static async findResourceRetention(resourceId, primaryEntityType) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+        if (primaryEntityType === ServiceType.Host) {
+            const host = await HostService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_a = host === null || host === void 0 ? void 0 : host.retainTelemetryDataForDays) !== null && _a !== void 0 ? _a : null,
+                telemetryRetentionConfig: (_b = host === null || host === void 0 ? void 0 : host.telemetryRetentionConfig) !== null && _b !== void 0 ? _b : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.DockerHost) {
+            const dockerHost = await DockerHostService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_c = dockerHost === null || dockerHost === void 0 ? void 0 : dockerHost.retainTelemetryDataForDays) !== null && _c !== void 0 ? _c : null,
+                telemetryRetentionConfig: (_d = dockerHost === null || dockerHost === void 0 ? void 0 : dockerHost.telemetryRetentionConfig) !== null && _d !== void 0 ? _d : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.PodmanHost) {
+            const podmanHost = await PodmanHostService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_e = podmanHost === null || podmanHost === void 0 ? void 0 : podmanHost.retainTelemetryDataForDays) !== null && _e !== void 0 ? _e : null,
+                telemetryRetentionConfig: (_f = podmanHost === null || podmanHost === void 0 ? void 0 : podmanHost.telemetryRetentionConfig) !== null && _f !== void 0 ? _f : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.KubernetesCluster) {
+            const cluster = await KubernetesClusterService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_g = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _g !== void 0 ? _g : null,
+                telemetryRetentionConfig: (_h = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _h !== void 0 ? _h : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.ProxmoxCluster) {
+            const cluster = await ProxmoxClusterService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_j = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _j !== void 0 ? _j : null,
+                telemetryRetentionConfig: (_k = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _k !== void 0 ? _k : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.IoTDevice) {
+            const fleet = await IoTFleetService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_l = fleet === null || fleet === void 0 ? void 0 : fleet.retainTelemetryDataForDays) !== null && _l !== void 0 ? _l : null,
+                telemetryRetentionConfig: (_m = fleet === null || fleet === void 0 ? void 0 : fleet.telemetryRetentionConfig) !== null && _m !== void 0 ? _m : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.CephCluster) {
+            const cluster = await CephClusterService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_o = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _o !== void 0 ? _o : null,
+                telemetryRetentionConfig: (_p = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _p !== void 0 ? _p : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.DockerSwarmCluster) {
+            const cluster = await DockerSwarmClusterService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_q = cluster === null || cluster === void 0 ? void 0 : cluster.retainTelemetryDataForDays) !== null && _q !== void 0 ? _q : null,
+                telemetryRetentionConfig: (_r = cluster === null || cluster === void 0 ? void 0 : cluster.telemetryRetentionConfig) !== null && _r !== void 0 ? _r : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.ServerlessFunction) {
+            const serverlessFunction = await ServerlessFunctionService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_s = serverlessFunction === null || serverlessFunction === void 0 ? void 0 : serverlessFunction.retainTelemetryDataForDays) !== null && _s !== void 0 ? _s : null,
+                telemetryRetentionConfig: (_t = serverlessFunction === null || serverlessFunction === void 0 ? void 0 : serverlessFunction.telemetryRetentionConfig) !== null && _t !== void 0 ? _t : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.CloudResource) {
+            const cloudResource = await CloudResourceService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_u = cloudResource === null || cloudResource === void 0 ? void 0 : cloudResource.retainTelemetryDataForDays) !== null && _u !== void 0 ? _u : null,
+                telemetryRetentionConfig: (_v = cloudResource === null || cloudResource === void 0 ? void 0 : cloudResource.telemetryRetentionConfig) !== null && _v !== void 0 ? _v : null,
+            };
+        }
+        if (primaryEntityType === ServiceType.RealUserMonitor) {
+            const rumApplication = await RumApplicationService.findOneById({
+                id: resourceId,
+                select: {
+                    retainTelemetryDataForDays: true,
+                    telemetryRetentionConfig: true,
+                },
+                props: { isRoot: true },
+            });
+            return {
+                retainTelemetryDataForDays: (_w = rumApplication === null || rumApplication === void 0 ? void 0 : rumApplication.retainTelemetryDataForDays) !== null && _w !== void 0 ? _w : null,
+                telemetryRetentionConfig: (_x = rumApplication === null || rumApplication === void 0 ? void 0 : rumApplication.telemetryRetentionConfig) !== null && _x !== void 0 ? _x : null,
+            };
+        }
+        return {
+            retainTelemetryDataForDays: null,
+            telemetryRetentionConfig: null,
+        };
+    }
     static getMetricFromDatapoint(data) {
         const { dbMetric, datapoint, aggregationTemporality, isMonotonic } = data;
         const newDbMetric = Metric.fromJSON(dbMetric.toJSON(), Metric);