mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-24 20:24:05 -08:00
feat(core): Add metrics option to cache (#6846)
* add metrics to cache * use events for metrics * pr comments / broken test * lint fix * update the test * improve tests * Update packages/cli/src/config/schema.ts * disable flaky test * lint fix --------- Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in> Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
This commit is contained in:
Michael Auerswald
GitHub
parent
fdfc6c5a92
commit
adcf5a96e8
|
|
@ -2,9 +2,6 @@
|
|||
/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
|
||||
/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
|
||||
/* eslint-disable prefer-const */
|
||||
|
||||
/* eslint-disable @typescript-eslint/restrict-template-expressions */
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-shadow */
|
||||
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
|
|
@ -143,7 +140,6 @@ import {
|
|||
isLdapLoginEnabled,
|
||||
} from './Ldap/helpers';
|
||||
import { AbstractServer } from './AbstractServer';
|
||||
import { configureMetrics } from './metrics';
|
||||
import { PostHogClient } from './posthog';
|
||||
import { eventBus } from './eventbus';
|
||||
import { Container } from 'typedi';
|
||||
|
|
@ -525,7 +521,11 @@ export class Server extends AbstractServer {
|
|||
}
|
||||
|
||||
async configure(): Promise<void> {
|
||||
configureMetrics(this.app);
|
||||
if (config.getEnv('endpoints.metrics.enable')) {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
const { MetricsService } = await import('@/services/metrics.service');
|
||||
await Container.get(MetricsService).configureMetrics(this.app);
|
||||
}
|
||||
|
||||
this.instanceId = await UserSettings.getInstanceId();
|
||||
|
||||
|
|
|
|||
|
|
@ -578,6 +578,18 @@ export const schema = {
|
|||
env: 'N8N_METRICS_INCLUDE_API_STATUS_CODE_LABEL',
|
||||
doc: 'Whether to include a label for the HTTP status code (200, 404, ...) of API invocations. Default: false',
|
||||
},
|
||||
includeCacheMetrics: {
|
||||
format: Boolean,
|
||||
default: false,
|
||||
env: 'N8N_METRICS_INCLUDE_CACHE_METRICS',
|
||||
doc: 'Whether to include metrics for cache hits and misses. Default: false',
|
||||
},
|
||||
includeMessageEventBusMetrics: {
|
||||
format: Boolean,
|
||||
default: true,
|
||||
env: 'N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS',
|
||||
doc: 'Whether to include metrics for events. Default: false',
|
||||
},
|
||||
},
|
||||
rest: {
|
||||
format: String,
|
||||
|
|
|
|||
|
|
@ -11,10 +11,7 @@ import { MessageEventBusLogWriter } from '../MessageEventBusWriter/MessageEventB
|
|||
import EventEmitter from 'events';
|
||||
import config from '@/config';
|
||||
import * as Db from '@/Db';
|
||||
import {
|
||||
messageEventBusDestinationFromDb,
|
||||
incrementPrometheusMetric,
|
||||
} from '../MessageEventBusDestination/Helpers.ee';
|
||||
import { messageEventBusDestinationFromDb } from '../MessageEventBusDestination/MessageEventBusDestinationFromDb';
|
||||
import uniqby from 'lodash/uniqBy';
|
||||
import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
|
||||
import type { EventMessageAuditOptions } from '../EventMessageClasses/EventMessageAudit';
|
||||
|
|
@ -29,6 +26,7 @@ import {
|
|||
eventMessageGenericDestinationTestEvent,
|
||||
} from '../EventMessageClasses/EventMessageGeneric';
|
||||
import { recoverExecutionDataFromEventLogMessages } from './recoverEvents';
|
||||
import { METRICS_EVENT_NAME } from '../MessageEventBusDestination/Helpers.ee';
|
||||
|
||||
export type EventMessageReturnMode = 'sent' | 'unsent' | 'all' | 'unfinished';
|
||||
|
||||
|
|
@ -224,9 +222,7 @@ export class MessageEventBus extends EventEmitter {
|
|||
}
|
||||
|
||||
private async emitMessage(msg: EventMessageTypes) {
|
||||
if (config.getEnv('endpoints.metrics.enable')) {
|
||||
await incrementPrometheusMetric(msg);
|
||||
}
|
||||
this.emit(METRICS_EVENT_NAME, msg);
|
||||
|
||||
// generic emit for external modules to capture events
|
||||
// this is for internal use ONLY and not for use with custom destinations!
|
||||
|
|
|
|||
|
|
@ -1,54 +1,23 @@
|
|||
import type { EventDestinations } from '@db/entities/EventDestinations';
|
||||
import { promClient } from '@/metrics';
|
||||
import {
|
||||
EventMessageTypeNames,
|
||||
LoggerProxy,
|
||||
MessageEventBusDestinationTypeNames,
|
||||
} from 'n8n-workflow';
|
||||
import { EventMessageTypeNames } from 'n8n-workflow';
|
||||
import config from '@/config';
|
||||
import type { EventMessageTypes } from '../EventMessageClasses';
|
||||
import type { MessageEventBusDestination } from './MessageEventBusDestination.ee';
|
||||
import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
|
||||
import { MessageEventBusDestinationSyslog } from './MessageEventBusDestinationSyslog.ee';
|
||||
import { MessageEventBusDestinationWebhook } from './MessageEventBusDestinationWebhook.ee';
|
||||
import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
|
||||
|
||||
export function messageEventBusDestinationFromDb(
|
||||
eventBusInstance: MessageEventBus,
|
||||
dbData: EventDestinations,
|
||||
): MessageEventBusDestination | null {
|
||||
const destinationData = dbData.destination;
|
||||
if ('__type' in destinationData) {
|
||||
switch (destinationData.__type) {
|
||||
case MessageEventBusDestinationTypeNames.sentry:
|
||||
return MessageEventBusDestinationSentry.deserialize(eventBusInstance, destinationData);
|
||||
case MessageEventBusDestinationTypeNames.syslog:
|
||||
return MessageEventBusDestinationSyslog.deserialize(eventBusInstance, destinationData);
|
||||
case MessageEventBusDestinationTypeNames.webhook:
|
||||
return MessageEventBusDestinationWebhook.deserialize(eventBusInstance, destinationData);
|
||||
default:
|
||||
LoggerProxy.debug('MessageEventBusDestination __type unknown');
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
export const METRICS_EVENT_NAME = 'metrics.messageEventBus.Event';
|
||||
|
||||
const prometheusCounters: Record<string, promClient.Counter<string> | null> = {};
|
||||
|
||||
function getMetricNameForEvent(event: EventMessageTypes): string {
|
||||
export function getMetricNameForEvent(event: EventMessageTypes): string {
|
||||
const prefix = config.getEnv('endpoints.metrics.prefix');
|
||||
return prefix + event.eventName.replace('n8n.', '').replace(/\./g, '_') + '_total';
|
||||
}
|
||||
|
||||
function getLabelValueForNode(nodeType: string): string {
|
||||
export function getLabelValueForNode(nodeType: string): string {
|
||||
return nodeType.replace('n8n-nodes-', '').replace(/\./g, '_');
|
||||
}
|
||||
|
||||
function getLabelValueForCredential(credentialType: string): string {
|
||||
export function getLabelValueForCredential(credentialType: string): string {
|
||||
return credentialType.replace(/\./g, '_');
|
||||
}
|
||||
|
||||
function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
|
||||
export function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
|
||||
switch (event.__type) {
|
||||
case EventMessageTypeNames.audit:
|
||||
if (event.eventName.startsWith('n8n.audit.user.credentials')) {
|
||||
|
|
@ -81,36 +50,3 @@ function getLabelsForEvent(event: EventMessageTypes): Record<string, string> {
|
|||
|
||||
return {};
|
||||
}
|
||||
|
||||
function getCounterSingletonForEvent(event: EventMessageTypes) {
|
||||
if (!prometheusCounters[event.eventName]) {
|
||||
const metricName = getMetricNameForEvent(event);
|
||||
|
||||
if (!promClient.validateMetricName(metricName)) {
|
||||
LoggerProxy.debug(`Invalid metric name: ${metricName}. Ignoring it!`);
|
||||
prometheusCounters[event.eventName] = null;
|
||||
return null;
|
||||
}
|
||||
|
||||
const counter = new promClient.Counter({
|
||||
name: metricName,
|
||||
help: `Total number of ${event.eventName} events.`,
|
||||
labelNames: Object.keys(getLabelsForEvent(event)),
|
||||
});
|
||||
|
||||
promClient.register.registerMetric(counter);
|
||||
prometheusCounters[event.eventName] = counter;
|
||||
}
|
||||
|
||||
return prometheusCounters[event.eventName];
|
||||
}
|
||||
|
||||
export async function incrementPrometheusMetric(event: EventMessageTypes): Promise<void> {
|
||||
const counter = getCounterSingletonForEvent(event);
|
||||
|
||||
if (!counter) {
|
||||
return;
|
||||
}
|
||||
|
||||
counter.inc(getLabelsForEvent(event));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
import { MessageEventBusDestinationTypeNames, LoggerProxy } from 'n8n-workflow';
|
||||
import type { EventDestinations } from '@/databases/entities/EventDestinations';
|
||||
import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
|
||||
import type { MessageEventBusDestination } from './MessageEventBusDestination.ee';
|
||||
import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
|
||||
import { MessageEventBusDestinationSyslog } from './MessageEventBusDestinationSyslog.ee';
|
||||
import { MessageEventBusDestinationWebhook } from './MessageEventBusDestinationWebhook.ee';
|
||||
|
||||
export function messageEventBusDestinationFromDb(
|
||||
eventBusInstance: MessageEventBus,
|
||||
dbData: EventDestinations,
|
||||
): MessageEventBusDestination | null {
|
||||
const destinationData = dbData.destination;
|
||||
if ('__type' in destinationData) {
|
||||
switch (destinationData.__type) {
|
||||
case MessageEventBusDestinationTypeNames.sentry:
|
||||
return MessageEventBusDestinationSentry.deserialize(eventBusInstance, destinationData);
|
||||
case MessageEventBusDestinationTypeNames.syslog:
|
||||
return MessageEventBusDestinationSyslog.deserialize(eventBusInstance, destinationData);
|
||||
case MessageEventBusDestinationTypeNames.webhook:
|
||||
return MessageEventBusDestinationWebhook.deserialize(eventBusInstance, destinationData);
|
||||
default:
|
||||
LoggerProxy.debug('MessageEventBusDestination __type unknown');
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
/* eslint-disable @typescript-eslint/no-use-before-define */
|
||||
import config from '@/config';
|
||||
import { N8N_VERSION } from '@/constants';
|
||||
import * as ResponseHelper from '@/ResponseHelper';
|
||||
import type express from 'express';
|
||||
import promBundle from 'express-prom-bundle';
|
||||
import promClient from 'prom-client';
|
||||
import semverParse from 'semver/functions/parse';
|
||||
|
||||
export { promClient };
|
||||
|
||||
export function configureMetrics(app: express.Application) {
|
||||
if (!config.getEnv('endpoints.metrics.enable')) {
|
||||
return;
|
||||
}
|
||||
|
||||
setupDefaultMetrics();
|
||||
setupN8nVersionMetric();
|
||||
setupApiMetrics(app);
|
||||
mountMetricsEndpoint(app);
|
||||
}
|
||||
|
||||
function setupN8nVersionMetric() {
|
||||
const n8nVersion = semverParse(N8N_VERSION || '0.0.0');
|
||||
|
||||
if (n8nVersion) {
|
||||
const versionGauge = new promClient.Gauge({
|
||||
name: config.getEnv('endpoints.metrics.prefix') + 'version_info',
|
||||
help: 'n8n version info.',
|
||||
labelNames: ['version', 'major', 'minor', 'patch'],
|
||||
});
|
||||
|
||||
versionGauge.set(
|
||||
{
|
||||
version: 'v' + n8nVersion.version,
|
||||
major: n8nVersion.major,
|
||||
minor: n8nVersion.minor,
|
||||
patch: n8nVersion.patch,
|
||||
},
|
||||
1,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function setupDefaultMetrics() {
|
||||
if (config.getEnv('endpoints.metrics.includeDefaultMetrics')) {
|
||||
promClient.collectDefaultMetrics();
|
||||
}
|
||||
}
|
||||
|
||||
function setupApiMetrics(app: express.Application) {
|
||||
if (config.getEnv('endpoints.metrics.includeApiEndpoints')) {
|
||||
const metricsMiddleware = promBundle({
|
||||
autoregister: false,
|
||||
includeUp: false,
|
||||
includePath: config.getEnv('endpoints.metrics.includeApiPathLabel'),
|
||||
includeMethod: config.getEnv('endpoints.metrics.includeApiMethodLabel'),
|
||||
includeStatusCode: config.getEnv('endpoints.metrics.includeApiStatusCodeLabel'),
|
||||
});
|
||||
|
||||
app.use(['/rest/', '/webhook/', 'webhook-test/', '/api/'], metricsMiddleware);
|
||||
}
|
||||
}
|
||||
|
||||
function mountMetricsEndpoint(app: express.Application) {
|
||||
app.get('/metrics', async (req: express.Request, res: express.Response) => {
|
||||
const response = await promClient.register.metrics();
|
||||
res.setHeader('Content-Type', promClient.register.contentType);
|
||||
ResponseHelper.sendSuccessResponse(res, response, true, 200);
|
||||
});
|
||||
}
|
||||
|
|
@ -5,15 +5,23 @@ import type { MemoryCache } from 'cache-manager';
|
|||
import type { RedisCache } from 'cache-manager-ioredis-yet';
|
||||
import { jsonStringify } from 'n8n-workflow';
|
||||
import { getDefaultRedisClient, getRedisPrefix } from './redis/RedisServiceHelper';
|
||||
import EventEmitter from 'events';
|
||||
|
||||
@Service()
|
||||
export class CacheService {
|
||||
export class CacheService extends EventEmitter {
|
||||
/**
|
||||
* Keys and values:
|
||||
* - `'cache:workflow-owner:${workflowId}'`: `User`
|
||||
*/
|
||||
private cache: RedisCache | MemoryCache | undefined;
|
||||
|
||||
metricsCounterEvents = {
|
||||
cacheHit: 'metrics.cache.hit',
|
||||
|
||||
cacheMiss: 'metrics.cache.miss',
|
||||
cacheUpdate: 'metrics.cache.update',
|
||||
};
|
||||
|
||||
isRedisCache(): boolean {
|
||||
return (this.cache as RedisCache)?.store?.isCacheable !== undefined;
|
||||
}
|
||||
|
|
@ -85,9 +93,12 @@ export class CacheService {
|
|||
}
|
||||
const value = await this.cache?.store.get(key);
|
||||
if (value !== undefined) {
|
||||
this.emit(this.metricsCounterEvents.cacheHit);
|
||||
return value;
|
||||
}
|
||||
this.emit(this.metricsCounterEvents.cacheMiss);
|
||||
if (options.refreshFunction) {
|
||||
this.emit(this.metricsCounterEvents.cacheUpdate);
|
||||
const refreshValue = await options.refreshFunction(key);
|
||||
await this.set(key, refreshValue, options.refreshTtl);
|
||||
return refreshValue;
|
||||
|
|
@ -124,8 +135,10 @@ export class CacheService {
|
|||
values = keys.map(() => undefined);
|
||||
}
|
||||
if (!values.includes(undefined)) {
|
||||
this.emit(this.metricsCounterEvents.cacheHit);
|
||||
return values;
|
||||
}
|
||||
this.emit(this.metricsCounterEvents.cacheMiss);
|
||||
if (options.refreshFunctionEach) {
|
||||
for (let i = 0; i < keys.length; i++) {
|
||||
if (values[i] === undefined) {
|
||||
|
|
@ -145,6 +158,7 @@ export class CacheService {
|
|||
return values;
|
||||
}
|
||||
if (options.refreshFunctionMany) {
|
||||
this.emit(this.metricsCounterEvents.cacheUpdate);
|
||||
const refreshValues: unknown[] = await options.refreshFunctionMany(keys);
|
||||
if (keys.length !== refreshValues.length) {
|
||||
throw new Error('refreshFunctionMany must return the same number of values as keys');
|
||||
|
|
@ -195,7 +209,6 @@ export class CacheService {
|
|||
if (values.length === 0) {
|
||||
return;
|
||||
}
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
const nonNullValues = values.filter(
|
||||
([key, value]) => value !== undefined && value !== null && key && key.length > 0,
|
||||
);
|
||||
|
|
|
|||
160
packages/cli/src/services/metrics.service.ts
Normal file
160
packages/cli/src/services/metrics.service.ts
Normal file
|
|
@ -0,0 +1,160 @@
|
|||
import config from '@/config';
|
||||
import { N8N_VERSION } from '@/constants';
|
||||
import type express from 'express';
|
||||
import promBundle from 'express-prom-bundle';
|
||||
import promClient, { type Counter } from 'prom-client';
|
||||
import semverParse from 'semver/functions/parse';
|
||||
import { Service } from 'typedi';
|
||||
import EventEmitter from 'events';
|
||||
import { LoggerProxy } from 'n8n-workflow';
|
||||
|
||||
import { CacheService } from '@/services/cache.service';
|
||||
import type { EventMessageTypes } from '@/eventbus/EventMessageClasses';
|
||||
import {
|
||||
METRICS_EVENT_NAME,
|
||||
getLabelsForEvent,
|
||||
} from '@/eventbus/MessageEventBusDestination/Helpers.ee';
|
||||
import { eventBus } from '@/eventbus';
|
||||
|
||||
@Service()
|
||||
export class MetricsService extends EventEmitter {
|
||||
constructor(private readonly cacheService: CacheService) {
|
||||
super();
|
||||
}
|
||||
|
||||
counters: Record<string, Counter<string> | null> = {};
|
||||
|
||||
async configureMetrics(app: express.Application) {
|
||||
promClient.register.clear(); // clear all metrics in case we call this a second time
|
||||
this.setupDefaultMetrics();
|
||||
this.setupN8nVersionMetric();
|
||||
this.setupCacheMetrics();
|
||||
this.setupMessageEventBusMetrics();
|
||||
this.setupApiMetrics(app);
|
||||
this.mountMetricsEndpoint(app);
|
||||
}
|
||||
|
||||
private setupN8nVersionMetric() {
|
||||
const n8nVersion = semverParse(N8N_VERSION || '0.0.0');
|
||||
|
||||
if (n8nVersion) {
|
||||
const versionGauge = new promClient.Gauge({
|
||||
name: config.getEnv('endpoints.metrics.prefix') + 'version_info',
|
||||
help: 'n8n version info.',
|
||||
labelNames: ['version', 'major', 'minor', 'patch'],
|
||||
});
|
||||
|
||||
versionGauge.set(
|
||||
{
|
||||
version: 'v' + n8nVersion.version,
|
||||
major: n8nVersion.major,
|
||||
minor: n8nVersion.minor,
|
||||
patch: n8nVersion.patch,
|
||||
},
|
||||
1,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private setupDefaultMetrics() {
|
||||
if (config.getEnv('endpoints.metrics.includeDefaultMetrics')) {
|
||||
promClient.collectDefaultMetrics();
|
||||
}
|
||||
}
|
||||
|
||||
private setupApiMetrics(app: express.Application) {
|
||||
if (config.getEnv('endpoints.metrics.includeApiEndpoints')) {
|
||||
const metricsMiddleware = promBundle({
|
||||
autoregister: false,
|
||||
includeUp: false,
|
||||
includePath: config.getEnv('endpoints.metrics.includeApiPathLabel'),
|
||||
includeMethod: config.getEnv('endpoints.metrics.includeApiMethodLabel'),
|
||||
includeStatusCode: config.getEnv('endpoints.metrics.includeApiStatusCodeLabel'),
|
||||
});
|
||||
|
||||
app.use(['/rest/', '/webhook/', 'webhook-test/', '/api/'], metricsMiddleware);
|
||||
}
|
||||
}
|
||||
|
||||
mountMetricsEndpoint(app: express.Application) {
|
||||
app.get('/metrics', async (req: express.Request, res: express.Response) => {
|
||||
const metrics = await promClient.register.metrics();
|
||||
res.setHeader('Content-Type', promClient.register.contentType);
|
||||
res.send(metrics).end();
|
||||
});
|
||||
}
|
||||
|
||||
private setupCacheMetrics() {
|
||||
if (!config.getEnv('endpoints.metrics.includeCacheMetrics')) {
|
||||
return;
|
||||
}
|
||||
this.counters.cacheHitsTotal = new promClient.Counter({
|
||||
name: config.getEnv('endpoints.metrics.prefix') + 'cache_hits_total',
|
||||
help: 'Total number of cache hits.',
|
||||
labelNames: ['cache'],
|
||||
});
|
||||
this.counters.cacheHitsTotal.inc(0);
|
||||
this.cacheService.on(this.cacheService.metricsCounterEvents.cacheHit, (amount: number = 1) => {
|
||||
this.counters.cacheHitsTotal?.inc(amount);
|
||||
});
|
||||
|
||||
this.counters.cacheMissesTotal = new promClient.Counter({
|
||||
name: config.getEnv('endpoints.metrics.prefix') + 'cache_misses_total',
|
||||
help: 'Total number of cache misses.',
|
||||
labelNames: ['cache'],
|
||||
});
|
||||
this.counters.cacheMissesTotal.inc(0);
|
||||
this.cacheService.on(this.cacheService.metricsCounterEvents.cacheMiss, (amount: number = 1) => {
|
||||
this.counters.cacheMissesTotal?.inc(amount);
|
||||
});
|
||||
|
||||
this.counters.cacheUpdatesTotal = new promClient.Counter({
|
||||
name: config.getEnv('endpoints.metrics.prefix') + 'cache_updates_total',
|
||||
help: 'Total number of cache updates.',
|
||||
labelNames: ['cache'],
|
||||
});
|
||||
this.counters.cacheUpdatesTotal.inc(0);
|
||||
this.cacheService.on(
|
||||
this.cacheService.metricsCounterEvents.cacheUpdate,
|
||||
(amount: number = 1) => {
|
||||
this.counters.cacheUpdatesTotal?.inc(amount);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
private getCounterForEvent(event: EventMessageTypes): Counter<string> | null {
|
||||
if (!promClient) return null;
|
||||
if (!this.counters[event.eventName]) {
|
||||
const prefix = config.getEnv('endpoints.metrics.prefix');
|
||||
const metricName =
|
||||
prefix + event.eventName.replace('n8n.', '').replace(/\./g, '_') + '_total';
|
||||
|
||||
if (!promClient.validateMetricName(metricName)) {
|
||||
LoggerProxy.debug(`Invalid metric name: ${metricName}. Ignoring it!`);
|
||||
this.counters[event.eventName] = null;
|
||||
return null;
|
||||
}
|
||||
|
||||
const counter = new promClient.Counter({
|
||||
name: metricName,
|
||||
help: `Total number of ${event.eventName} events.`,
|
||||
labelNames: Object.keys(getLabelsForEvent(event)),
|
||||
});
|
||||
counter.inc(0);
|
||||
this.counters[event.eventName] = counter;
|
||||
}
|
||||
|
||||
return this.counters[event.eventName];
|
||||
}
|
||||
|
||||
private setupMessageEventBusMetrics() {
|
||||
if (!config.getEnv('endpoints.metrics.includeMessageEventBusMetrics')) {
|
||||
return;
|
||||
}
|
||||
eventBus.on(METRICS_EVENT_NAME, (event: EventMessageTypes) => {
|
||||
const counter = this.getCounterForEvent(event);
|
||||
if (!counter) return;
|
||||
counter.inc(1);
|
||||
});
|
||||
}
|
||||
}
|
||||
78
packages/cli/test/integration/metrics.test.ts
Normal file
78
packages/cli/test/integration/metrics.test.ts
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
import { setupTestServer } from './shared/utils';
|
||||
import config from '@/config';
|
||||
import request from 'supertest';
|
||||
import Container from 'typedi';
|
||||
import { MetricsService } from '../../src/services/metrics.service';
|
||||
import { N8N_VERSION } from '../../src/constants';
|
||||
import { parse as semverParse } from 'semver';
|
||||
|
||||
jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
|
||||
config.set('endpoints.metrics.enable', true);
|
||||
config.set('endpoints.metrics.includeDefaultMetrics', false);
|
||||
config.set('endpoints.metrics.prefix', 'n8n_test_');
|
||||
const testServer = setupTestServer({ endpointGroups: ['metrics'] });
|
||||
|
||||
let testAgent = request.agent(testServer.app);
|
||||
|
||||
async function getMetricsResponseAsLines() {
|
||||
const response = await testAgent.get('/metrics');
|
||||
expect(response.status).toEqual(200);
|
||||
expect(response.type).toEqual('text/plain');
|
||||
|
||||
const lines = response.text.trim().split('\n');
|
||||
return lines;
|
||||
}
|
||||
|
||||
describe('Metrics', () => {
|
||||
it('should return n8n version', async () => {
|
||||
const n8nVersion = semverParse(N8N_VERSION || '0.0.0');
|
||||
expect(n8nVersion).toBeTruthy();
|
||||
const lines = await getMetricsResponseAsLines();
|
||||
expect(lines).toContain(
|
||||
`n8n_test_version_info{version="v${n8nVersion!.version}",major="${
|
||||
n8nVersion!.major
|
||||
}",minor="${n8nVersion!.minor}",patch="${n8nVersion!.patch}"} 1`,
|
||||
);
|
||||
});
|
||||
|
||||
it('should return cache metrics when enabled', async () => {
|
||||
config.set('endpoints.metrics.includeCacheMetrics', true);
|
||||
await Container.get(MetricsService).configureMetrics(testServer.app);
|
||||
const lines = await getMetricsResponseAsLines();
|
||||
expect(lines).toContain('n8n_test_cache_hits_total 0');
|
||||
expect(lines).toContain('n8n_test_cache_misses_total 0');
|
||||
expect(lines).toContain('n8n_test_cache_updates_total 0');
|
||||
});
|
||||
|
||||
// TODO: Commented out due to flakiness in CI
|
||||
// it('should return event metrics when enabled', async () => {
|
||||
// config.set('endpoints.metrics.includeMessageEventBusMetrics', true);
|
||||
// await Container.get(MetricsService).configureMetrics(testServer.app);
|
||||
// await eventBus.initialize();
|
||||
// await eventBus.send(
|
||||
// new EventMessageGeneric({
|
||||
// eventName: 'n8n.destination.test',
|
||||
// }),
|
||||
// );
|
||||
// const lines = await getMetricsResponseAsLines();
|
||||
// expect(lines).toContain('n8n_test_destination_test_total 1');
|
||||
// await eventBus.close();
|
||||
// jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
|
||||
// });
|
||||
|
||||
it('should return default metrics', async () => {
|
||||
config.set('endpoints.metrics.includeDefaultMetrics', true);
|
||||
await Container.get(MetricsService).configureMetrics(testServer.app);
|
||||
const lines = await getMetricsResponseAsLines();
|
||||
expect(lines).toContain('nodejs_heap_space_size_total_bytes{space="read_only"} 0');
|
||||
config.set('endpoints.metrics.includeDefaultMetrics', false);
|
||||
});
|
||||
|
||||
it('should not return default metrics only when disabled', async () => {
|
||||
config.set('endpoints.metrics.includeDefaultMetrics', false);
|
||||
await Container.get(MetricsService).configureMetrics(testServer.app);
|
||||
const lines = await getMetricsResponseAsLines();
|
||||
expect(lines).not.toContain('nodejs_heap_space_size_total_bytes{space="read_only"} 0');
|
||||
config.set('endpoints.metrics.includeDefaultMetrics', true);
|
||||
});
|
||||
});
|
||||
|
|
@ -25,7 +25,8 @@ export type EndpointGroup =
|
|||
| 'eventBus'
|
||||
| 'license'
|
||||
| 'variables'
|
||||
| 'tags';
|
||||
| 'tags'
|
||||
| 'metrics';
|
||||
|
||||
export interface SetupProps {
|
||||
applyAuth?: boolean;
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ import type { EndpointGroup, SetupProps, TestServer } from '../types';
|
|||
import { mockInstance } from './mocking';
|
||||
import { JwtService } from '@/services/jwt.service';
|
||||
import { RoleService } from '@/services/role.service';
|
||||
import { MetricsService } from '@/services/metrics.service';
|
||||
|
||||
/**
|
||||
* Plugin to prefix a path segment into a request URL pathname.
|
||||
|
|
@ -187,6 +188,9 @@ export const setupTestServer = ({
|
|||
|
||||
for (const group of functionEndpoints) {
|
||||
switch (group) {
|
||||
case 'metrics':
|
||||
await Container.get(MetricsService).configureMetrics(app);
|
||||
break;
|
||||
case 'eventBus':
|
||||
registerController(app, config, new EventBusController());
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -93,10 +93,10 @@ describe('cacheService', () => {
|
|||
await expect(store!.ttl('testString')).resolves.toBeLessThanOrEqual(100);
|
||||
await expect(store!.ttl('testNumber1')).resolves.toBeLessThanOrEqual(1000);
|
||||
|
||||
await expect(cacheService.get('testString')).resolves.toBe('test');
|
||||
await expect(cacheService.get('testNumber1')).resolves.toBe(123);
|
||||
|
||||
// commented out because it fails on CI sporadically
|
||||
// await expect(cacheService.get('testString')).resolves.toBe('test');
|
||||
// await expect(cacheService.get('testNumber1')).resolves.toBe(123);
|
||||
|
||||
// await new Promise((resolve) => setTimeout(resolve, 20));
|
||||
|
||||
// await expect(cacheService.get('testString')).resolves.toBeUndefined();
|
||||
|
|
|
|||
Loading…
Reference in a new issue