feat: update migration for index creation and refactor TelemetryUtil usage in OtelIngest

Author: simlarsen

Common/Server/Infrastructure/Postgres/SchemaMigrations/1743521461137-MigrationName.ts

@@ -1,16 +1,23 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
 export class MigrationName1743521461137 implements MigrationInterface {
-    public name = 'MigrationName1743521461137'
+  public name = "MigrationName1743521461137";
 
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`CREATE INDEX "IDX_b2dd2b4597d3514ee4209ccd69" ON "Label" ("name") `);
-        await queryRunner.query(`CREATE INDEX "IDX_2dfba2253270684804431fd3c8" ON "MetricType" ("name") `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        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}}}'`);
-    }
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE INDEX "IDX_b2dd2b4597d3514ee4209ccd69" ON "Label" ("name") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_2dfba2253270684804431fd3c8" ON "MetricType" ("name") `,
+    );
+  }
 
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    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}}}'`,
+    );
+  }
 }

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

@@ -253,5 +253,5 @@ export default [
   MigrationName1743006662678,
   MigrationName1743186793413,
   MigrationName1743518485566,
-  MigrationName1743521461137
+  MigrationName1743521461137,
 ];

Common/Server/Utils/Monitor/MonitorResource.ts

@@ -964,16 +964,16 @@ export default class MonitorResourceUtil {
     });
 
     // Metric name to serviceId map
-      // example: "cpu.usage" -> [serviceId1, serviceId2]
-      // since these are monitor metrics. They dont belong to any service so we can keep the array empty. 
-      const metricNameServiceNameMap: Dictionary<Array<ObjectID>> = {};
-
-      for(const metric of itemsToSave) {
-        const metricName: string = metric.name!;
-        if(!metricNameServiceNameMap[metricName]) {
-          metricNameServiceNameMap[metricName] = [];
-        }
+    // example: "cpu.usage" -> [serviceId1, serviceId2]
+    // since these are monitor metrics. They dont belong to any service so we can keep the array empty.
+    const metricNameServiceNameMap: Dictionary<Array<ObjectID>> = {};
+
+    for (const metric of itemsToSave) {
+      const metricName: string = metric.name!;
+      if (!metricNameServiceNameMap[metricName]) {
+        metricNameServiceNameMap[metricName] = [];
       }
+    }
 
     // index metrics
     TelemetryUtil.indexMetricNameServiceNameMap({

Common/Server/Utils/Telemetry/Telemetry.ts

@@ -51,9 +51,9 @@ export default class TelemetryUtil {
 
         for (const telemetryServiceId of telemetryServicesInMap) {
           if (
-            !telemetryServiceIds.filter((serviceId: ObjectID) => {
+            telemetryServiceIds.filter((serviceId: ObjectID) => {
               return serviceId.toString() === telemetryServiceId.toString();
-            }).length
+            }).length === 0
           ) {
             isSame = false;
             // add the service id to the list
@@ -68,7 +68,7 @@ export default class TelemetryUtil {
         if (!isSame) {
           // update metric type
           await MetricTypeService.updateOneById({
-            _id: metricType.id!,
+            id: metricType.id!,
             data: {
               telemetryServices: metricType.telemetryServices || [],
             },

OpenTelemetryIngest/Services/OtelIngest.ts

@@ -441,6 +441,14 @@ export default class OtelIngestService {
         }
       }
 
+      TelemetryUtil.indexMetricNameServiceNameMap({
+        metricNameServiceNameMap: metricNameServiceNameMap,
+        projectId: (req as TelemetryRequest).projectId,
+      }).catch((err: Error) => {
+        logger.error("Error indexing metric name service name map");
+        logger.error(err);
+      });
+
       await Promise.all([
         MetricService.createMany({
           items: dbMetrics,
@@ -453,10 +461,6 @@ export default class OtelIngestService {
           projectId: (req as TelemetryRequest).projectId,
           telemetryType: TelemetryType.Metric,
         }),
-        TelemetryUtil.indexMetricNameServiceNameMap({
-          metricNameServiceNameMap: metricNameServiceNameMap,
-          projectId: (req as TelemetryRequest).projectId,
-        }),
         OTelIngestService.recordDataIngestedUsgaeBilling({
           services: serviceDictionary,
           projectId: (req as TelemetryRequest).projectId,