@oneuptime/common 10.7.2 → 10.8.1

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

@@ -0,0 +1,299 @@
+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/ServerlessFunction";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import ObjectID from "../../Types/ObjectID";
+import QueryHelper from "../Types/Database/QueryHelper";
+import OneUptimeDate from "../../Types/Date";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import GlobalCache from "../Infrastructure/GlobalCache";
+import logger from "../Utils/Logger";
+import crypto from "crypto";
+import ServerlessFunctionLabelRuleEngineService from "./ServerlessFunctionLabelRuleEngineService";
+import ServerlessFunctionOwnerRuleEngineService from "./ServerlessFunctionOwnerRuleEngineService";
+const LAST_SEEN_CACHE_NAMESPACE = "serverless-function-last-seen";
+const LAST_SEEN_THROTTLE_SECONDS = 60;
+const LABELS_APPLIED_CACHE_NAMESPACE = "serverless-function-labels-applied";
+const LABELS_APPLIED_CACHE_TTL_SECONDS = 60;
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+    }
+    async onCreateSuccess(_onCreate, createdItem) {
+        if (createdItem.projectId && createdItem.id) {
+            Promise.resolve()
+                .then(async () => {
+                await ServerlessFunctionLabelRuleEngineService.applyRulesToServerlessFunction(createdItem);
+            })
+                .then(async () => {
+                await ServerlessFunctionOwnerRuleEngineService.applyRulesToServerlessFunction(createdItem);
+            })
+                .catch((error) => {
+                var _a, _b;
+                logger.error(`Error applying serverless function rules in ServerlessFunctionService.onCreateSuccess: ${error}`, {
+                    projectId: (_a = createdItem.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+                    serverlessFunctionId: (_b = createdItem.id) === null || _b === void 0 ? void 0 : _b.toString(),
+                });
+            });
+        }
+        return createdItem;
+    }
+    async findOrCreateByFunctionIdentifier(data) {
+        /*
+         * Look up case-insensitively. The unique guard on name/functionIdentifier
+         * (checkUniqueColumnBy -> findWithSameText) compares case-insensitively,
+         * so a case-sensitive lookup would miss an existing row on casing drift
+         * (faas.name), then fail to create it ("ServerlessFunction with the same
+         * name already exists") and wedge ingest. We keep the stored casing as-is
+         * so it stays in sync with the raw-cased resource.faas.name attribute the
+         * detail page filters on.
+         */
+        const existingFunction = await this.findOneBy({
+            query: {
+                projectId: data.projectId,
+                functionIdentifier: QueryHelper.findWithSameText(data.functionIdentifier),
+            },
+            select: {
+                _id: true,
+                projectId: true,
+                functionIdentifier: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (existingFunction) {
+            return existingFunction;
+        }
+        try {
+            const newFunction = new Model();
+            newFunction.projectId = data.projectId;
+            newFunction.name = data.functionIdentifier;
+            newFunction.functionIdentifier = data.functionIdentifier;
+            newFunction.otelCollectorStatus = "connected";
+            newFunction.lastSeenAt = OneUptimeDate.getCurrentDate();
+            const createdFunction = await this.create({
+                data: newFunction,
+                props: {
+                    isRoot: true,
+                },
+            });
+            return createdFunction;
+        }
+        catch (_a) {
+            /*
+             * Race condition: another request created the function concurrently.
+             * Re-fetch the existing row.
+             */
+            const reFetchedFunction = await this.findOneBy({
+                query: {
+                    projectId: data.projectId,
+                    functionIdentifier: QueryHelper.findWithSameText(data.functionIdentifier),
+                },
+                select: {
+                    _id: true,
+                    projectId: true,
+                    functionIdentifier: true,
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+            if (reFetchedFunction) {
+                return reFetchedFunction;
+            }
+            throw new Error("Failed to create or find serverless function: " +
+                data.functionIdentifier);
+        }
+    }
+    async updateLastSeen(serverlessFunctionId, extra) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const cacheKey = serverlessFunctionId.toString();
+        const extrasFingerprint = crypto
+            .createHash("sha1")
+            .update(JSON.stringify({
+            agentVersion: (_a = extra === null || extra === void 0 ? void 0 : extra.agentVersion) !== null && _a !== void 0 ? _a : null,
+            cloudPlatform: (_b = extra === null || extra === void 0 ? void 0 : extra.cloudPlatform) !== null && _b !== void 0 ? _b : null,
+            cloudProvider: (_c = extra === null || extra === void 0 ? void 0 : extra.cloudProvider) !== null && _c !== void 0 ? _c : null,
+            cloudRegion: (_d = extra === null || extra === void 0 ? void 0 : extra.cloudRegion) !== null && _d !== void 0 ? _d : null,
+            cloudAccountId: (_e = extra === null || extra === void 0 ? void 0 : extra.cloudAccountId) !== null && _e !== void 0 ? _e : null,
+            functionVersion: (_f = extra === null || extra === void 0 ? void 0 : extra.functionVersion) !== null && _f !== void 0 ? _f : null,
+            runtimeName: (_g = extra === null || extra === void 0 ? void 0 : extra.runtimeName) !== null && _g !== void 0 ? _g : null,
+            runtimeVersion: (_h = extra === null || extra === void 0 ? void 0 : extra.runtimeVersion) !== null && _h !== void 0 ? _h : null,
+        }))
+            .digest("hex");
+        const cached = await GlobalCache.getString(LAST_SEEN_CACHE_NAMESPACE, cacheKey);
+        if (cached === extrasFingerprint) {
+            return; // same data was written recently
+        }
+        await GlobalCache.setString(LAST_SEEN_CACHE_NAMESPACE, cacheKey, extrasFingerprint, { expiresInSeconds: LAST_SEEN_THROTTLE_SECONDS });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const data = {
+            lastSeenAt: OneUptimeDate.getCurrentDate(),
+            otelCollectorStatus: "connected",
+        };
+        if (extra === null || extra === void 0 ? void 0 : extra.agentVersion) {
+            data.agentVersion = extra.agentVersion;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudPlatform) {
+            data.cloudPlatform = extra.cloudPlatform;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudProvider) {
+            data.cloudProvider = extra.cloudProvider;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudRegion) {
+            data.cloudRegion = extra.cloudRegion;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudAccountId) {
+            data.cloudAccountId = extra.cloudAccountId;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.functionVersion) {
+            data.functionVersion = extra.functionVersion;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.runtimeName) {
+            data.runtimeName = extra.runtimeName;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.runtimeVersion) {
+            data.runtimeVersion = extra.runtimeVersion;
+        }
+        await this.updateOneById({
+            id: serverlessFunctionId,
+            data: data,
+            props: {
+                isRoot: true,
+            },
+        });
+    }
+    /**
+     * Additively attach labels to a serverless function. Existing labels are
+     * never removed — manual labels set via the UI survive ingest. The set of
+     * labelIds is fingerprinted and cached for 60s so steady-state ingest with
+     * an unchanged label set costs one in-memory lookup.
+     */
+    async attachLabels(data) {
+        var _a;
+        if (!data.labelIds || data.labelIds.length === 0) {
+            return;
+        }
+        const cacheKey = data.serverlessFunctionId.toString();
+        const fingerprint = fingerprintLabelIds(data.labelIds);
+        const cached = await GlobalCache.getString(LABELS_APPLIED_CACHE_NAMESPACE, cacheKey);
+        if (cached === fingerprint) {
+            return;
+        }
+        try {
+            const functionIdStr = data.serverlessFunctionId.toString();
+            const existingLabels = await this.getRepository()
+                .createQueryBuilder()
+                .relation(Model, "labels")
+                .of(functionIdStr)
+                .loadMany();
+            const existingIds = new Set();
+            for (const lbl of existingLabels) {
+                const idStr = (_a = lbl._id) === null || _a === void 0 ? void 0 : _a.toString();
+                if (idStr) {
+                    existingIds.add(idStr);
+                }
+            }
+            const toAddIds = [];
+            const seen = new Set();
+            for (const id of data.labelIds) {
+                const idStr = id.toString();
+                if (existingIds.has(idStr) || seen.has(idStr)) {
+                    continue;
+                }
+                seen.add(idStr);
+                toAddIds.push(idStr);
+            }
+            if (toAddIds.length > 0) {
+                await this.getRepository()
+                    .createQueryBuilder()
+                    .relation(Model, "labels")
+                    .of(functionIdStr)
+                    .add(toAddIds);
+            }
+            await GlobalCache.setString(LABELS_APPLIED_CACHE_NAMESPACE, cacheKey, fingerprint, { expiresInSeconds: LABELS_APPLIED_CACHE_TTL_SECONDS });
+        }
+        catch (err) {
+            logger.warn(`ServerlessFunctionService.attachLabels failed for function ${data.serverlessFunctionId.toString()}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    async markDisconnectedFunctions() {
+        const fiveMinutesAgo = OneUptimeDate.addRemoveMinutes(OneUptimeDate.getCurrentDate(), -5);
+        const connectedFunctions = await this.findBy({
+            query: {
+                otelCollectorStatus: "connected",
+                lastSeenAt: QueryHelper.lessThan(fiveMinutesAgo),
+            },
+            select: {
+                _id: true,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        for (const serverlessFunction of connectedFunctions) {
+            if (serverlessFunction._id) {
+                await this.updateOneById({
+                    id: new ObjectID(serverlessFunction._id.toString()),
+                    data: {
+                        otelCollectorStatus: "disconnected",
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                });
+            }
+        }
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Model]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onCreateSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "findOrCreateByFunctionIdentifier", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [ObjectID, Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "updateLastSeen", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "attachLabels", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "markDisconnectedFunctions", null);
+function fingerprintLabelIds(labelIds) {
+    const sorted = labelIds
+        .map((id) => {
+        return id.toString();
+    })
+        .sort();
+    return crypto.createHash("sha1").update(sorted.join(",")).digest("hex");
+}
+export default new Service();
+//# sourceMappingURL=ServerlessFunctionService.js.map

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

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

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

@@ -97,25 +97,81 @@ export class Service extends DatabaseService {
      * re-resolves the same serviceId) costs one in-memory cache lookup
      * per batch instead of a DB write.
      */
-    async updateLastSeen(serviceId) {
+    async updateLastSeen(serviceId, extra) {
+        /*
+         * Throttle keyed on a fingerprint of the metadata so the steady-state
+         * firehose (the same serviceId re-resolved every batch) costs one
+         * in-memory cache lookup, but a changed attribute (e.g. a new
+         * service.version after a deploy) busts the cache and writes
+         * immediately. With no extras the fingerprint is constant, preserving
+         * the original "refresh lastSeenAt at most once per window" behaviour.
+         */
         const cacheKey = serviceId.toString();
+        const fingerprint = this.fingerprintLastSeenExtras(extra);
         const cached = await GlobalCache.getString(LAST_SEEN_CACHE_NAMESPACE, cacheKey);
-        if (cached) {
+        if (cached === fingerprint) {
             return;
         }
-        await GlobalCache.setString(LAST_SEEN_CACHE_NAMESPACE, cacheKey, "1", {
+        await GlobalCache.setString(LAST_SEEN_CACHE_NAMESPACE, cacheKey, fingerprint, {
             expiresInSeconds: LAST_SEEN_THROTTLE_SECONDS,
         });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const data = {
+            lastSeenAt: OneUptimeDate.getCurrentDate(),
+        };
+        if (extra === null || extra === void 0 ? void 0 : extra.serviceVersion) {
+            data.serviceVersion = extra.serviceVersion;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.deploymentEnvironment) {
+            data.deploymentEnvironment = extra.deploymentEnvironment;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.serviceNamespace) {
+            data.serviceNamespace = extra.serviceNamespace;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.runtimeName) {
+            data.runtimeName = extra.runtimeName;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.runtimeVersion) {
+            data.runtimeVersion = extra.runtimeVersion;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudProvider) {
+            data.cloudProvider = extra.cloudProvider;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudPlatform) {
+            data.cloudPlatform = extra.cloudPlatform;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudRegion) {
+            data.cloudRegion = extra.cloudRegion;
+        }
+        if (extra === null || extra === void 0 ? void 0 : extra.cloudAccountId) {
+            data.cloudAccountId = extra.cloudAccountId;
+        }
         await this.updateOneById({
             id: serviceId,
-            data: {
-                lastSeenAt: OneUptimeDate.getCurrentDate(),
-            },
+            data: data,
             props: {
                 isRoot: true,
             },
         });
     }
+    fingerprintLastSeenExtras(extra) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const normalized = {
+            serviceVersion: (_a = extra === null || extra === void 0 ? void 0 : extra.serviceVersion) !== null && _a !== void 0 ? _a : null,
+            deploymentEnvironment: (_b = extra === null || extra === void 0 ? void 0 : extra.deploymentEnvironment) !== null && _b !== void 0 ? _b : null,
+            serviceNamespace: (_c = extra === null || extra === void 0 ? void 0 : extra.serviceNamespace) !== null && _c !== void 0 ? _c : null,
+            runtimeName: (_d = extra === null || extra === void 0 ? void 0 : extra.runtimeName) !== null && _d !== void 0 ? _d : null,
+            runtimeVersion: (_e = extra === null || extra === void 0 ? void 0 : extra.runtimeVersion) !== null && _e !== void 0 ? _e : null,
+            cloudProvider: (_f = extra === null || extra === void 0 ? void 0 : extra.cloudProvider) !== null && _f !== void 0 ? _f : null,
+            cloudPlatform: (_g = extra === null || extra === void 0 ? void 0 : extra.cloudPlatform) !== null && _g !== void 0 ? _g : null,
+            cloudRegion: (_h = extra === null || extra === void 0 ? void 0 : extra.cloudRegion) !== null && _h !== void 0 ? _h : null,
+            cloudAccountId: (_j = extra === null || extra === void 0 ? void 0 : extra.cloudAccountId) !== null && _j !== void 0 ? _j : null,
+        };
+        return crypto
+            .createHash("sha1")
+            .update(JSON.stringify(normalized))
+            .digest("hex");
+    }
     /**
      * Additively attach labels to a telemetry service. Existing labels
      * are never removed — manual labels set via the UI survive ingest.
@@ -193,7 +249,7 @@ __decorate([
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [ObjectID]),
+    __metadata("design:paramtypes", [ObjectID, Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "updateLastSeen", null);
 __decorate([

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

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

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

@@ -209,6 +209,92 @@ export class TraceAggregationService {
         }
         return result;
     }
+    /*
+     * Accurate per-service and per-status counts over the FULL time window,
+     * computed with a real GROUP BY instead of the recent-N sample in
+     * getFacetValuesFromSample(). The sample saturates with whichever service
+     * is chattiest right now, so high-volume services that aren't in the most
+     * recent N root spans read 0 — the "top 1000" symptom. This GROUP BY is
+     * exact regardless of skew.
+     *
+     * It is cheap because it rides the proj_hist_by_minute aggregate projection
+     * (projectId, minute, serviceId, statusCode, isRootSpan -> count): a 1-month
+     * window reads a few thousand pre-aggregated minute rows in single-digit ms
+     * instead of scanning tens of millions of raw spans. Two things are required
+     * for ClickHouse to actually pick that projection, both load-bearing:
+     *   1. The time predicate must be on toStartOfMinute(startTime) — the
+     *      projection's key expression — NOT raw startTime. A raw startTime
+     *      filter references a column the aggregate projection does not store, so
+     *      ClickHouse rejects the projection and full-scans. (Window edges land
+     *      on minute boundaries, consistent with the minute-bucketed histogram.)
+     *   2. Every other predicate must be on a projection column. isRootSpan,
+     *      serviceId and statusCode all are, so the default sidebar load and
+     *      drill-down-by-service stay on the projection. A non-projection filter
+     *      (kind / name / traceId / attributes) transparently falls back to a
+     *      base-table scan — still correct, still bounded by max_execution_time.
+     *
+     * serviceId is intentionally NOT disambiguated by serviceType here. Resource
+     * IDs are globally unique, so a single serviceId -> count map correctly
+     * serves the service / host / docker host / k8s cluster facets once merged
+     * against each Postgres source-of-truth list (a host id never collides with
+     * a service id, so an unrelated entry is simply never looked up). Omitting
+     * the serviceType predicate keeps the query projection-eligible.
+     */
+    static async getResourceFacetCounts(request) {
+        const statement = new Statement();
+        statement.append(`SELECT serviceId, statusCode, count() AS cnt FROM ${TraceAggregationService.TABLE_NAME}`);
+        statement.append(SQL ` WHERE projectId = ${{
+            type: TableColumnType.ObjectID,
+            value: request.projectId,
+        }} AND toStartOfMinute(startTime) >= toStartOfMinute(${{
+            type: TableColumnType.Date,
+            value: request.startTime,
+        }}) AND toStartOfMinute(startTime) <= toStartOfMinute(${{
+            type: TableColumnType.Date,
+            value: request.endTime,
+        }})`);
+        TraceAggregationService.appendCommonFilters(statement, request);
+        statement.append(" GROUP BY serviceId, statusCode");
+        /*
+         * Cap runtime below nginx's 60s proxy_read_timeout and explicitly allow
+         * projection use so proj_hist_by_minute is read when eligible (see the
+         * toStartOfMinute note above).
+         */
+        statement.append(" SETTINGS max_execution_time = 45, timeout_overflow_mode = 'break', optimize_use_projections = 1");
+        const serviceCounts = new Map();
+        const statusCounts = new Map();
+        const dbResult = await SpanService.executeQuery(statement);
+        let rows = [];
+        try {
+            const response = await dbResult.json();
+            rows = response.data || [];
+        }
+        catch (_a) {
+            /*
+             * 'break' mode can return truncated JSON on timeout. Degrade to empty
+             * counts — the Postgres resolver still lists every resource (count 0),
+             * which is no worse than the prior transient-failure behavior.
+             */
+            logger.warn("Resource facet count query returned unparseable response, returning empty counts");
+            return { serviceCounts, statusCounts };
+        }
+        for (const row of rows) {
+            const cnt = Number(row["cnt"] || 0);
+            const rawServiceId = row["serviceId"];
+            if (rawServiceId !== undefined && rawServiceId !== null) {
+                const serviceId = String(rawServiceId);
+                if (serviceId.length > 0) {
+                    serviceCounts.set(serviceId, (serviceCounts.get(serviceId) || 0) + cnt);
+                }
+            }
+            const rawStatusCode = row["statusCode"];
+            if (rawStatusCode !== undefined && rawStatusCode !== null) {
+                const statusCode = String(rawStatusCode);
+                statusCounts.set(statusCode, (statusCounts.get(statusCode) || 0) + cnt);
+            }
+        }
+        return { serviceCounts, statusCounts };
+    }
     static mapStatusCodeToSeries(code) {
         if (code === 1) {
             return "ok";
@@ -228,6 +314,15 @@ export class TraceAggregationService {
          * even for multi-week ranges. The outer query then re-buckets the tiny
          * minute-level result to the requested bucket size.
          *
+         * The time window is filtered on toStartOfMinute(startTime) — the
+         * projection's key expression — NOT raw startTime. A raw startTime
+         * predicate references a column the aggregate projection does not store,
+         * so ClickHouse rejects proj_hist_by_minute and full-scans the base table
+         * (verified: 32M rows / ~220ms vs 1.5K rows / ~6ms with this form). The
+         * window edges round to the minute, which is consistent with the
+         * minute-bucketed output and only shifts the first/last bucket by the
+         * partial boundary minute when the range is not minute-aligned.
+         *
          * If any non-projection filter (kind, name, traceId, nameSearchText,
          * attributes) is active, ClickHouse transparently falls back to
          * scanning the main table for the inner query — same cost as before.
@@ -250,14 +345,14 @@ export class TraceAggregationService {
             type: TableColumnType.ObjectID,
             value: request.projectId,
         }}
-          AND startTime >= ${{
+          AND toStartOfMinute(startTime) >= toStartOfMinute(${{
             type: TableColumnType.Date,
             value: request.startTime,
-        }}
-          AND startTime <= ${{
+        }})
+          AND toStartOfMinute(startTime) <= toStartOfMinute(${{
             type: TableColumnType.Date,
             value: request.endTime,
-        }}
+        }})
     `;
         TraceAggregationService.appendCommonFilters(statement, request);
         statement.append(" GROUP BY minute, statusCode ) GROUP BY bucket, statusCode ORDER BY bucket ASC");
@@ -434,6 +529,9 @@ TraceAggregationService.RESOURCE_FACET_KEYS = new Map([
     ["hostId", ServiceType.Host],
     ["dockerHostId", ServiceType.DockerHost],
     ["kubernetesClusterId", ServiceType.KubernetesCluster],
+    ["serverlessFunctionId", ServiceType.ServerlessFunction],
+    ["cloudResourceId", ServiceType.CloudResource],
+    ["rumApplicationId", ServiceType.RealUserMonitor],
 ]);
 TraceAggregationService.ATTRIBUTE_KEY_PATTERN = /^[a-zA-Z0-9._:/-]+$/;
 TraceAggregationService.MAX_FACET_KEY_LENGTH = 256;
@@ -455,5 +553,11 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], TraceAggregationService, "getFacetValuesFromSample", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], TraceAggregationService, "getResourceFacetCounts", null);
 export default TraceAggregationService;
 //# sourceMappingURL=TraceAggregationService.js.map