@oneuptime/common 10.8.2 → 11.0.1

package/Models/DatabaseModels/TelemetryException.ts

@@ -68,14 +68,14 @@ import RumApplication from "./RumApplication";
     "List of all Telemetry Exceptions created for the telemetry service for this OneUptime project and it's status.",
 })
 /*
- * serviceId is polymorphic (see the column below) — it may reference a
+ * primaryEntityId is polymorphic (see the column below) — it may reference a
  * Service, Host, DockerHost or KubernetesCluster, or be the projectId for
  * unattributed (Unknown) telemetry. Owned scope unions ownership across all
  * of those resource types, and includeProjectScope lets in-project users
  * see the unattributed bucket (which has no owner resource).
  */
 @OwnedThrough(
-  "serviceId",
+  "primaryEntityId",
   [
     Service,
     Host,
@@ -97,12 +97,12 @@ import RumApplication from "./RumApplication";
  * Composite uniqueness on the dedup key used by the OTel traces ingest
  * batched upsert. The ingest path collapses every exception event in a
  * worker batch into a single INSERT … ON CONFLICT (projectId,
- * serviceId, fingerprint) DO UPDATE statement; this index is what makes
+ * primaryEntityId, fingerprint) DO UPDATE statement; this index is what makes
  * that conflict target resolvable and stops two concurrent workers from
  * racing the old findOneBy + update path into duplicate rows or lost
  * occuranceCount increments.
  */
-@Index(["projectId", "serviceId", "fingerprint"], { unique: true })
+@Index(["projectId", "primaryEntityId", "fingerprint"], { unique: true })
 export default class TelemetryException extends DatabaseBaseModel {
   @ColumnAccessControl({
     create: [
@@ -179,13 +179,13 @@ export default class TelemetryException extends DatabaseBaseModel {
   public projectId?: ObjectID = undefined;
 
   /*
-   * serviceId is polymorphic (disambiguated by serviceType, mirroring the
+   * primaryEntityId is polymorphic (disambiguated by primaryEntityType, mirroring the
    * ClickHouse ExceptionInstance rows): it can be a real Service, a Host /
    * DockerHost / KubernetesCluster id, or the projectId for unattributed
    * (Unknown) telemetry. There is intentionally NO @ManyToOne(Service)
    * relation — a Service join would only resolve OpenTelemetry rows and
-   * silently null out everything else. The read side resolves serviceId +
-   * serviceType to a resource per type (TelemetryServiceUtil) instead.
+   * silently null out everything else. The read side resolves primaryEntityId +
+   * primaryEntityType to a resource per type (TelemetryServiceUtil) instead.
    */
   @ColumnAccessControl({
     create: [
@@ -215,7 +215,7 @@ export default class TelemetryException extends DatabaseBaseModel {
     required: true,
     title: "Service ID",
     description:
-      "ID of the resource this exception belongs to (Service / Host / DockerHost / KubernetesCluster, or the projectId for unattributed telemetry — disambiguated by serviceType).",
+      "ID of the resource this exception belongs to (Service / Host / DockerHost / KubernetesCluster, or the projectId for unattributed telemetry — disambiguated by primaryEntityType).",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @Column({
@@ -223,7 +223,7 @@ export default class TelemetryException extends DatabaseBaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceId?: ObjectID = undefined;
+  public primaryEntityId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
@@ -256,7 +256,7 @@ export default class TelemetryException extends DatabaseBaseModel {
     type: ColumnType.ShortText,
     length: ColumnLength.ShortText,
   })
-  public serviceType?: ServiceType = undefined;
+  public primaryEntityType?: ServiceType = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/TelemetryUsageBilling.ts

@@ -257,7 +257,7 @@ export default class TelemetryUsageBilling extends BaseModel {
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "serviceId",
+    manyToOneRelationColumn: "primaryEntityId",
     type: TableColumnType.Entity,
     modelType: Service,
     title: "Service",
@@ -274,7 +274,7 @@ export default class TelemetryUsageBilling extends BaseModel {
       /*
        * No DB-level foreign key. Telemetry that arrives without a
        * service.name is metered against a synthetic "unattributed"
-       * bucket whose serviceId is the projectId (ServiceType.Unknown),
+       * bucket whose primaryEntityId is the projectId (ServiceType.Unknown),
        * which has no matching Service row — a FK would reject those
        * billing rows. The relation is kept for read-side joins; it
        * resolves to null for the unattributed bucket and the UI renders
@@ -283,7 +283,7 @@ export default class TelemetryUsageBilling extends BaseModel {
       createForeignKeyConstraints: false,
     },
   )
-  @JoinColumn({ name: "serviceId" })
+  @JoinColumn({ name: "primaryEntityId" })
   public service?: Service = undefined;
 
   @ColumnAccessControl({
@@ -308,7 +308,7 @@ export default class TelemetryUsageBilling extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceId?: ObjectID = undefined;
+  public primaryEntityId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [],
@@ -332,7 +332,7 @@ export default class TelemetryUsageBilling extends BaseModel {
     type: ColumnType.ShortText,
     length: ColumnLength.ShortText,
   })
-  public serviceType?: ServiceType = undefined;
+  public primaryEntityType?: ServiceType = undefined;
 
   @ColumnAccessControl({
     create: [],

package/Server/API/AIAgentDataAPI.ts

@@ -175,8 +175,8 @@ export default class AIAgentDataAPI {
                 stackTrace: true,
                 exceptionType: true,
                 fingerprint: true,
-                serviceId: true,
-                serviceType: true,
+                primaryEntityId: true,
+                primaryEntityType: true,
               },
               props: {
                 isRoot: true,
@@ -197,15 +197,15 @@ export default class AIAgentDataAPI {
           );
 
           /*
-           * serviceId is polymorphic — resolve the Service only when it is
+           * primaryEntityId is polymorphic — resolve the Service only when it is
            * a real Service. findOneById returns null for Host / DockerHost /
            * KubernetesCluster / unattributed serviceIds (they aren't
            * Services), preserving the previous "name only for real
            * services" behaviour without the dropped ORM relation.
            */
-          const exceptionService: Service | null = exception.serviceId
+          const exceptionService: Service | null = exception.primaryEntityId
             ? await ServiceService.findOneById({
-                id: exception.serviceId,
+                id: exception.primaryEntityId,
                 select: {
                   name: true,
                   description: true,
@@ -224,9 +224,9 @@ export default class AIAgentDataAPI {
               exceptionType: exception.exceptionType,
               fingerprint: exception.fingerprint,
             },
-            service: exception.serviceId
+            service: exception.primaryEntityId
               ? {
-                  id: exception.serviceId.toString(),
+                  id: exception.primaryEntityId.toString(),
                   name: exceptionService?.name,
                   description: exceptionService?.description,
                 }
@@ -260,8 +260,9 @@ export default class AIAgentDataAPI {
             );
           }
 
-          // Get service ID (supports both serviceId and legacy telemetryServiceId)
+          // Get service ID (supports primaryEntityId plus legacy serviceId / telemetryServiceId from older agents)
           const serviceIdParam: string | undefined =
+            (data["primaryEntityId"] as string) ||
             (data["serviceId"] as string) ||
             (data["telemetryServiceId"] as string);
 
@@ -269,11 +270,11 @@ export default class AIAgentDataAPI {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadDataException("serviceId is required"),
+              new BadDataException("primaryEntityId is required"),
             );
           }
 
-          const serviceId: ObjectID = new ObjectID(serviceIdParam);
+          const primaryEntityId: ObjectID = new ObjectID(serviceIdParam);
 
           // Find CodeRepositories linked to this Service
           const repositories: Array<{
@@ -290,7 +291,7 @@ export default class AIAgentDataAPI {
           const serviceCodeRepositories: Array<ServiceCodeRepository> =
             await ServiceCodeRepositoryService.findBy({
               query: {
-                serviceId: serviceId,
+                serviceId: primaryEntityId,
               },
               select: {
                 codeRepositoryId: true,
@@ -347,7 +348,7 @@ export default class AIAgentDataAPI {
           }
 
           logger.debug(
-            `Found ${repositories.length} code repositories for service ${serviceId.toString()}`,
+            `Found ${repositories.length} code repositories for service ${primaryEntityId.toString()}`,
             getLogAttributesFromRequest(req as any),
           );
 

package/Server/API/DashboardAPI.ts

@@ -222,7 +222,7 @@ const PUBLIC_DASHBOARD_RESOURCES: Record<
       traceId: true,
       spanId: true,
       kind: true,
-      serviceId: true,
+      primaryEntityId: true,
     },
   },
   log: {
@@ -232,7 +232,7 @@ const PUBLIC_DASHBOARD_RESOURCES: Record<
       time: true,
       severityText: true,
       body: true,
-      serviceId: true,
+      primaryEntityId: true,
       traceId: true,
       spanId: true,
       attributes: true,