@oneuptime/common 10.8.0 → 10.8.2

package/Models/DatabaseModels/CloudResourceInstance.ts

@@ -140,8 +140,7 @@ export default class CloudResourceInstance extends BaseModel {
     type: TableColumnType.ShortText,
     canReadOnRelationQuery: true,
     title: "Instance Name",
-    description:
-      "service.instance.id value identifying this instance / task.",
+    description: "service.instance.id value identifying this instance / task.",
   })
   @Column({
     nullable: false,

package/Models/DatabaseModels/CloudResourceOwnerTeam.ts

@@ -258,8 +258,7 @@ export default class CloudResourceOwnerTeam extends BaseModel {
     type: TableColumnType.Entity,
     modelType: CloudResource,
     title: "Cloud Resource",
-    description:
-      "Relation to Cloud Resource in which this object belongs",
+    description: "Relation to Cloud Resource in which this object belongs",
   })
   @ManyToOne(
     () => {

package/Models/DatabaseModels/CloudResourceOwnerUser.ts

@@ -221,8 +221,7 @@ export default class CloudResourceOwnerUser extends BaseModel {
     type: TableColumnType.Entity,
     modelType: CloudResource,
     title: "Cloud Resource",
-    description:
-      "Relation to Cloud Resource in which this object belongs",
+    description: "Relation to Cloud Resource in which this object belongs",
   })
   @ManyToOne(
     () => {

package/Models/DatabaseModels/TelemetryException.ts

@@ -86,8 +86,9 @@ import RumApplication from "./RumApplication";
     RumApplication,
   ],
   {
-  includeProjectScope: true,
-})
+    includeProjectScope: true,
+  },
+)
 @Entity({
   name: "TelemetryException",
 })

package/Server/API/TelemetryAPI.ts

@@ -688,11 +688,10 @@ router.post(
         : undefined;
 
       /*
-       * Compute all facets from a single sort-key-aligned sample query
-       * (ORDER BY startTime DESC LIMIT N) and count top-K in Node. This
-       * avoids ClickHouse GROUP BY aggregations that can't return partial
-       * results under max_execution_time 'break' mode, and returns in
-       * <1s even over 14-day windows.
+       * Shared window + active filters for both facet-counting paths below:
+       * the exact projection-backed GROUP BY (resource facets + statusCode)
+       * and the recent-N sample (kind + attribute facets, which have no cheap
+       * exact path).
        */
       const multiRequest: TraceMultiFacetRequest = {
         projectId: databaseProps.tenantId,
@@ -710,38 +709,92 @@ router.post(
         attributes,
       };
 
-      let facets: Record<string, Array<TraceFacetValue>>;
-      try {
-        facets =
-          await TraceAggregationService.getFacetValuesFromSample(multiRequest);
-      } catch {
-        facets = Object.fromEntries(
-          facetKeys.map((key: string): [string, Array<TraceFacetValue>] => {
-            return [key, []];
-          }),
-        );
+      /*
+       * Resource facets (serviceId / hostId / dockerHostId / k8s cluster ...)
+       * and statusCode are counted with an exact, projection-backed GROUP BY
+       * in getResourceFacetCounts(). The recent-N sample below saturates with
+       * whichever service is chattiest right now and reports 0 for every other
+       * service regardless of its true volume over the window — the "top 1000"
+       * symptom. Facets with no projection (kind, attribute keys) have no cheap
+       * exact path and stay on the sample.
+       */
+      const sampledKeys: Array<string> = facetKeys.filter(
+        (key: string): boolean => {
+          return (
+            !ResourceFacetResolver.isResourceFacet(key) && key !== "statusCode"
+          );
+        },
+      );
+
+      let facets: Record<string, Array<TraceFacetValue>> = {};
+      if (sampledKeys.length > 0) {
+        try {
+          facets = await TraceAggregationService.getFacetValuesFromSample({
+            ...multiRequest,
+            facetKeys: sampledKeys,
+          });
+        } catch {
+          facets = Object.fromEntries(
+            sampledKeys.map((key: string): [string, Array<TraceFacetValue>] => {
+              return [key, []];
+            }),
+          );
+        }
+      }
+
+      const needsAccurateCounts: boolean =
+        facetKeys.includes("statusCode") ||
+        facetKeys.some((key: string): boolean => {
+          return ResourceFacetResolver.isResourceFacet(key);
+        });
+
+      let serviceCounts: Map<string, number> = new Map<string, number>();
+      let statusCounts: Map<string, number> = new Map<string, number>();
+      if (needsAccurateCounts) {
+        try {
+          const accurate: {
+            serviceCounts: Map<string, number>;
+            statusCounts: Map<string, number>;
+          } =
+            await TraceAggregationService.getResourceFacetCounts(multiRequest);
+          serviceCounts = accurate.serviceCounts;
+          statusCounts = accurate.statusCounts;
+        } catch {
+          /*
+           * Degrade gracefully: resource facets still enumerate via Postgres
+           * (count 0), statusCode falls back to empty.
+           */
+        }
+      }
+
+      if (facetKeys.includes("statusCode")) {
+        facets["statusCode"] = Array.from(statusCounts.entries())
+          .map(([value, count]: [string, number]): TraceFacetValue => {
+            return { value, count };
+          })
+          .sort((a: TraceFacetValue, b: TraceFacetValue): number => {
+            return b.count - a.count;
+          })
+          .slice(0, limit);
       }
 
       /*
        * Replace resource-facet results with the Postgres source-of-truth list
-       * (filtered by facetSearchText and enriched with displayName). Counts
-       * come from the ClickHouse sample above — entities with no recent
-       * telemetry surface with count 0 instead of being hidden entirely. This
-       * means low-volume services / hosts still appear in the sidebar and the
-       * search box can find resources beyond the loaded subset.
+       * (filtered by facetSearchText and enriched with displayName). Every
+       * resource facet shares the same exact serviceId -> count map; resource
+       * ids are globally unique, so each facet only ever resolves its own
+       * entities. Entities with no telemetry in the window surface with count
+       * 0 instead of being hidden, and the search box can find resources
+       * beyond the loaded subset.
        */
       const resourceSpecs: Array<ResourceFacetSpec> = facetKeys
         .filter((key: string): boolean => {
           return ResourceFacetResolver.isResourceFacet(key);
         })
         .map((key: string): ResourceFacetSpec => {
-          const counts: Map<string, number> = new Map();
-          for (const fv of facets[key] || []) {
-            counts.set(fv.value, fv.count);
-          }
           return {
             facetKey: key,
-            counts,
+            counts: serviceCounts,
             searchText: facetSearchText?.[key],
             limit,
           };

package/Server/Infrastructure/Postgres/SchemaMigrations/1780931863719-AddTelemetryResourceMetadataColumns.ts

@@ -68,9 +68,7 @@ export class AddTelemetryResourceMetadataColumns1780931863719
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     // Host
-    await queryRunner.query(
-      `ALTER TABLE "Host" DROP COLUMN "cloudAccountId"`,
-    );
+    await queryRunner.query(`ALTER TABLE "Host" DROP COLUMN "cloudAccountId"`);
     await queryRunner.query(`ALTER TABLE "Host" DROP COLUMN "cloudRegion"`);
     await queryRunner.query(`ALTER TABLE "Host" DROP COLUMN "cloudPlatform"`);
     await queryRunner.query(`ALTER TABLE "Host" DROP COLUMN "cloudProvider"`);

package/Server/Infrastructure/Postgres/SchemaMigrations/1780933132562-AddServerlessFunctionTables.ts

@@ -175,7 +175,9 @@ export class AddServerlessFunctionTables1780933132562
     await queryRunner.query(
       `DROP INDEX "public"."IDX_SrvlessFnOwnerUser_notified"`,
     );
-    await queryRunner.query(`DROP INDEX "public"."IDX_SrvlessFnOwnerUser_fnId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_SrvlessFnOwnerUser_fnId"`,
+    );
     await queryRunner.query(
       `DROP INDEX "public"."IDX_SrvlessFnOwnerUser_userId"`,
     );
@@ -186,7 +188,9 @@ export class AddServerlessFunctionTables1780933132562
     await queryRunner.query(
       `DROP INDEX "public"."IDX_SrvlessFnOwnerTeam_notified"`,
     );
-    await queryRunner.query(`DROP INDEX "public"."IDX_SrvlessFnOwnerTeam_fnId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_SrvlessFnOwnerTeam_fnId"`,
+    );
     await queryRunner.query(
       `DROP INDEX "public"."IDX_SrvlessFnOwnerTeam_teamId"`,
     );

package/Server/Infrastructure/Postgres/SchemaMigrations/1780935387827-AddCloudResourceTables.ts

@@ -166,13 +166,19 @@ export class AddCloudResourceTables1780935387827 implements MigrationInterface {
     await queryRunner.query(
       `DROP INDEX "public"."IDX_CloudResourceLabel_labelId"`,
     );
-    await queryRunner.query(`DROP INDEX "public"."IDX_CloudResourceLabel_resId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_CloudResourceLabel_resId"`,
+    );
     await queryRunner.query(`DROP TABLE "CloudResourceLabel"`);
     await queryRunner.query(
       `DROP INDEX "public"."IDX_CloudResOwnerUser_notified"`,
     );
-    await queryRunner.query(`DROP INDEX "public"."IDX_CloudResOwnerUser_resId"`);
-    await queryRunner.query(`DROP INDEX "public"."IDX_CloudResOwnerUser_userId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_CloudResOwnerUser_resId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_CloudResOwnerUser_userId"`,
+    );
     await queryRunner.query(
       `DROP INDEX "public"."IDX_CloudResOwnerUser_projectId"`,
     );
@@ -180,8 +186,12 @@ export class AddCloudResourceTables1780935387827 implements MigrationInterface {
     await queryRunner.query(
       `DROP INDEX "public"."IDX_CloudResOwnerTeam_notified"`,
     );
-    await queryRunner.query(`DROP INDEX "public"."IDX_CloudResOwnerTeam_resId"`);
-    await queryRunner.query(`DROP INDEX "public"."IDX_CloudResOwnerTeam_teamId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_CloudResOwnerTeam_resId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_CloudResOwnerTeam_teamId"`,
+    );
     await queryRunner.query(
       `DROP INDEX "public"."IDX_CloudResOwnerTeam_projectId"`,
     );
@@ -189,7 +199,9 @@ export class AddCloudResourceTables1780935387827 implements MigrationInterface {
     await queryRunner.query(
       `DROP INDEX "public"."UQ_CloudResource_project_resId"`,
     );
-    await queryRunner.query(`DROP INDEX "public"."IDX_CloudResource_projectId"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_CloudResource_projectId"`,
+    );
     await queryRunner.query(`DROP TABLE "CloudResource"`);
   }
 }