From d35ee109ea489165f312110a0cfd3e81075fe38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 19 Jul 2024 13:27:08 +0200
Subject: [PATCH] refactor(core): Expand Prometheus coverage to all routes
 (#10113)

---
 .../prometheus-metrics.service.test.ts          | 11 ++++++++++-
 .../src/metrics/prometheus-metrics.service.ts   | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
index 3c90d154c..1c1f2f8b0 100644
--- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
+++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
@@ -106,7 +106,16 @@ describe('PrometheusMetricsService', () => {
 			});
 
 			expect(app.use).toHaveBeenCalledWith(
-				['/rest/', '/webhook/', '/webhook-waiting/', '/form-waiting/', '/webhook-test/', '/api/'],
+				[
+					'/rest/',
+					'/api/',
+					'/webhook/',
+					'/webhook-waiting/',
+					'/webhook-test/',
+					'/form/',
+					'/form-waiting/',
+					'/form-test/',
+				],
 				expect.any(Function),
 			);
 		});
diff --git a/packages/cli/src/metrics/prometheus-metrics.service.ts b/packages/cli/src/metrics/prometheus-metrics.service.ts
index 2c3e66b04..1c22238f4 100644
--- a/packages/cli/src/metrics/prometheus-metrics.service.ts
+++ b/packages/cli/src/metrics/prometheus-metrics.service.ts
@@ -47,7 +47,7 @@ export class PrometheusMetricsService {
 		this.initN8nVersionMetric();
 		this.initCacheMetrics();
 		this.initEventBusMetrics();
-		this.initApiMetrics(app);
+		this.initRouteMetrics(app);
 		this.mountMetricsEndpoint(app);
 	}
 
@@ -95,9 +95,9 @@ export class PrometheusMetricsService {
 	}
 
 	/**
-	 * Set up metrics for API endpoints with `express-prom-bundle`
+	 * Set up metrics for server routes with `express-prom-bundle`
 	 */
-	private initApiMetrics(app: express.Application) {
+	private initRouteMetrics(app: express.Application) {
 		if (!this.includes.metrics.api) return;
 
 		const metricsMiddleware = promBundle({
@@ -109,7 +109,16 @@ export class PrometheusMetricsService {
 		});
 
 		app.use(
-			['/rest/', '/webhook/', '/webhook-waiting/', '/form-waiting/', '/webhook-test/', '/api/'],
+			[
+				'/rest/',
+				'/api/',
+				'/webhook/',
+				'/webhook-waiting/',
+				'/webhook-test/',
+				'/form/',
+				'/form-waiting/',
+				'/form-test/',
+			],
 			metricsMiddleware,
 		);
 	}