mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-12 13:27:31 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(core): Expand Prometheus coverage to all routes (#10113)

Browse source
This commit is contained in:
Iván Ovejero 2024-07-19 13:27:08 +02:00 committed by GitHub
parent 9ab29f2181
commit d35ee109ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
View file

@ -106,7 +106,16 @@ describe('PrometheusMetricsService', () => {
}); });
expect(app.use).toHaveBeenCalledWith( 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), expect.any(Function),
); );
}); });

17
packages/cli/src/metrics/prometheus-metrics.service.ts
View file

@ -47,7 +47,7 @@ export class PrometheusMetricsService {
this.initN8nVersionMetric(); this.initN8nVersionMetric();
this.initCacheMetrics(); this.initCacheMetrics();
this.initEventBusMetrics(); this.initEventBusMetrics();
this.initApiMetrics(app); this.initRouteMetrics(app);
this.mountMetricsEndpoint(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; if (!this.includes.metrics.api) return;
const metricsMiddleware = promBundle({ const metricsMiddleware = promBundle({
@ -109,7 +109,16 @@ export class PrometheusMetricsService {
}); });
app.use( app.use(
['/rest/', '/webhook/', '/webhook-waiting/', '/form-waiting/', '/webhook-test/', '/api/'], [
'/rest/',
'/api/',
'/webhook/',
'/webhook-waiting/',
'/webhook-test/',
'/form/',
'/form-waiting/',
'/form-test/',
],
metricsMiddleware, metricsMiddleware,
); );
} }