Skip to content

fix(rivetkit): fix not pino bindings #3334

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

Closed
wants to merge 1 commit into from
Closed

fix(rivetkit): fix not pino bindings #3334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions rivetkit-typescript/packages/rivetkit/src/common/log.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export async function configureDefaultLogger(
},
},
hooks: {
logMethod(inputArgs, _method, level) {
logMethod(inputArgs, method, level) {
// TODO: This is a hack to not implement our own transport target. We can get better perf if we have our own transport target.

const levelMap: Record<number, string> = {
Expand All @@ -162,20 +162,41 @@ export async function configureDefaultLogger(
getEnvUniversal("LOG_TIMESTAMP") === "1"
? Date.now()
: undefined;

// Get bindings from the logger instance (child logger fields)
const bindings = (this as any).bindings?.() || {};

// TODO: This can be simplified in logfmt.ts
if (inputArgs.length >= 2) {
const [objOrMsg, msg] = inputArgs;
if (typeof objOrMsg === "object" && objOrMsg !== null) {
customWrite(levelName, { ...objOrMsg, msg, time });
customWrite(levelName, {
...bindings,
...objOrMsg,
msg,
time,
});
} else {
customWrite(levelName, { msg: String(objOrMsg), time });
customWrite(levelName, {
...bindings,
msg: String(objOrMsg),
time,
});
}
} else if (inputArgs.length === 1) {
const [objOrMsg] = inputArgs;
if (typeof objOrMsg === "object" && objOrMsg !== null) {
customWrite(levelName, { ...objOrMsg, time });
customWrite(levelName, {
...bindings,
...objOrMsg,
time,
});
} else {
customWrite(levelName, { msg: String(objOrMsg), time });
customWrite(levelName, {
...bindings,
msg: String(objOrMsg),
time,
});
}
}
},
Expand Down
Loading