Skip to content
Merged
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
11 changes: 9 additions & 2 deletions packages/logger/src/logBuffer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@ export class CircularMap<V> extends Map<string, SizedSet<V>> {

const buffer = this.get(key) || new SizedSet<V>();

if (buffer.currentBytesSize + item.byteSize >= this.#maxBytesSize) {
if (
buffer.currentBytesSize !== 0 &&
buffer.currentBytesSize + item.byteSize >= this.#maxBytesSize
) {
this.#deleteFromBufferUntilSizeIsLessThanMax(buffer, item);

if (this.#onBufferOverflow) {
this.#onBufferOverflow();
}
Expand All @@ -132,7 +136,10 @@ export class CircularMap<V> extends Map<string, SizedSet<V>> {
buffer: SizedSet<V>,
item: SizedItem<V>
) {
while (buffer.currentBytesSize + item.byteSize >= this.#maxBytesSize) {
while (
buffer.size !== 0 &&
buffer.currentBytesSize + item.byteSize >= this.#maxBytesSize
) {
buffer.shift();
buffer.hasEvictedLog = true;
}
Expand Down
70 changes: 70 additions & 0 deletions packages/logger/tests/unit/logBufferStructures.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,74 @@ describe('CircularMap', () => {
options.maxBytesSize
);
});

it('stores item in buffer when item size is equal to maxBytesSize', () => {
// Prepare
const maxBytes = 10;
const onBufferOverflow = vi.fn();
const circularMap = new CircularMap<string>({
maxBytesSize: maxBytes,
onBufferOverflow,
});
const message = 'x'.repeat(maxBytes);

// Act
circularMap.setItem('trace-1', message, 1);

// Assess
const buffer = circularMap.get('trace-1');

expect(buffer).toBeDefined();
expect(buffer?.currentBytesSize).toBe(maxBytes);
expect(buffer?.size).toBe(1);
expect(onBufferOverflow).toHaveBeenCalledTimes(0);
});

it('evicts existing non-empty item from buffer when item size is equal to maxBytesSize', () => {
// Prepare
const maxBytes = 10;
const onBufferOverflow = vi.fn();
const circularMap = new CircularMap<string>({
maxBytesSize: maxBytes,
onBufferOverflow,
});

const message = 'x'.repeat(maxBytes);

// Act
circularMap.setItem('trace-1', message, 1);
circularMap.setItem('trace-1', message, 1);

// Assess
const buffer = circularMap.get('trace-1');

expect(buffer).toBeDefined();
expect(buffer?.currentBytesSize).toBe(maxBytes);
expect(buffer?.size).toBe(1);
expect(onBufferOverflow).toHaveBeenCalledTimes(1);
});

it('should not evict existing empty item from buffer when new item size is equal to maxBytesSize', () => {
// Prepare
const maxBytes = 10;
const onBufferOverflow = vi.fn();
const circularMap = new CircularMap<string>({
maxBytesSize: maxBytes,
onBufferOverflow,
});

const message = 'x'.repeat(maxBytes);

// Act
circularMap.setItem('trace-1', '', 1);
circularMap.setItem('trace-1', message, 1);

// Assess
const buffer = circularMap.get('trace-1');

expect(buffer).toBeDefined();
expect(buffer?.currentBytesSize).toBe(maxBytes);
expect(buffer?.size).toBe(2);
expect(onBufferOverflow).toHaveBeenCalledTimes(0);
});
});
Loading