Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/humble-ravens-send.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openfn/logger': patch
---

Fix an issue where logger.proxy can throw for nil values
6 changes: 6 additions & 0 deletions .changeset/odd-sloths-make.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@openfn/engine-multi': patch
'@openfn/ws-worker': patch
---

Use streaming algorithm to calculate payload size
25 changes: 20 additions & 5 deletions packages/engine-multi/src/util/ensure-payload-size.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ export const calculateSizeStream = async (
value: any,
limit?: number
): Promise<number> => {
// skip all primitives
if (
!value ||
typeof value === 'number' ||
typeof value === 'boolean' ||
typeof value === 'function'
) {
return 1;
}

let size_bytes = 0;

const stream = new JsonStreamStringify(value);
Expand All @@ -69,11 +79,16 @@ export default async (payload: any, limit_mb: number = 10) => {
const newPayload = { ...payload };

for (const key of KEYS_TO_VERIFY) {
try {
await verify(payload[key], limit_mb);
} catch (e) {
Object.assign(newPayload[key], replacements[key] ?? replacements.default);
newPayload.redacted = true;
if (key in payload) {
try {
await verify(payload[key], limit_mb, 'stream');
} catch (e) {
Object.assign(
newPayload[key],
replacements[key] ?? replacements.default
);
newPayload.redacted = true;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/engine-multi/test/api/execute.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ test.serial('should emit a job-complete event', async (t) => {
t.assert(!isNaN(event.duration));
});

test.serial('should emit a log event', async (t) => {
test.serial.only('should emit a log event', async (t) => {
let workflowLog: any;
const plan = {
id: 'y',
Expand Down
2 changes: 2 additions & 0 deletions packages/logger/src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ export default function (name?: string, options: LogOptions = {}): Logger {
}
j = j as JSONLog;

j.message ??= [];

log(j.name, j.level, ...j.message);
return [j.name, j.level, ...j.message];
};
Expand Down