@oneuptime/common 10.8.2 → 11.0.1

package/Models/AnalyticsModels/Metric.ts

@@ -28,7 +28,7 @@ export enum MetricPointType {
 }
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service, { includeProjectScope: true })
+@OwnedThrough("primaryEntityId", Service, { includeProjectScope: true })
 export default class Metric extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
@@ -62,71 +62,73 @@ export default class Metric extends AnalyticsBaseModel {
     });
 
     // this can also be the monitor id or the telemetry service id.
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "ID of the Service which created the Metric",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.Viewer,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.TelemetryViewer,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
+    const primaryEntityIdColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "primaryEntityId",
+        title: "Service ID",
+        description: "ID of the Service which created the Metric",
+        required: true,
+        type: TableColumnType.ObjectID,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.Viewer,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.TelemetryViewer,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      });
 
     // this can also be the monitor id or the telemetry service id.
-    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceType",
-      isLowCardinality: true,
-      title: "Service Type",
-      description: "Type of the service that this telemetry belongs to",
-      required: false,
-      type: TableColumnType.Text,
-      skipIndex: {
-        name: "idx_service_type",
-        type: SkipIndexType.Set,
-        params: [5],
-        granularity: 4,
-      },
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.Viewer,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.TelemetryViewer,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
+    const primaryEntityTypeColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "primaryEntityType",
+        isLowCardinality: true,
+        title: "Service Type",
+        description: "Type of the service that this telemetry belongs to",
+        required: false,
+        type: TableColumnType.Text,
+        skipIndex: {
+          name: "idx_service_type",
+          type: SkipIndexType.Set,
+          params: [5],
+          granularity: 4,
+        },
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.Viewer,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.TelemetryViewer,
+            Permission.ReadTelemetryServiceLog,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.CreateTelemetryServiceLog,
+          ],
+          update: [],
+        },
+      });
 
     // add name and description
     const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
@@ -168,6 +170,8 @@ export default class Metric extends AnalyticsBaseModel {
     const aggregationTemporalityColumn: AnalyticsTableColumn =
       new AnalyticsTableColumn({
         key: "aggregationTemporality",
+        // Enum-shaped (Delta / Cumulative / Unspecified) — dictionary-encode.
+        isLowCardinality: true,
         title: "Aggregation Temporality",
         description: "Aggregation Temporality of this Metric",
         required: false,
@@ -296,11 +300,11 @@ export default class Metric extends AnalyticsBaseModel {
     // end time.
     const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "timeUnixNano",
-      codec: { codec: "ZSTD", level: 1 },
+      codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
       title: "Time (in Unix Nano)",
       description: "When did the Metric happen?",
       required: true,
-      type: TableColumnType.LongNumber,
+      type: TableColumnType.UInt64,
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -327,11 +331,11 @@ export default class Metric extends AnalyticsBaseModel {
     const startTimeUnixNanoColumn: AnalyticsTableColumn =
       new AnalyticsTableColumn({
         key: "startTimeUnixNano",
-        codec: { codec: "ZSTD", level: 1 },
+        codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
         title: "Start Time (in Unix Nano)",
         description: "When did the Metric happen?",
         required: false,
-        type: TableColumnType.LongNumber,
+        type: TableColumnType.UInt64,
         accessControl: {
           read: [
             Permission.ProjectOwner,
@@ -386,6 +390,103 @@ export default class Metric extends AnalyticsBaseModel {
       },
     });
 
+    const entityKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "entityKeys",
+      codec: { codec: "ZSTD", level: 3 },
+      title: "Entity Keys",
+      description:
+        "Stable keys of every OpenTelemetry entity (service, host, k8s.pod, container, ...) this signal belongs to. A superset that includes the primary entity. Enables cross-cutting membership queries via has(entityKeys, :key).",
+      required: true,
+      defaultValue: [],
+      type: TableColumnType.ArrayText,
+      skipIndex: {
+        name: "idx_entity_keys",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.Viewer,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.TelemetryViewer,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    /*
+     * Scalar per-entity-type key columns — denormalized single-value
+     * siblings of `entityKeys`. Each holds the 16-hex key (see
+     * Common/Utils/Telemetry/EntityKey) of the row's entity of that type,
+     * or '' when the resource carries no such entity (non-Nullable String,
+     * so old rows read the type default ''). Unlike the array column, a
+     * scalar equality predicate is usable as an MV/sort key (the per-host
+     * minute rollup `MetricItemAggMV1mByHostV2` groups by `hostEntityKey`)
+     * and gets a cheaper bloom-filter probe; only the high-traffic keys
+     * (service/host/k8s.pod) carry skip indexes. Stamped at ingest by the
+     * same extractor that fills `entityKeys`; never part of identity.
+     */
+    const scalarEntityKeyColumns: Array<AnalyticsTableColumn> = [
+      {
+        key: "serviceEntityKey",
+        title: "Service Entity Key",
+        indexName: "idx_service_entity_key",
+      },
+      {
+        key: "hostEntityKey",
+        title: "Host Entity Key",
+        indexName: "idx_host_entity_key",
+      },
+      {
+        key: "k8sPodEntityKey",
+        title: "Kubernetes Pod Entity Key",
+        indexName: "idx_k8s_pod_entity_key",
+      },
+      { key: "k8sNodeEntityKey", title: "Kubernetes Node Entity Key" },
+      { key: "k8sClusterEntityKey", title: "Kubernetes Cluster Entity Key" },
+      { key: "containerEntityKey", title: "Container Entity Key" },
+    ].map(
+      (def: {
+        key: string;
+        title: string;
+        indexName?: string | undefined;
+      }): AnalyticsTableColumn => {
+        return new AnalyticsTableColumn({
+          key: def.key,
+          title: def.title,
+          description:
+            "Scalar entity key for this entity type (see entityKeys); '' when the resource has no entity of this type.",
+          required: true,
+          defaultValue: "",
+          type: TableColumnType.Text,
+          codec: { codec: "ZSTD", level: 1 },
+          skipIndex: def.indexName
+            ? {
+                name: def.indexName,
+                type: SkipIndexType.BloomFilter,
+                params: [0.01],
+                granularity: 1,
+              }
+            : undefined,
+          accessControl: entityKeysColumn.accessControl,
+        });
+      },
+    );
+
     const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "attributeKeys",
       codec: { codec: "ZSTD", level: 3 },
@@ -484,7 +585,7 @@ export default class Metric extends AnalyticsBaseModel {
 
     const sumColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "sum",
-      codec: { codec: "ZSTD", level: 1 },
+      codec: [{ codec: "Gorilla" }, { codec: "ZSTD", level: 1 }],
       title: "Sum",
       description: "Sum",
       required: false,
@@ -514,7 +615,7 @@ export default class Metric extends AnalyticsBaseModel {
 
     const valueColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "value",
-      codec: { codec: "ZSTD", level: 1 },
+      codec: [{ codec: "Gorilla" }, { codec: "ZSTD", level: 1 }],
       title: "Value",
       description: "Value",
       required: false,
@@ -544,7 +645,7 @@ export default class Metric extends AnalyticsBaseModel {
 
     const minColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "min",
-      codec: { codec: "ZSTD", level: 1 },
+      codec: [{ codec: "Gorilla" }, { codec: "ZSTD", level: 1 }],
       title: "Min",
       description: "Min",
       required: false,
@@ -574,7 +675,7 @@ export default class Metric extends AnalyticsBaseModel {
 
     const maxColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "max",
-      codec: { codec: "ZSTD", level: 1 },
+      codec: [{ codec: "Gorilla" }, { codec: "ZSTD", level: 1 }],
       title: "Max",
       description: "Max",
       required: false,
@@ -1071,8 +1172,8 @@ export default class Metric extends AnalyticsBaseModel {
       },
       tableColumns: [
         projectIdColumn,
-        serviceIdColumn,
-        serviceTypeColumn,
+        primaryEntityIdColumn,
+        primaryEntityTypeColumn,
         nameColumn,
         aggregationTemporalityColumn,
         metricPointTypeColumn,
@@ -1082,6 +1183,8 @@ export default class Metric extends AnalyticsBaseModel {
         startTimeUnixNanoColumn,
         attributesColumn,
         attributeKeysColumn,
+        entityKeysColumn,
+        ...scalarEntityKeyColumns,
         isMonotonicColumn,
         countColumn,
         sumColumn,
@@ -1103,13 +1206,15 @@ export default class Metric extends AnalyticsBaseModel {
         retentionDateColumn,
       ],
       projections: [],
-      sortKeys: ["projectId", "name", "serviceId", "time"],
-      primaryKeys: ["projectId", "name", "serviceId", "time"],
-      partitionKey: "sipHash64(projectId) % 16",
+      sortKeys: ["projectId", "name", "primaryEntityId", "time"],
+      primaryKeys: ["projectId", "name", "primaryEntityId", "time"],
+      partitionKey: "toYYYYMMDD(time)",
+      tableSettings:
+        "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
       ttlExpression: "retentionDate DELETE",
       /*
        * `time` is the 4th column of the Metric sort key (after
-       * projectId + name + serviceId). A list query that filters
+       * projectId + name + primaryEntityId). A list query that filters
        * by name (the typical "metric detail" drilldown) can still
        * stream from the index when sorting by `time DESC`. With
        * no name filter the sort is less efficient but still far
@@ -1128,12 +1233,12 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("projectId", v);
   }
 
-  public get serviceId(): ObjectID | undefined {
-    return this.getColumnValue("serviceId") as ObjectID | undefined;
+  public get primaryEntityId(): ObjectID | undefined {
+    return this.getColumnValue("primaryEntityId") as ObjectID | undefined;
   }
 
-  public get serviceType(): ServiceType | undefined {
-    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  public get primaryEntityType(): ServiceType | undefined {
+    return this.getColumnValue("primaryEntityType") as ServiceType | undefined;
   }
 
   public get name(): string | undefined {
@@ -1172,12 +1277,12 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("isMonotonic", v);
   }
 
-  public set serviceId(v: ObjectID | undefined) {
-    this.setColumnValue("serviceId", v);
+  public set primaryEntityId(v: ObjectID | undefined) {
+    this.setColumnValue("primaryEntityId", v);
   }
 
-  public set serviceType(v: ServiceType | undefined) {
-    this.setColumnValue("serviceType", v);
+  public set primaryEntityType(v: ServiceType | undefined) {
+    this.setColumnValue("primaryEntityType", v);
   }
 
   public get time(): Date | undefined {
@@ -1204,6 +1309,14 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("attributeKeys", v);
   }
 
+  public get entityKeys(): Array<string> | undefined {
+    return this.getColumnValue("entityKeys") as Array<string> | undefined;
+  }
+
+  public set entityKeys(v: Array<string> | undefined) {
+    this.setColumnValue("entityKeys", v);
+  }
+
   public get startTime(): Date | undefined {
     return this.getColumnValue("startTime") as Date | undefined;
   }

package/Models/AnalyticsModels/MetricBaselineHourly.ts

@@ -5,13 +5,13 @@ import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 
 /**
- * Per-(day, hour-of-week) statistical baseline of `MetricItemV2` value
+ * Per-(day, hour-of-week) statistical baseline of `MetricItemV3` value
  * samples — backbone of metric anomaly detection.
  *
  * Populated by `MetricBaselineHourly_mv` (defined in the
  * `AddMetricBaselineHourlyMV` data migration), which fires on every
- * insert into `MetricItemV2` and groups by `(projectId, name,
- * serviceId, day, hourOfWeek)`. Each row holds AggregateFunction
+ * insert into `MetricItemV3` and groups by `(projectId, name,
+ * primaryEntityId, day, hourOfWeek)`. Each row holds AggregateFunction
  * states (count/avg/stddevPop/quantile/min/max) — finalize at read
  * time via the matching `*Merge()`.
  *
@@ -40,7 +40,7 @@ export default class MetricBaselineHourly extends AnalyticsBaseModel {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "projectId",
       title: "Project ID",
-      description: "ID of project (tenant key, replicated from MetricItemV2)",
+      description: "ID of project (tenant key, replicated from MetricItemV3)",
       required: true,
       type: TableColumnType.Text,
       isTenantId: true,
@@ -49,18 +49,19 @@ export default class MetricBaselineHourly extends AnalyticsBaseModel {
     const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "name",
       title: "Metric Name",
-      description: "Metric name (replicated from MetricItemV2)",
+      description: "Metric name (replicated from MetricItemV3)",
       required: true,
       type: TableColumnType.Text,
     });
 
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "Service ID (replicated from MetricItemV2)",
-      required: true,
-      type: TableColumnType.Text,
-    });
+    const primaryEntityIdColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "primaryEntityId",
+        title: "Service ID",
+        description: "Primary entity ID (replicated from MetricItemV3)",
+        required: true,
+        type: TableColumnType.Text,
+      });
 
     const dayColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "day",
@@ -111,24 +112,34 @@ export default class MetricBaselineHourly extends AnalyticsBaseModel {
       aggregateFunctionDefinition: "stddevPop, Float64",
     });
 
+    /*
+     * quantileBFloat16, not quantile(reservoir sampling): the BFloat16
+     * sketch is a fixed-size histogram of bfloat16 buckets, so its state
+     * stays small and merges cheaply no matter how many samples fold in,
+     * where the default quantile keeps an 8 KB reservoir per cell. The
+     * ~0.4% relative precision of bfloat16 is far inside the noise of an
+     * anomaly baseline. State types can't be ALTERed in place — switching
+     * required the RebuildMetricBaselineHourlyWithBFloat16Quantiles
+     * migration to drop + recreate this table and its MV.
+     */
     const medianStateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "medianState",
       title: "Median (state)",
       description:
-        "AggregateFunction(quantile(0.5), Float64) state. Read via quantileMerge(0.5)(medianState). Emitted for the future MedianMad anomaly method.",
+        "AggregateFunction(quantileBFloat16(0.5), Float64) state. Read via quantileBFloat16Merge(0.5)(medianState). Emitted for the future MedianMad anomaly method.",
       required: true,
       type: TableColumnType.AggregateFunction,
-      aggregateFunctionDefinition: "quantile(0.5), Float64",
+      aggregateFunctionDefinition: "quantileBFloat16(0.5), Float64",
     });
 
     const p95StateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "p95State",
       title: "P95 (state)",
       description:
-        "AggregateFunction(quantile(0.95), Float64) state. Read via quantileMerge(0.95)(p95State).",
+        "AggregateFunction(quantileBFloat16(0.95), Float64) state. Read via quantileBFloat16Merge(0.95)(p95State).",
       required: true,
       type: TableColumnType.AggregateFunction,
-      aggregateFunctionDefinition: "quantile(0.95), Float64",
+      aggregateFunctionDefinition: "quantileBFloat16(0.95), Float64",
     });
 
     const minObsStateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
@@ -159,7 +170,7 @@ export default class MetricBaselineHourly extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         nameColumn,
-        serviceIdColumn,
+        primaryEntityIdColumn,
         dayColumn,
         hourOfWeekColumn,
         sampleCountStateColumn,
@@ -187,18 +198,18 @@ AS
 SELECT
   projectId,
   name,
-  serviceId,
+  primaryEntityId,
   toDate(time) AS day,
   toUInt8((toDayOfWeek(time, 1) - 1) * 24 + toHour(time)) AS hourOfWeek,
   countState(toFloat64(coalesce(value, sum, 0))) AS sampleCountState,
   avgState(toFloat64(coalesce(value, sum, 0))) AS meanState,
   stddevPopState(toFloat64(coalesce(value, sum, 0))) AS stddevState,
-  quantileState(0.5)(toFloat64(coalesce(value, sum, 0))) AS medianState,
-  quantileState(0.95)(toFloat64(coalesce(value, sum, 0))) AS p95State,
+  quantileBFloat16State(0.5)(toFloat64(coalesce(value, sum, 0))) AS medianState,
+  quantileBFloat16State(0.95)(toFloat64(coalesce(value, sum, 0))) AS p95State,
   minState(toFloat64(coalesce(value, sum, 0))) AS minObsState,
   maxState(toFloat64(coalesce(value, sum, 0))) AS maxObsState
-FROM MetricItemV2
-GROUP BY projectId, name, serviceId, day, hourOfWeek`,
+FROM MetricItemV3
+GROUP BY projectId, name, primaryEntityId, day, hourOfWeek`,
         },
       ],
       /*
@@ -206,9 +217,17 @@ GROUP BY projectId, name, serviceId, day, hourOfWeek`,
        * MetricBaselineService.getBaseline so lookups touch a tight
        * granule range.
        */
-      sortKeys: ["projectId", "name", "serviceId", "hourOfWeek", "day"],
-      primaryKeys: ["projectId", "name", "serviceId", "hourOfWeek", "day"],
-      partitionKey: "sipHash64(projectId) % 16",
+      sortKeys: ["projectId", "name", "primaryEntityId", "hourOfWeek", "day"],
+      primaryKeys: [
+        "projectId",
+        "name",
+        "primaryEntityId",
+        "hourOfWeek",
+        "day",
+      ],
+      partitionKey: "toYYYYMM(day)",
+      tableSettings:
+        "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
       ttlExpression: "day + INTERVAL 90 DAY",
     });
   }

package/Models/AnalyticsModels/MetricItemAggMV1m.ts

@@ -5,12 +5,12 @@ import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 
 /**
- * Per-minute pre-aggregated rollup of `MetricItemV2` value samples.
+ * Per-minute pre-aggregated rollup of `MetricItemV3` value samples.
  *
  * Populated by the attached materialized view `MetricItemAggMV1m_mv`
  * (declared below in `materializedViews` and applied idempotently by
  * the analytics schema-sync on every boot), which fires on every
- * insert into `MetricItemV2`. Each row holds AggregateFunction
+ * insert into `MetricItemV3`. Each row holds AggregateFunction
  * *states* — partial intermediate values combined by background merges
  * and finalized at read time via `*Merge()` (e.g.
  * `sumMerge(valueSumState)`).
@@ -33,7 +33,7 @@ export default class MetricItemAggMV1m extends AnalyticsBaseModel {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "projectId",
       title: "Project ID",
-      description: "ID of project (tenant key, replicated from MetricItemV2)",
+      description: "ID of project (tenant key, replicated from MetricItemV3)",
       required: true,
       type: TableColumnType.Text,
       isTenantId: true,
@@ -42,18 +42,19 @@ export default class MetricItemAggMV1m extends AnalyticsBaseModel {
     const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "name",
       title: "Metric Name",
-      description: "Metric name (replicated from MetricItemV2)",
+      description: "Metric name (replicated from MetricItemV3)",
       required: true,
       type: TableColumnType.Text,
     });
 
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "Service ID (replicated from MetricItemV2)",
-      required: true,
-      type: TableColumnType.Text,
-    });
+    const primaryEntityIdColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "primaryEntityId",
+        title: "Service ID",
+        description: "Primary entity ID (replicated from MetricItemV3)",
+        required: true,
+        type: TableColumnType.Text,
+      });
 
     const bucketTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "bucketTime",
@@ -109,7 +110,7 @@ export default class MetricItemAggMV1m extends AnalyticsBaseModel {
       key: "retentionDate",
       title: "Retention Date",
       description:
-        "Date after which this row is eligible for TTL deletion. Computed by the MV as max(retentionDate) per bucket — inherits from the source MetricItemV2 rows.",
+        "Date after which this row is eligible for TTL deletion. Computed by the MV as max(retentionDate) per bucket — inherits from the source MetricItemV3 rows.",
       required: true,
       type: TableColumnType.Date,
     });
@@ -122,7 +123,7 @@ export default class MetricItemAggMV1m extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         nameColumn,
-        serviceIdColumn,
+        primaryEntityIdColumn,
         bucketTimeColumn,
         valueSumStateColumn,
         valueCountStateColumn,
@@ -132,7 +133,7 @@ export default class MetricItemAggMV1m extends AnalyticsBaseModel {
       ],
       projections: [],
       /*
-       * Materialized view that pre-rolls MetricItemV2 value samples into
+       * Materialized view that pre-rolls MetricItemV3 value samples into
        * 1-minute buckets. This is the canonical definition: the analytics
        * schema-sync (AnalyticsTableManagement.createMaterializedViews)
        * creates it on every boot if missing, so a wiped/recreated
@@ -149,20 +150,22 @@ AS
 SELECT
   projectId,
   name,
-  serviceId,
+  primaryEntityId,
   toStartOfMinute(time) AS bucketTime,
   sumState(toFloat64(coalesce(value, sum, 0))) AS valueSumState,
   countState(toFloat64(coalesce(value, sum, 0))) AS valueCountState,
   minState(toFloat64(coalesce(value, sum, 0))) AS valueMinState,
   maxState(toFloat64(coalesce(value, sum, 0))) AS valueMaxState,
   max(retentionDate) AS retentionDate
-FROM MetricItemV2
-GROUP BY projectId, name, serviceId, bucketTime`,
+FROM MetricItemV3
+GROUP BY projectId, name, primaryEntityId, bucketTime`,
         },
       ],
-      sortKeys: ["projectId", "name", "serviceId", "bucketTime"],
-      primaryKeys: ["projectId", "name", "serviceId", "bucketTime"],
-      partitionKey: "sipHash64(projectId) % 16",
+      sortKeys: ["projectId", "name", "primaryEntityId", "bucketTime"],
+      primaryKeys: ["projectId", "name", "primaryEntityId", "bucketTime"],
+      partitionKey: "toYYYYMM(bucketTime)",
+      tableSettings:
+        "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
       ttlExpression: "retentionDate DELETE",
     });
   }