Skip to content

Commit 6491558

Browse files
authored
Use more fastify5-friendly logger definition (#202)
1 parent 3cbbcdc commit 6491558

5 files changed

+8
-7
lines changed

lib/plugins/bullMqMetricsPlugin.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ async function initAppWithBullMqMetrics(
3838
if (enableMetricsPlugin) {
3939
await app.register(metricsPlugin, {
4040
bindAddress: '0.0.0.0',
41-
loggerOptions: false,
41+
logger: false,
4242
errorObjectResolver: (err: unknown) => err,
4343
})
4444
}

lib/plugins/healthcheck/healthcheckMetricsPlugin.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async function initApp(healthChecks: PrometheusHealthCheck[]) {
2323
app = testApp
2424
await app.register(metricsPlugin, {
2525
bindAddress: '0.0.0.0',
26-
loggerOptions: false,
26+
logger: false,
2727
errorObjectResolver: (err: unknown) => err,
2828
})
2929
await app.register(healthcheckMetricsPlugin, {

lib/plugins/metricsPlugin.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ async function initApp(errorObjectResolver = (err: unknown) => err) {
99
const app = fastify()
1010
await app.register(metricsPlugin, {
1111
bindAddress: '0.0.0.0',
12-
loggerOptions: false,
12+
logger: false,
1313
errorObjectResolver,
1414
})
1515

lib/plugins/metricsPlugin.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import type { FastifyInstance } from 'fastify'
22
import fastify from 'fastify'
33
import fastifyMetrics from 'fastify-metrics'
44
import fp from 'fastify-plugin'
5-
import type { PinoLoggerOptions } from 'fastify/types/logger'
5+
import type { Logger } from 'pino'
66

77
const METRICS_PORT = 9080
88

99
export type ErrorObjectResolver = (err: unknown, correlationID?: string) => unknown
1010

1111
export interface MetricsPluginOptions {
12-
loggerOptions: PinoLoggerOptions | boolean
12+
logger: Logger | false
1313
disablePrometheusRequestLogging?: boolean
1414
bindAddress?: string
1515
errorObjectResolver: ErrorObjectResolver
@@ -25,7 +25,8 @@ function plugin(app: FastifyInstance, opts: MetricsPluginOptions, done: (err?: E
2525
})
2626
try {
2727
const promServer = fastify({
28-
logger: opts.loggerOptions,
28+
loggerInstance: opts.logger ? opts.logger : undefined,
29+
logger: opts.logger === false ? false : undefined,
2930
disableRequestLogging: opts.disablePrometheusRequestLogging ?? true,
3031
})
3132

lib/plugins/prometheus/PrometheusCounterTransactionManager.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('PrometheusCounterTransactionManager', () => {
2020
const app = fastify()
2121
await app.register(metricsPlugin, {
2222
bindAddress: '0.0.0.0',
23-
loggerOptions: false,
23+
logger: false,
2424
errorObjectResolver: () => undefined,
2525
})
2626

0 commit comments

Comments
 (0)