@oneuptime/common 10.8.2 → 11.0.1

package/Models/AnalyticsModels/{MetricItemAggMV1mByHost.ts → MetricItemAggMV1mByHostV2.ts}

@@ -5,32 +5,39 @@ import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 
 /**
- * Per-(host, minute) pre-aggregated rollup of `MetricItemV2` value
- * samples — sister table of `MetricItemAggMV1m` keyed by host instead
- * of by service. Powers the host-detail page's chart queries, which
- * filter by `host.name` and need the full sort-key prefix to land on
- * a tight granule range.
+ * Per-(host, minute) pre-aggregated rollup of `MetricItemV3` value
+ * samples — successor of `MetricItemAggMV1mByHost`, re-keyed from the
+ * raw `hostIdentifier` string to the stable 16-hex `hostEntityKey`
+ * (see Common/Utils/Telemetry/EntityKey.keyForHost).
  *
- * Populated by `MetricItemAggMV1mByHost_mv` (in
- * `AddMetricMinuteAggregateByHostMaterializedView`), which extracts
- * `attributes['resource.host.name']` from each `MetricItemV2` row at
- * insert time and skips rows without a host identifier — so the table
- * stays much smaller than `MetricItemAggMV1m`, which covers every
- * metric stream regardless of attribute presence.
+ * Why the re-key: the V1 rollup grouped by the raw
+ * `attributes['resource.host.name']` spelling, so hosts reporting the
+ * same machine with casing/whitespace drift split into separate rollup
+ * streams, and the read side had to ship the raw string. Keying by the
+ * canonical entity key collapses those spellings, makes the rollup
+ * joinable with every other entity-key read (`has(entityKeys, :key)`),
+ * and lets the MV read the ingest-stamped `hostEntityKey` scalar column
+ * instead of re-parsing the attributes map on every insert.
+ *
+ * Populated by `MetricItemAggMV1mByHostV2_mv` (declared below; created
+ * by the `RekeyMetricHostRollupToEntityKey` migration, which also
+ * backfills from the V1 table by computing the key in SQL). Rows whose
+ * resource carries no host entity (`hostEntityKey = ''`) are filtered
+ * out so the rollup stays much smaller than `MetricItemAggMV1m`.
  *
  * Read access goes through `MetricService.tryBuildHostAggregateMVStatement`,
- * which is the dominant path for host-detail attribute-filtered chart
- * queries. The non-host path falls through to `MetricItemAggMV1m` and
- * then the base table.
+ * which computes `keyForHost(projectId, hostIdentifier)` server-side from
+ * the incoming `resource.host.name` filter — the dominant path for
+ * host-detail chart queries.
  *
  * No CRUD API; read-only infrastructure populated entirely by the MV.
  */
-export default class MetricItemAggMV1mByHost extends AnalyticsBaseModel {
+export default class MetricItemAggMV1mByHostV2 extends AnalyticsBaseModel {
   public constructor() {
     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,
@@ -39,21 +46,19 @@ export default class MetricItemAggMV1mByHost 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 hostIdentifierColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
-      {
-        key: "hostIdentifier",
-        title: "Host Identifier",
-        description:
-          "Host name extracted from attributes['resource.host.name'] at insert time. Rows without one are filtered out by the MV's WHERE clause so this column is always populated for rows that exist.",
-        required: true,
-        type: TableColumnType.Text,
-      },
-    );
+    const hostEntityKeyColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "hostEntityKey",
+      title: "Host Entity Key",
+      description:
+        "Stable 16-hex host entity key (EntityKey.keyForHost) replicated from MetricItemV3.hostEntityKey at insert time. Rows without one are filtered out by the MV's WHERE clause so this column is always populated for rows that exist.",
+      required: true,
+      type: TableColumnType.Text,
+    });
 
     const bucketTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "bucketTime",
@@ -109,20 +114,20 @@ export default class MetricItemAggMV1mByHost 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,
     });
 
     super({
-      tableName: AnalyticsTableName.MetricItemAggMV1mByHost,
+      tableName: AnalyticsTableName.MetricItemAggMV1mByHostV2,
       tableEngine: AnalyticsTableEngine.AggregatingMergeTree,
-      singularName: "Metric 1-Minute Aggregate (By Host)",
-      pluralName: "Metric 1-Minute Aggregates (By Host)",
+      singularName: "Metric 1-Minute Aggregate (By Host Entity Key)",
+      pluralName: "Metric 1-Minute Aggregates (By Host Entity Key)",
       tableColumns: [
         projectIdColumn,
         nameColumn,
-        hostIdentifierColumn,
+        hostEntityKeyColumn,
         bucketTimeColumn,
         valueSumStateColumn,
         valueCountStateColumn,
@@ -132,36 +137,42 @@ export default class MetricItemAggMV1mByHost extends AnalyticsBaseModel {
       ],
       projections: [],
       /*
-       * Per-host materialized view. Canonical definition applied
-       * idempotently by the analytics schema-sync on every boot (see
-       * AnalyticsTableManagement.createMaterializedViews), so a
-       * wiped/recreated ClickHouse volume self-heals. Rows without a
-       * host identifier are filtered out so the per-host MV stays small.
+       * Per-host materialized view, reading the ingest-stamped
+       * `hostEntityKey` scalar column (contract C3) rather than the raw
+       * attributes map. Canonical definition; created by the
+       * RekeyMetricHostRollupToEntityKey migration and applied
+       * idempotently by the analytics schema-sync on boot
+       * (MetricItemAggMV1mByHostV2Service is registered in
+       * AnalyticsServices, so a wiped ClickHouse volume self-heals).
+       * Rows without a host entity are filtered out so the per-host MV
+       * stays small.
        */
       materializedViews: [
         {
-          name: "MetricItemAggMV1mByHost_mv",
-          query: `CREATE MATERIALIZED VIEW IF NOT EXISTS MetricItemAggMV1mByHost_mv
-TO MetricItemAggMV1mByHost
+          name: "MetricItemAggMV1mByHostV2_mv",
+          query: `CREATE MATERIALIZED VIEW IF NOT EXISTS MetricItemAggMV1mByHostV2_mv
+TO MetricItemAggMV1mByHostV2
 AS
 SELECT
   projectId,
   name,
-  attributes['resource.host.name'] AS hostIdentifier,
+  hostEntityKey,
   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
-WHERE attributes['resource.host.name'] != ''
-GROUP BY projectId, name, hostIdentifier, bucketTime`,
+FROM MetricItemV3
+WHERE hostEntityKey != ''
+GROUP BY projectId, name, hostEntityKey, bucketTime`,
         },
       ],
-      sortKeys: ["projectId", "name", "hostIdentifier", "bucketTime"],
-      primaryKeys: ["projectId", "name", "hostIdentifier", "bucketTime"],
-      partitionKey: "sipHash64(projectId) % 16",
+      sortKeys: ["projectId", "name", "hostEntityKey", "bucketTime"],
+      primaryKeys: ["projectId", "name", "hostEntityKey", "bucketTime"],
+      partitionKey: "toYYYYMM(bucketTime)",
+      tableSettings:
+        "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
       ttlExpression: "retentionDate DELETE",
     });
   }

package/Models/AnalyticsModels/MonitorLog.ts

@@ -71,6 +71,7 @@ export default class MonitorLog extends AnalyticsBaseModel {
 
     const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "time",
+      codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
       title: "Time",
       description: "When was the log created?",
       required: true,
@@ -131,6 +132,7 @@ export default class MonitorLog extends AnalyticsBaseModel {
 
     const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "retentionDate",
+      codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
       title: "Retention Date",
       description:
         "Date after which this row is eligible for TTL deletion, computed at ingest time as time + service.retainTelemetryDataForDays",
@@ -191,7 +193,9 @@ export default class MonitorLog extends AnalyticsBaseModel {
       projections: [],
       sortKeys: ["projectId", "time", "monitorId"],
       primaryKeys: ["projectId", "time", "monitorId"],
-      partitionKey: "sipHash64(projectId) % 16",
+      partitionKey: "toYYYYMMDD(time)",
+      tableSettings:
+        "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
       ttlExpression: "retentionDate DELETE",
       defaultSortColumn: "time",
     });

package/Models/AnalyticsModels/Profile.ts

@@ -15,7 +15,7 @@ import Service from "../DatabaseModels/Service";
 import ServiceType from "../../Types/Telemetry/ServiceType";
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service, { includeProjectScope: true })
+@OwnedThrough("primaryEntityId", Service, { includeProjectScope: true })
 export default class Profile extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
@@ -48,72 +48,74 @@ export default class Profile extends AnalyticsBaseModel {
       },
     });
 
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description:
-        "ID of the resource the profile belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.Viewer,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.TelemetryViewer,
-          Permission.ReadTelemetryServiceProfiles,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.CreateTelemetryServiceProfiles,
-        ],
-        update: [],
-      },
-    });
+    const primaryEntityIdColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "primaryEntityId",
+        title: "Service ID",
+        description:
+          "ID of the resource the profile belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by primaryEntityType)",
+        required: true,
+        type: TableColumnType.ObjectID,
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.Viewer,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.TelemetryViewer,
+            Permission.ReadTelemetryServiceProfiles,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.CreateTelemetryServiceProfiles,
+          ],
+          update: [],
+        },
+      });
 
-    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceType",
-      isLowCardinality: true,
-      title: "Service Type",
-      description:
-        "Discriminator for serviceId — tells the read side which resource table to dispatch to",
-      required: false,
-      type: TableColumnType.Text,
-      skipIndex: {
-        name: "idx_service_type",
-        type: SkipIndexType.Set,
-        params: [10],
-        granularity: 4,
-      },
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.Viewer,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.TelemetryViewer,
-          Permission.ReadTelemetryServiceProfiles,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.TelemetryAdmin,
-          Permission.TelemetryMember,
-          Permission.CreateTelemetryServiceProfiles,
-        ],
-        update: [],
-      },
-    });
+    const primaryEntityTypeColumn: AnalyticsTableColumn =
+      new AnalyticsTableColumn({
+        key: "primaryEntityType",
+        isLowCardinality: true,
+        title: "Service Type",
+        description:
+          "Discriminator for primaryEntityId — tells the read side which resource table to dispatch to",
+        required: false,
+        type: TableColumnType.Text,
+        skipIndex: {
+          name: "idx_service_type",
+          type: SkipIndexType.Set,
+          params: [10],
+          granularity: 4,
+        },
+        accessControl: {
+          read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.Viewer,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.TelemetryViewer,
+            Permission.ReadTelemetryServiceProfiles,
+          ],
+          create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.TelemetryAdmin,
+            Permission.TelemetryMember,
+            Permission.CreateTelemetryServiceProfiles,
+          ],
+          update: [],
+        },
+      });
 
     const profileIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "profileId",
@@ -225,6 +227,7 @@ export default class Profile extends AnalyticsBaseModel {
 
     const startTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "startTime",
+      codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
       title: "Start Time",
       description: "Profile start timestamp",
       required: true,
@@ -254,6 +257,12 @@ export default class Profile extends AnalyticsBaseModel {
 
     const endTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "endTime",
+      /*
+       * DoubleDelta works here (unlike Span.endTime): profiles cover
+       * fixed-length collection windows, so endTime tracks startTime —
+       * and endTimeUnixNano already compresses well with DoubleDelta.
+       */
+      codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
       title: "End Time",
       description: "Profile end timestamp",
       required: true,
@@ -287,8 +296,8 @@ export default class Profile extends AnalyticsBaseModel {
         title: "Start Time in Unix Nano",
         description: "Profile start timestamp in unix nanoseconds",
         required: true,
-        type: TableColumnType.LongNumber,
-        codec: { codec: "ZSTD", level: 1 },
+        type: TableColumnType.UInt64,
+        codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
         accessControl: {
           read: [
             Permission.ProjectOwner,
@@ -318,8 +327,8 @@ export default class Profile extends AnalyticsBaseModel {
         title: "End Time in Unix Nano",
         description: "Profile end timestamp in unix nanoseconds",
         required: true,
-        type: TableColumnType.LongNumber,
-        codec: { codec: "ZSTD", level: 1 },
+        type: TableColumnType.UInt64,
+        codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
         accessControl: {
           read: [
             Permission.ProjectOwner,
@@ -348,7 +357,7 @@ export default class Profile extends AnalyticsBaseModel {
       title: "Duration in Nanoseconds",
       description: "Duration of the profile in nanoseconds",
       required: true,
-      type: TableColumnType.LongNumber,
+      type: TableColumnType.UInt64,
       codec: { codec: "ZSTD", level: 1 },
       accessControl: {
         read: [
@@ -469,10 +478,11 @@ export default class Profile extends AnalyticsBaseModel {
 
     const periodColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "period",
+      codec: { codec: "ZSTD", level: 1 },
       title: "Period",
       description: "Sampling period value",
       required: false,
-      type: TableColumnType.LongNumber,
+      type: TableColumnType.UInt64,
       accessControl: {
         read: [
           Permission.ProjectOwner,
@@ -498,6 +508,7 @@ export default class Profile extends AnalyticsBaseModel {
 
     const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "attributes",
+      codec: { codec: "ZSTD", level: 3 },
       title: "Attributes",
       description: "Profile-level attributes",
       required: true,
@@ -526,8 +537,47 @@ export default class Profile 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.ReadTelemetryServiceProfiles,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryServiceProfiles,
+        ],
+        update: [],
+      },
+    });
+
     const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "attributeKeys",
+      codec: { codec: "ZSTD", level: 3 },
       title: "Attribute Keys",
       description: "Attribute keys extracted from attributes",
       required: true,
@@ -621,8 +671,67 @@ export default class Profile extends AnalyticsBaseModel {
         },
       });
 
+    /*
+     * 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 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 retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "retentionDate",
+      codec: [{ codec: "DoubleDelta" }, { codec: "ZSTD", level: 1 }],
       title: "Retention Date",
       description:
         "Date after which this row is eligible for TTL deletion, computed at ingest time as startTime + service.retainTelemetryDataForDays",
@@ -675,8 +784,8 @@ export default class Profile extends AnalyticsBaseModel {
       },
       tableColumns: [
         projectIdColumn,
-        serviceIdColumn,
-        serviceTypeColumn,
+        primaryEntityIdColumn,
+        primaryEntityTypeColumn,
         profileIdColumn,
         traceIdColumn,
         spanIdColumn,
@@ -691,13 +800,17 @@ export default class Profile extends AnalyticsBaseModel {
         periodColumn,
         attributesColumn,
         attributeKeysColumn,
+        entityKeysColumn,
+        ...scalarEntityKeyColumns,
         sampleCountColumn,
         originalPayloadFormatColumn,
         retentionDateColumn,
       ],
-      sortKeys: ["projectId", "startTime", "serviceId", "profileType"],
-      primaryKeys: ["projectId", "startTime", "serviceId", "profileType"],
-      partitionKey: "sipHash64(projectId) % 16",
+      sortKeys: ["projectId", "startTime", "primaryEntityId", "profileType"],
+      primaryKeys: ["projectId", "startTime", "primaryEntityId", "profileType"],
+      partitionKey: "toYYYYMMDD(startTime)",
+      tableSettings:
+        "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
       ttlExpression: "retentionDate DELETE",
       defaultSortColumn: "startTime",
     });
@@ -711,20 +824,20 @@ export default class Profile 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 set serviceId(v: ObjectID | undefined) {
-    this.setColumnValue("serviceId", v);
+  public set primaryEntityId(v: ObjectID | undefined) {
+    this.setColumnValue("primaryEntityId", v);
   }
 
-  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 set serviceType(v: ServiceType | undefined) {
-    this.setColumnValue("serviceType", v);
+  public set primaryEntityType(v: ServiceType | undefined) {
+    this.setColumnValue("primaryEntityType", v);
   }
 
   public get profileId(): string | undefined {
@@ -839,6 +952,14 @@ export default class Profile 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 sampleCount(): number | undefined {
     return this.getColumnValue("sampleCount") as number | undefined;
   }