@oneuptime/common 10.8.2 → 11.0.1

package/Server/API/TelemetryExceptionAPI.ts

@@ -215,8 +215,8 @@ export default class TelemetryExceptionAPI extends BaseAPI<
          * per serviceType (no Service relation to serialize anymore).
          */
         return {
-          serviceId: entry.serviceId,
-          serviceType: entry.serviceType,
+          primaryEntityId: entry.primaryEntityId,
+          primaryEntityType: entry.primaryEntityType,
           unresolvedCount: entry.unresolvedCount,
           totalOccurrences: entry.totalOccurrences,
         };

package/Server/Infrastructure/ClickhouseConfig.ts

@@ -35,6 +35,18 @@ const options: ClickHouseClientConfigOptions = {
    * (a) a slow query still has headroom and (b) nginx never hits its
    * upstream timeout first. Per-query SETTINGS max_execution_time on
    * aggregation statements provides the hard server-side cap.
+   *
+   * NOTE: the client enforces this as a socket IDLE timer
+   * (socket.setTimeout -> request.destroy()), not a wall-clock cap: it
+   * fires only after 58s with NO bytes received. An HTTP INSERT...SELECT
+   * returns zero bytes until it completes, so any such statement that
+   * needs longer MUST pass per-call clickhouse_settings
+   * send_progress_in_http_headers (+ http_headers_progress_interval_ms)
+   * — the streamed X-ClickHouse-Progress header lines keep the socket
+   * non-idle (see AnalyticsDatabaseService.ClickhouseExecuteOptions and
+   * the telemetry V3 backfill engine, which do exactly that). Verified
+   * empirically on dev: an 80s INSERT...SELECT is destroyed at exactly
+   * 58s without progress headers and completes with them.
    */
   request_timeout: 58_000,
   /*

package/Server/Infrastructure/Postgres/SchemaMigrations/1781100000001-RenameTelemetryServiceIdToPrimaryEntityId.ts

@@ -0,0 +1,48 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Renames the polymorphic primary-entity columns on the two Postgres
+ * telemetry tables from `serviceId`/`serviceType` to
+ * `primaryEntityId`/`primaryEntityType`, mirroring the analytics-model
+ * rename (see Internal/Docs/RenameServiceIdToPrimaryEntityId.md).
+ *
+ * Postgres `RENAME COLUMN` automatically updates dependent objects
+ * (the `TelemetryException` unique index on
+ * (projectId, serviceId, fingerprint) and the `TelemetryUsageBilling`
+ * FK/JoinColumn), so no index/constraint drop+recreate is required.
+ */
+export class RenameTelemetryServiceIdToPrimaryEntityId1781100000001
+  implements MigrationInterface
+{
+  public name = "RenameTelemetryServiceIdToPrimaryEntityId1781100000001";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" RENAME COLUMN "serviceId" TO "primaryEntityId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" RENAME COLUMN "serviceType" TO "primaryEntityType"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryUsageBilling" RENAME COLUMN "serviceId" TO "primaryEntityId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryUsageBilling" RENAME COLUMN "serviceType" TO "primaryEntityType"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryUsageBilling" RENAME COLUMN "primaryEntityType" TO "serviceType"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryUsageBilling" RENAME COLUMN "primaryEntityId" TO "serviceId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" RENAME COLUMN "primaryEntityType" TO "serviceType"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryException" RENAME COLUMN "primaryEntityId" TO "serviceId"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1781200000000-AddTelemetryEntityTable.ts

@@ -0,0 +1,70 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Phase 2 of the OpenTelemetry entity model
+ * (Internal/Docs/OpenTelemetryEntities.md): the generalized, polymorphic
+ * `TelemetryEntity` registry. One row per (projectId, entityType,
+ * entityKey) — a service / host / k8s.pod / container / ... discovered from
+ * telemetry resource attributes and reconciled forward-only (no backfill)
+ * at ingest. The unique (projectId, entityType, entityKey) index is the
+ * upsert conflict target for the throttled ingest reconciler.
+ */
+export class AddTelemetryEntityTable1781200000000
+  implements MigrationInterface
+{
+  public name = "AddTelemetryEntityTable1781200000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "TelemetryEntity" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "entityType" character varying(100) NOT NULL, "entityKey" character varying(100) NOT NULL, "displayName" character varying(100), "identifyingAttributes" jsonb, "descriptiveAttributes" jsonb, "resourceType" character varying(100), "resourceId" uuid, "firstSeenAt" TIMESTAMP WITH TIME ZONE, "lastSeenAt" TIMESTAMP WITH TIME ZONE, "createdByUserId" uuid, "deletedByUserId" uuid, CONSTRAINT "PK_TelemetryEntity" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_projectId" ON "TelemetryEntity" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_proj_type" ON "TelemetryEntity" ("projectId", "entityType") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_proj_resource" ON "TelemetryEntity" ("projectId", "resourceType", "resourceId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_lastSeenAt" ON "TelemetryEntity" ("lastSeenAt") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "UQ_TelemetryEntity_proj_type_key" ON "TelemetryEntity" ("projectId", "entityType", "entityKey") `,
+    );
+
+    /*
+     * resourceId is polymorphic (discriminated by resourceType), so it
+     * intentionally has no FK.
+     */
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" ADD CONSTRAINT "FK_TelemetryEntity_project" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" ADD CONSTRAINT "FK_TelemetryEntity_createdBy" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" ADD CONSTRAINT "FK_TelemetryEntity_deletedBy" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."UQ_TelemetryEntity_proj_type_key"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_lastSeenAt"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_proj_resource"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_proj_type"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_projectId"`,
+    );
+    await queryRunner.query(`DROP TABLE "TelemetryEntity"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1781200000001-AddTelemetryEntityRelationshipTable.ts

@@ -0,0 +1,57 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Phase 5 of the OpenTelemetry entity model
+ * (Internal/Docs/OpenTelemetryEntities.md §4): the `TelemetryEntityRelationship`
+ * topology graph. One row per directed co-occurrence edge
+ * (projectId, fromEntityKey, toEntityKey, relationshipType) — "pod runs-on
+ * node", "service hosted-on host", etc. Reconciled forward-only (no backfill)
+ * at ingest; the unique index is the upsert conflict target.
+ */
+export class AddTelemetryEntityRelationshipTable1781200000001
+  implements MigrationInterface
+{
+  public name = "AddTelemetryEntityRelationshipTable1781200000001";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "TelemetryEntityRelationship" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "fromEntityKey" character varying(100) NOT NULL, "toEntityKey" character varying(100) NOT NULL, "relationshipType" character varying(100) NOT NULL, "firstSeenAt" TIMESTAMP WITH TIME ZONE, "lastSeenAt" TIMESTAMP WITH TIME ZONE, "createdByUserId" uuid, "deletedByUserId" uuid, CONSTRAINT "PK_TelemetryEntityRelationship" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_projectId" ON "TelemetryEntityRelationship" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_proj_from" ON "TelemetryEntityRelationship" ("projectId", "fromEntityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_proj_to" ON "TelemetryEntityRelationship" ("projectId", "toEntityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_lastSeenAt" ON "TelemetryEntityRelationship" ("lastSeenAt") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "UQ_TelEntityRel_edge" ON "TelemetryEntityRelationship" ("projectId", "fromEntityKey", "toEntityKey", "relationshipType") `,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" ADD CONSTRAINT "FK_TelEntityRel_project" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" ADD CONSTRAINT "FK_TelEntityRel_createdBy" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" ADD CONSTRAINT "FK_TelEntityRel_deletedBy" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "public"."UQ_TelEntityRel_edge"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelEntityRel_lastSeenAt"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."IDX_TelEntityRel_proj_to"`);
+    await queryRunner.query(`DROP INDEX "public"."IDX_TelEntityRel_proj_from"`);
+    await queryRunner.query(`DROP INDEX "public"."IDX_TelEntityRel_projectId"`);
+    await queryRunner.query(`DROP TABLE "TelemetryEntityRelationship"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1781250074195-MigrationName.ts

@@ -0,0 +1,207 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1781250074195 implements MigrationInterface {
+  public name = "MigrationName1781250074195";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_08a0cfa9f184257b1e57da4cf5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_1f55d43a0b73e883bb226158c7"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_b9f49cd8318a35757fc843ee90"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_projectId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_proj_type"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_proj_resource"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelemetryEntity_lastSeenAt"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."UQ_TelemetryEntity_proj_type_key"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."IDX_TelEntityRel_projectId"`);
+    await queryRunner.query(`DROP INDEX "public"."IDX_TelEntityRel_proj_from"`);
+    await queryRunner.query(`DROP INDEX "public"."IDX_TelEntityRel_proj_to"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_TelEntityRel_lastSeenAt"`,
+    );
+    await queryRunner.query(`DROP INDEX "public"."UQ_TelEntityRel_edge"`);
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_bdfcf0032c1141eaeeafccd418" ON "TelemetryException" ("primaryEntityId") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_812052e3d9ff70b549b2cd40e7" ON "TelemetryException" ("projectId", "primaryEntityId", "fingerprint") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_c57a34423f8ee379eaea4779fc" ON "TelemetryUsageBilling" ("primaryEntityId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_4e1ef427f431558a59263d6463" ON "TelemetryEntity" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6f5b6d2bb634b2396f2dee6ab1" ON "TelemetryEntity" ("lastSeenAt") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_64e28273ad4bc2543316ef82d2" ON "TelemetryEntity" ("projectId", "resourceType", "resourceId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_e2ad53c6527cd8d74a63d2fda7" ON "TelemetryEntity" ("projectId", "entityType") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_cd0b36552d8224cbb200eedc4e" ON "TelemetryEntity" ("projectId", "entityType", "entityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_69e77606b8cd6b0a340b561ee8" ON "TelemetryEntityRelationship" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_ff3c08f70cd90cd30909ab4508" ON "TelemetryEntityRelationship" ("lastSeenAt") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_0207b1a581cc3b588835a526f5" ON "TelemetryEntityRelationship" ("projectId", "toEntityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_cf1de4c74c6034f957103e6434" ON "TelemetryEntityRelationship" ("projectId", "fromEntityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_1b26aa0f1dc0856218b446b82e" ON "TelemetryEntityRelationship" ("projectId", "fromEntityKey", "toEntityKey", "relationshipType") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" ADD CONSTRAINT "FK_4e1ef427f431558a59263d6463d" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" ADD CONSTRAINT "FK_5c79b80b19265b19b2f40b3f6bb" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" ADD CONSTRAINT "FK_28d95749a9f6f712448c371eb7d" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" ADD CONSTRAINT "FK_69e77606b8cd6b0a340b561ee88" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" ADD CONSTRAINT "FK_e3bcf3792c0290f28e0c151ff61" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" ADD CONSTRAINT "FK_358f60285a6b280da4b7ce1703d" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" DROP CONSTRAINT "FK_358f60285a6b280da4b7ce1703d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" DROP CONSTRAINT "FK_e3bcf3792c0290f28e0c151ff61"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntityRelationship" DROP CONSTRAINT "FK_69e77606b8cd6b0a340b561ee88"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" DROP CONSTRAINT "FK_28d95749a9f6f712448c371eb7d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" DROP CONSTRAINT "FK_5c79b80b19265b19b2f40b3f6bb"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" DROP CONSTRAINT "FK_4e1ef427f431558a59263d6463d"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_1b26aa0f1dc0856218b446b82e"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_cf1de4c74c6034f957103e6434"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0207b1a581cc3b588835a526f5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_ff3c08f70cd90cd30909ab4508"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_69e77606b8cd6b0a340b561ee8"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_cd0b36552d8224cbb200eedc4e"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_e2ad53c6527cd8d74a63d2fda7"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_64e28273ad4bc2543316ef82d2"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_6f5b6d2bb634b2396f2dee6ab1"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_4e1ef427f431558a59263d6463"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_c57a34423f8ee379eaea4779fc"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_812052e3d9ff70b549b2cd40e7"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_bdfcf0032c1141eaeeafccd418"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "UQ_TelEntityRel_edge" ON "TelemetryEntityRelationship" ("projectId", "fromEntityKey", "toEntityKey", "relationshipType") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_lastSeenAt" ON "TelemetryEntityRelationship" ("lastSeenAt") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_proj_to" ON "TelemetryEntityRelationship" ("projectId", "toEntityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_proj_from" ON "TelemetryEntityRelationship" ("projectId", "fromEntityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelEntityRel_projectId" ON "TelemetryEntityRelationship" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "UQ_TelemetryEntity_proj_type_key" ON "TelemetryEntity" ("projectId", "entityType", "entityKey") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_lastSeenAt" ON "TelemetryEntity" ("lastSeenAt") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_proj_resource" ON "TelemetryEntity" ("projectId", "resourceType", "resourceId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_proj_type" ON "TelemetryEntity" ("projectId", "entityType") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_TelemetryEntity_projectId" ON "TelemetryEntity" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_b9f49cd8318a35757fc843ee90" ON "TelemetryUsageBilling" ("primaryEntityId") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_1f55d43a0b73e883bb226158c7" ON "TelemetryException" ("projectId", "primaryEntityId", "fingerprint") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_08a0cfa9f184257b1e57da4cf5" ON "TelemetryException" ("primaryEntityId") `,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1781300000000-AddTelemetryEntityLabels.ts

@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Entity model phase 2 follow-up (Internal/Docs/OpenTelemetryEntities.md):
+ * `TelemetryEntity.labels` — labels observed on the entity's telemetry
+ * (e.g. promoted from `oneuptime.label.*` resource attributes), merged as
+ * a set union by the ingest reconciler. Simple jsonb string array in v1;
+ * a relation to the Label table is a follow-up.
+ */
+export class AddTelemetryEntityLabels1781300000000
+  implements MigrationInterface
+{
+  public name = "AddTelemetryEntityLabels1781300000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "TelemetryEntity" ADD "labels" jsonb`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryEntity" DROP COLUMN "labels"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1781400000000-AddServiceTelemetrySdkLanguage.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Adds Service.telemetrySdkLanguage (the telemetry.sdk.language resource
+ * attribute, e.g. java / dotnet / nodejs / python / go). Stamped at ingest
+ * alongside the other system-managed resource-attribute columns and used
+ * to pick technology-specific golden metrics on the service overview page.
+ */
+export class AddServiceTelemetrySdkLanguage1781400000000
+  implements MigrationInterface
+{
+  public name = "AddServiceTelemetrySdkLanguage1781400000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Service" ADD "telemetrySdkLanguage" character varying(100)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Service" DROP COLUMN "telemetrySdkLanguage"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -379,6 +379,12 @@ import { AddTelemetryResourceInventoryTables1780941762204 } from "./178094176220
 import { AddRumApplicationSdkLanguage1780985763463 } from "./1780985763463-AddRumApplicationSdkLanguage";
 import { RecastCloudResourcesByEnvironment1780987192743 } from "./1780987192743-RecastCloudResourcesByEnvironment";
 import { MigrationName1781011482945 } from "./1781011482945-MigrationName";
+import { RenameTelemetryServiceIdToPrimaryEntityId1781100000001 } from "./1781100000001-RenameTelemetryServiceIdToPrimaryEntityId";
+import { AddTelemetryEntityTable1781200000000 } from "./1781200000000-AddTelemetryEntityTable";
+import { AddTelemetryEntityRelationshipTable1781200000001 } from "./1781200000001-AddTelemetryEntityRelationshipTable";
+import { MigrationName1781250074195 } from "./1781250074195-MigrationName";
+import { AddTelemetryEntityLabels1781300000000 } from "./1781300000000-AddTelemetryEntityLabels";
+import { AddServiceTelemetrySdkLanguage1781400000000 } from "./1781400000000-AddServiceTelemetrySdkLanguage";
 
 export default [
   InitialMigration,
@@ -762,4 +768,10 @@ export default [
   AddRumApplicationSdkLanguage1780985763463,
   RecastCloudResourcesByEnvironment1780987192743,
   MigrationName1781011482945,
+  RenameTelemetryServiceIdToPrimaryEntityId1781100000001,
+  AddTelemetryEntityTable1781200000000,
+  AddTelemetryEntityRelationshipTable1781200000001,
+  AddTelemetryEntityLabels1781300000000,
+  AddServiceTelemetrySdkLanguage1781400000000,
+  MigrationName1781250074195,
 ];

package/Server/Infrastructure/Queue.ts

@@ -199,6 +199,26 @@ export default class Queue {
        * Sleep component's durable resume).
        */
       delayInMs?: number | undefined;
+      /**
+       * Total number of times BullMQ runs the job before marking it
+       * failed (1 = no retries). Defaults to 3 for the Telemetry queue
+       * (consumers there are idempotent via insert dedup tokens) and 1
+       * everywhere else, preserving prior behavior.
+       */
+      attempts?: number | undefined;
+      /**
+       * Base delay in milliseconds for exponential backoff between
+       * attempts (delay * 2^attempt). Only used when attempts > 1.
+       */
+      backoffDelayInMs?: number | undefined;
+      /**
+       * Skip the getJob()+remove() round trips that guard against
+       * duplicate job ids. Safe (and two Redis calls cheaper per
+       * enqueue) when the caller's job ids are globally unique, e.g.
+       * the telemetry enqueue path which suffixes ids with a unix-nano
+       * timestamp.
+       */
+      skipExistenceCheck?: boolean | undefined;
     },
   ): Promise<Job> {
     const sanitizedJobId: string = this.sanitizeJobId(jobId.toString());
@@ -211,6 +231,17 @@ export default class Queue {
       optionsObject.delay = options.delayInMs;
     }
 
+    const attempts: number =
+      options?.attempts ?? (queueName === QueueName.Telemetry ? 3 : 1);
+
+    if (attempts > 1) {
+      optionsObject.attempts = attempts;
+      optionsObject.backoff = {
+        type: "exponential",
+        delay: options?.backoffDelayInMs ?? 5000,
+      };
+    }
+
     const queue: BullQueue = this.getQueue(queueName);
 
     if (options && options.scheduleAt) {
@@ -233,10 +264,12 @@ export default class Queue {
       }
     }
 
-    const job: Job | undefined = await queue.getJob(sanitizedJobId);
+    if (!options?.skipExistenceCheck) {
+      const job: Job | undefined = await queue.getJob(sanitizedJobId);
 
-    if (job) {
-      await job.remove();
+      if (job) {
+        await job.remove();
+      }
     }
 
     if (options?.repeatableKey) {

package/Server/Middleware/TelemetryIngest.ts

@@ -1,4 +1,4 @@
-import BadRequestException from "../../Types/Exception/BadRequestException";
+import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException";
 import ProductType from "../../Types/MeteredPlan/ProductType";
 import ObjectID from "../../Types/ObjectID";
 import {
@@ -27,8 +27,6 @@ export default class TelemetryIngest {
     try {
       // check header.
 
-      const isOpenTelemetryAPI: boolean = req.path.includes("/otlp/v1");
-
       let oneuptimeToken: string | undefined = req.headers[
         "x-oneuptime-token"
       ] as string | undefined;
@@ -53,15 +51,20 @@ export default class TelemetryIngest {
           getLogAttributesFromRequest(req as any),
         );
 
-        if (isOpenTelemetryAPI) {
-          /*
-           * then accept the response and return success.
-           * do not return error because it causes Otel to retry the request.
-           */
-          return Response.sendEmptySuccessResponse(req, res);
-        }
-
-        throw new BadRequestException("Missing header: x-oneuptime-token");
+        /*
+         * 401 is deliberate: the OTLP spec classifies it as
+         * non-retryable, so compliant SDKs / collectors surface the
+         * error in their own logs instead of retry-storming. A silent
+         * 200 here would make the client believe the data landed and
+         * leave the user staring at empty dashboards with no clue why.
+         */
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException(
+            "Missing ingestion token. Send your OneUptime telemetry ingestion key in the x-oneuptime-token header.",
+          ),
+        );
       }
 
       const projectId: ObjectID | null =
@@ -75,16 +78,18 @@ export default class TelemetryIngest {
           getLogAttributesFromRequest(req as any),
         );
 
-        if (isOpenTelemetryAPI) {
-          /*
-           * then accept the response and return success.
-           * do not return error because it causes Otel to retry the request.
-           */
-          return Response.sendEmptySuccessResponse(req, res);
-        }
-
-        throw new BadRequestException(
-          "Invalid service token: " + oneuptimeToken,
+        /*
+         * 401 is deliberate (see the missing-token branch above): a
+         * silent 200 drops the payload while the client believes the
+         * export succeeded. The token value is logged server-side but
+         * intentionally not echoed back in the response body.
+         */
+        return Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthenticatedException(
+            "Invalid ingestion token. Send a valid OneUptime telemetry ingestion key in the x-oneuptime-token header.",
+          ),
         );
       }