refact(map-metrics): collect map metrics on event instead of job (#250)

Author: sonikro

migrations/20260207175944_drop_server_id_from_server_status_metrics.ts

@@ -0,0 +1,16 @@
+import type { Knex } from "knex";
+
+
+export async function up(knex: Knex): Promise<void> {
+  await knex.schema.alterTable("server_status_metrics", (table) => {
+    table.dropColumn("server_id");
+  });
+}
+
+
+export async function down(knex: Knex): Promise<void> {
+  await knex.schema.alterTable("server_status_metrics", (table) => {
+    table.string("server_id").notNullable();
+  });
+}
+

packages/core/index.ts

@@ -36,7 +36,6 @@ export * from './src/services/StatusUpdater';
 export * from './src/services/TF2ServerReadinessService';
 
 // Use cases
-export * from './src/usecase/CollectServerMetrics';
 export * from './src/usecase/ConsumeCreditsFromRunningServers';
 export * from './src/usecase/CreateCreditsPurchaseOrder';
 export * from './src/usecase/CreateServerForUser';

packages/core/src/domain/ServerStatusMetric.ts

@@ -1,6 +1,5 @@
 export type ServerStatusMetric = {
     id?: number;
-    serverId: string;
     map: string;
     timestamp: Date;
 };

packages/core/src/usecase/CollectServerMetrics.test.ts

@@ -12,7 +12,6 @@ import { TerminateEmptyServers } from "@tf2qs/core";
 import { TerminateLongRunningServers } from "@tf2qs/core";
 import { TerminatePendingServers } from "@tf2qs/core";
 import { TerminateServersWithoutCredit } from "@tf2qs/core";
-import { CollectServerMetrics } from "@tf2qs/core";
 import { AWSCostProvider } from "@tf2qs/providers";
 import { OracleCostProvider } from "@tf2qs/providers";
 import { DefaultCostProvider } from "@tf2qs/providers";
@@ -45,7 +44,7 @@ import { defaultConfigManager } from "@tf2qs/providers";
 import { logger } from "@tf2qs/telemetry";
 import { createCommands } from "./commands";
 import { initializeExpress } from "./http/express";
-import { scheduleConsumeCreditsRoutine, scheduleMonthlyUsageReportRoutine, schedulePendingServerCleanupRoutine, scheduleServerCleanupRoutine, scheduleTerminateLongRunningServerRoutine, scheduleServerMetricsCollectionRoutine } from "./jobs";
+import { scheduleConsumeCreditsRoutine, scheduleMonthlyUsageReportRoutine, schedulePendingServerCleanupRoutine, scheduleServerCleanupRoutine, scheduleTerminateLongRunningServerRoutine } from "./jobs";
 import { scheduleTerminateServersWithoutCreditRoutine } from "./jobs/TerminateServersWithoutCreditRoutine";
 import { startSrcdsCommandListener } from "./udp/srcdsCommandListener";
 
@@ -279,15 +278,6 @@ export async function startDiscordBot() {
         discordClient: client,
     })
 
-    scheduleServerMetricsCollectionRoutine({
-        collectServerMetrics: new CollectServerMetrics({
-            serverRepository,
-            serverStatusMetricsRepository,
-            serverCommander,
-        }),
-        eventLogger,
-    })
-
     // Slash commands
     const commands = Object.values(discordCommands).map(command => command.definition)
 
@@ -378,7 +368,8 @@ export async function startDiscordBot() {
         userRepository,
         eventLogger,
         backgroundTaskQueue,
-        playerConnectionHistoryRepository
+        playerConnectionHistoryRepository,
+        serverStatusMetricsRepository
     });
 
     initializeExpress({})

packages/core/src/usecase/CollectServerMetrics.ts

@@ -2,5 +2,4 @@ export * from "./ServerCleanupRoutine"
 export * from "./ConsumeCreditsRoutine";
 export * from "./PendingServerCleanupRoutine";
 export * from "./TerminateLongRunningServerRoutine";
-export * from "./MonthlyUsageReportRoutine";
-export * from "./ServerMetricsCollectionRoutine";
+export * from "./MonthlyUsageReportRoutine";