Skip to content
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.

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

perf(NODE-6616): shortcircuit logging ejson.stringify #4377

Merged
merged 19 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from 11 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
123 changes: 121 additions & 2 deletions src/mongo_logger.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
import { inspect, promisify } from 'util';
import { isUint8Array } from 'util/types';

import { type Document, EJSON, type EJSONOptions, type ObjectId } from './bson';
import {
type Binary,
type BSONRegExp,
type BSONSymbol,
type Code,
type DBRef,
type Decimal128,
type Document,
type Double,
EJSON,
type EJSONOptions,
type Int32,
type Long,
type MaxKey,
type MinKey,
type ObjectId,
type Timestamp
} from './bson';
import type { CommandStartedEvent } from './cmap/command_monitoring_events';
import type {
ConnectionCheckedInEvent,
Expand Down Expand Up @@ -413,6 +431,20 @@ export interface LogConvertible extends Record<string, any> {
toLog(): Record<string, any>;
}

type BSONObject =
| BSONRegExp
| BSONSymbol
| Code
| DBRef
| Decimal128
| Double
| Int32
| Long
| MaxKey
| MinKey
| ObjectId
| Timestamp
| Binary;
/** @internal */
export function stringifyWithMaxLen(
value: any,
Expand All @@ -421,13 +453,100 @@ export function stringifyWithMaxLen(
): string {
let strToTruncate = '';

let currentLength = 0;
const maxDocumentLengthEnsurer = function maxDocumentLengthEnsurer(key: string, value: any) {
if (currentLength >= maxDocumentLength) {
return undefined;
}
// Account for root document
if (key === '') {
// Account for starting brace
currentLength += 1;
return value;
}

// +4 accounts for 2 quotation marks, colon and comma after value
currentLength += key.length + 4;

if (value == null) return value;

switch (typeof value) {
case 'string':
// +2 accounts for quotes
currentLength += value.length + 2;
nbbeeken marked this conversation as resolved.
Show resolved Hide resolved
break;
case 'number':
case 'bigint':
currentLength += String(value).length;
break;
case 'boolean':
currentLength += value ? 4 : 5;
break;
case 'object':
if ('buffer' in value && isUint8Array(value.buffer)) {
// Handle binData
currentLength += (value.buffer.byteLength + value.buffer.byteLength * 0.5) | 0;
nbbeeken marked this conversation as resolved.
Show resolved Hide resolved
} else if ('_bsontype' in value) {
const v = value as BSONObject;
switch (v._bsontype) {
case 'Int32':
currentLength += String(v.value).length;
break;
case 'Double':
// Doesn't account for representing integers as <value>.0
currentLength += String(v.value).length;
nbbeeken marked this conversation as resolved.
Show resolved Hide resolved
break;
case 'Long':
currentLength += v.toString().length;
break;
case 'ObjectId':
// '{"$oid":"XXXXXXXXXXXXXXXXXXXXXXXX"}'
currentLength += 35;
break;
case 'MaxKey':
case 'MinKey':
// '{"$maxKey":1}' or '{"$minKey":1}'
currentLength += 13;
break;
case 'Binary':
// '{"$binary":{"base64":"<base64 string>","subType":"XX"}}'
// This is an estimate based on the fact that the base64 is approximately 1.33x the length of
// the actual binary sequence https://en.wikipedia.org/wiki/Base64
currentLength += (22 + value.position + value.position * 0.33 + 18) | 0;
break;
case 'Timestamp':
currentLength += 19 + String(v.t).length + 5 + String(v.i).length + 2;
nbbeeken marked this conversation as resolved.
Show resolved Hide resolved
break;
case 'Code':
// '{"$code":"<code>"}' or '{"$code":"<code>","$scope":<scope>}'
if (v.scope == null) {
currentLength += v.code.length + 10 + 2;
} else {
// Ignoring actual scope object, so this undercounts by a significant amount
currentLength += v.code.length + 10 + 11;
}
break;
case 'BSONRegExp':
// '{"$regularExpression":{"pattern":"<pattern>","options":"<options>"}}'
currentLength += 34 + v.pattern.length + 13 + v.options.length + 3;
break;
}
}
}
return value;
};

if (typeof value === 'string') {
strToTruncate = value;
} else if (typeof value === 'function') {
strToTruncate = value.name;
} else {
try {
strToTruncate = EJSON.stringify(value, options);
if (maxDocumentLength !== 0) {
strToTruncate = EJSON.stringify(value, maxDocumentLengthEnsurer, 0, options);
} else {
strToTruncate = EJSON.stringify(value, options);
}
} catch (e) {
strToTruncate = `Extended JSON serialization failed with: ${e.message}`;
}
Expand Down
138 changes: 137 additions & 1 deletion test/unit/mongo_logger.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
import { EJSON, ObjectId } from 'bson';
import {
BSONRegExp,
BSONSymbol,
Code,
W-A-James marked this conversation as resolved.
Show resolved Hide resolved
DBRef,
Double,
W-A-James marked this conversation as resolved.
Show resolved Hide resolved
EJSON,
Int32,
Long,
MaxKey,
W-A-James marked this conversation as resolved.
Show resolved Hide resolved
MinKey,
ObjectId
} from 'bson';
import { expect } from 'chai';
import * as sinon from 'sinon';
import { Readable, Writable } from 'stream';
Expand Down Expand Up @@ -1612,3 +1624,127 @@ describe('class MongoLogger', function () {
}
});
});

describe('stringifyWithMaxLen', function () {
let returnVal: string;

nbbeeken marked this conversation as resolved.
Show resolved Hide resolved
describe('when stringifying a string field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
a: 'aaa',
b: 'bbb'
};

returnVal = stringifyWithMaxLen(doc, 13);
expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a number field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
a: 1000,
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 12);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a bigint field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
a: 1000n,
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 12);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON Code field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new Code('console.log();'),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 34);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON Double field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new Double(123.1),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 13);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON Int32 field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new Int32(123),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 11);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON MaxKey field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new MaxKey(),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 21);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON MinKey field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new MinKey(),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 21);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON ObjectId field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new ObjectId(),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 43);

expect(returnVal).to.contain('"b...');
});
});

describe('when stringifying a BSON BSONRegExp field', function () {
it('does not prematurely redact the next key', function () {
const doc = {
c: new BSONRegExp('testRegex', 'is'),
b: 'bbb'
};
returnVal = stringifyWithMaxLen(doc, 69);

expect(returnVal).to.contain('"b...');
});
});
});
Loading