Skip to content

fix(controlplane): upgrade fastify to v5 #3193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gausie wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(controlplane): upgrade fastify to v5 #3193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d39ab
fix(controlplane): upgrade fastify to v5
gausie Aug 26, 2026
6199d32
Merge branch 'main' into sam/cosmo-381-fastify-v5
gausie Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions controlplane/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@connectrpc/connect": "catalog:",
"@connectrpc/connect-fastify": "catalog:",
"@connectrpc/connect-node": "catalog:",
"@fastify/cors": "^9.0.1",
"@fastify/cors": "^11.3.0",
"@graphql-eslint/eslint-plugin": "^3.20.1",
"@graphql-inspector/core": "^6.2.1",
"@graphql-tools/utils": "catalog:",
Expand All @@ -74,10 +74,10 @@
"ejs": "^3.1.10",
"eslint": "catalog:",
"execa": "^9.5.2",
"fastify": "^4.28.1",
"fastify-graceful-shutdown": "^4.0.1",
"fastify-plugin": "^4.5.1",
"fastify-raw-body": "^4.3.0",
"fastify": "^5.6.0",
"fastify-graceful-shutdown": "^5.0.0",
"fastify-plugin": "^6.0.0",
"fastify-raw-body": "^6.0.1",
"graphql": "catalog:",
"http-proxy-agent": "8.0.0",
"https-proxy-agent": "8.0.0",
Expand Down Expand Up @@ -123,7 +123,7 @@
"eslint-plugin-local-rules": "^3.0.2",
"eslint-plugin-require-extensions": "catalog:",
"msw": "^2.2.11",
"pino-pretty": "^10.3.1",
"pino-pretty": "^13.0.0",
"tsx": "catalog:",
"typescript": "catalog:",
"vitest": "catalog:"
Expand Down
2 changes: 1 addition & 1 deletion controlplane/src/core/bufservices/analytics/getOperationDeprecatedFields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export function getOperationDeprecatedFields(
});
}
} catch (error) {
logger.error('Error getting latest valid schema version', { error });
logger.error(error, 'Error getting latest valid schema version');
}

return {
Expand Down
2 changes: 1 addition & 1 deletion controlplane/src/core/bufservices/analytics/getOperations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export function getOperations(
}));
}
} catch (error) {
logger.error('Error getting latest valid schema version', { error });
logger.error(error, 'Error getting latest valid schema version');
}
}

Expand Down
2 changes: 1 addition & 1 deletion controlplane/src/core/build-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export default async function build(opts: BuildConfig) {
const logger = pino(opts.production ? opts.logger : { ...developmentLoggerOpts, ...opts.logger });

const fastify = Fastify({
logger,
loggerInstance: logger,
// The maximum amount of time in *milliseconds* in which a plugin can load
pluginTimeout: 10_000, // 10s
});
Expand Down
7 changes: 3 additions & 4 deletions controlplane/src/core/plugins/metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import client, { Registry } from 'prom-client';
import fp from 'fastify-plugin';
import Fastify, { FastifyRequest, FastifyReply } from 'fastify';
import { FastifyListenOptions } from 'fastify/types/instance.js';
import Fastify, { FastifyRequest, FastifyReply, FastifyInstance, FastifyListenOptions } from 'fastify';

declare module 'fastify' {
interface FastifyInstance {
metricsServer: Fastify.FastifyInstance;
metricsServer: FastifyInstance;
startMetricsServer(opts: FastifyListenOptions): Promise<string>;
}
}
Expand All @@ -21,7 +20,7 @@ export default fp<MetricsPluginOptions>(function (fastify, { path = '/metrics',
plugin: 'metrics',
});
const listener = Fastify({
logger: metricsLogger,
loggerInstance: metricsLogger,
});

client.collectDefaultMetrics({ register: registry });
Expand Down
2 changes: 1 addition & 1 deletion controlplane/test/test-util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const SetupTest = async function ({
const log = pino();
const databaseConnectionUrl = `postgresql://postgres:changeme@localhost:5432/${dbname}`;
const server = Fastify({
logger: log,
loggerInstance: log,
});

await server.register(database, {
Expand Down
Loading
Loading