Skip to content

Commit 7b46371

Browse files
authored
Fix metrics format (#2119)
* ensure eof marker is always at the end * strip empty lines from prisma metrics
1 parent fda9565 commit 7b46371

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

apps/webapp/app/routes/metrics.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ export async function loader({ request }: LoaderFunctionArgs) {
1313
}
1414
}
1515

16-
const prismaMetrics = await prisma.$metrics.prometheus();
16+
// We need to remove empty lines from the prisma metrics, grafana doesn't like them
17+
const prismaMetrics = (await prisma.$metrics.prometheus()).replace(/^\s*[\r\n]/gm, "");
1718
const coreMetrics = await metricsRegister.metrics();
1819

19-
return new Response(coreMetrics + prismaMetrics, {
20+
// Order matters, core metrics end with `# EOF`, prisma metrics don't
21+
const metrics = prismaMetrics + coreMetrics;
22+
23+
return new Response(metrics, {
2024
headers: {
2125
"Content-Type": metricsRegister.contentType,
2226
},

0 commit comments

Comments
 (0)