Changing interceptor to not be global for prom metrics and exposing prom metrics on /metrics
Some checks failed
ci/woodpecker/manual/test Pipeline was successful
ci/woodpecker/manual/deploy Pipeline failed

This commit is contained in:
collin 2026-06-16 15:35:06 +02:00
parent b7141fc8af
commit 908651b894
No known key found for this signature in database
7 changed files with 42 additions and 6 deletions

View file

@ -3,7 +3,6 @@ import { ConfigService } from '@nestjs/config'
import { NestFactory } from '@nestjs/core' import { NestFactory } from '@nestjs/core'
import { AppModule } from './app.module' import { AppModule } from './app.module'
import { CustomResponseTransformInterceptor } from './common/customResponse'
import { setDefaults } from './common/dayjs' import { setDefaults } from './common/dayjs'
async function bootstrap() { async function bootstrap() {
@ -15,7 +14,6 @@ async function bootstrap() {
const port = config.get('PORT', 3000) const port = config.get('PORT', 3000)
app.enableShutdownHooks() app.enableShutdownHooks()
app.useGlobalPipes(new ValidationPipe({ transform: true })) app.useGlobalPipes(new ValidationPipe({ transform: true }))
app.useGlobalInterceptors(new CustomResponseTransformInterceptor())
setDefaults() setDefaults()
await app.listen(port, () => console.log(`Listening on port ${port}`)) await app.listen(port, () => console.log(`Listening on port ${port}`))
} }

View file

@ -1,8 +1,10 @@
import { Controller, Get, Inject, Query } from '@nestjs/common' import { Controller, Get, Inject, Query, UseInterceptors } from '@nestjs/common'
import { CustomResponseTransformInterceptor } from '../common/customResponse'
import { MembersService } from './service' import { MembersService } from './service'
@Controller('members') @Controller('members')
@UseInterceptors(CustomResponseTransformInterceptor)
export class MembersController { export class MembersController {
constructor( constructor(
@Inject(MembersService) @Inject(MembersService)

View file

@ -0,0 +1,16 @@
import { Controller, Get, Inject } from '@nestjs/common'
import { PrometheusProvider } from './provider'
@Controller('metrics')
export class PrometheusController {
constructor(
@Inject(PrometheusProvider)
private readonly promProvider: PrometheusProvider,
) {}
@Get('/')
async getMetrics() {
return await this.promProvider.getMetrics()
}
}

View file

@ -1,8 +1,10 @@
import { Module } from '@nestjs/common' import { Module } from '@nestjs/common'
import { PrometheusController } from './controller'
import { PrometheusProvider } from './provider' import { PrometheusProvider } from './provider'
@Module({ @Module({
controllers: [PrometheusController],
providers: [PrometheusProvider], providers: [PrometheusProvider],
}) })
export class PrometheusModule {} export class PrometheusModule {}

View file

@ -1,11 +1,13 @@
import { OnApplicationBootstrap } from '@nestjs/common' import { OnApplicationBootstrap } from '@nestjs/common'
import { collectDefaultMetrics, Registry } from 'prom-client' import { collectDefaultMetrics, Counter, Registry } from 'prom-client'
export class PrometheusProvider implements OnApplicationBootstrap { export class PrometheusProvider implements OnApplicationBootstrap {
private readonly registry: Registry private readonly registry: Registry
private readonly counters: Map<string, Counter>
constructor() { constructor() {
this.registry = new Registry() this.registry = new Registry()
this.counters = new Map()
} }
onApplicationBootstrap() { onApplicationBootstrap() {
@ -15,4 +17,18 @@ export class PrometheusProvider implements OnApplicationBootstrap {
labels: { GIT_COMMIT: process.env.GIT_COMMIT ?? 'unknown' }, labels: { GIT_COMMIT: process.env.GIT_COMMIT ?? 'unknown' },
}) })
} }
async getMetrics() {
return this.registry.metrics()
}
async count(name: string, help: string, increment = 1) {
let counter = this.counters.get(name)
if (counter == null) {
counter = new Counter({ name, help })
this.counters.set(name, counter)
}
counter.inc(increment)
}
} }

View file

@ -20,6 +20,7 @@ import {
ValidateNested, ValidateNested,
} from 'class-validator' } from 'class-validator'
import { CustomResponseTransformInterceptor } from '../common/customResponse'
import { DayOfWeek } from './entity' import { DayOfWeek } from './entity'
import { RecurringReservationsService } from './service' import { RecurringReservationsService } from './service'
@ -79,7 +80,7 @@ export class UpdateRecurringReservationRequest {
} }
@Controller('recurring-reservations') @Controller('recurring-reservations')
@UseInterceptors(ClassSerializerInterceptor) @UseInterceptors(ClassSerializerInterceptor, CustomResponseTransformInterceptor)
export class RecurringReservationsController { export class RecurringReservationsController {
constructor( constructor(
@Inject(RecurringReservationsService) @Inject(RecurringReservationsService)

View file

@ -23,6 +23,7 @@ import {
} from 'class-validator' } from 'class-validator'
import { Dayjs } from 'dayjs' import { Dayjs } from 'dayjs'
import { CustomResponseTransformInterceptor } from '../common/customResponse'
import { DayjsTransformer } from '../common/dayjs' import { DayjsTransformer } from '../common/dayjs'
import { LoggerService } from '../logger/service.logger' import { LoggerService } from '../logger/service.logger'
import { RESERVATIONS_QUEUE_NAME, ReservationsQueue } from './config' import { RESERVATIONS_QUEUE_NAME, ReservationsQueue } from './config'
@ -70,7 +71,7 @@ export class CreateReservationRequest {
} }
@Controller('reservations') @Controller('reservations')
@UseInterceptors(ClassSerializerInterceptor) @UseInterceptors(ClassSerializerInterceptor, CustomResponseTransformInterceptor)
export class ReservationsController { export class ReservationsController {
constructor( constructor(
@Inject(ReservationsService) @Inject(ReservationsService)