Update logger tests

This commit is contained in:
Eric Bailey
2026-01-21 18:17:23 -06:00
parent f9ae0f01eb
commit aa44dcc5d2
3 changed files with 25 additions and 17 deletions
+16 -16
View File
@@ -45,7 +45,7 @@ describe('general functionality', () => {
logger.addTransport(mockTransport) logger.addTransport(mockTransport)
const extra = {foo: true} const extra = {foo: true, metadata: {}}
logger.warn('message', extra) logger.warn('message', extra)
expect(mockTransport).toHaveBeenCalledWith( expect(mockTransport).toHaveBeenCalledWith(
@@ -71,7 +71,7 @@ describe('general functionality', () => {
LogLevel.Warn, LogLevel.Warn,
undefined, undefined,
'a', 'a',
{}, {metadata: {}},
timestamp, timestamp,
) )
@@ -81,7 +81,7 @@ describe('general functionality', () => {
LogLevel.Warn, LogLevel.Warn,
undefined, undefined,
'b', 'b',
{}, {metadata: {}},
timestamp, timestamp,
) )
@@ -91,7 +91,7 @@ describe('general functionality', () => {
LogLevel.Warn, LogLevel.Warn,
undefined, undefined,
'c', 'c',
{}, {metadata: {}},
timestamp, timestamp,
) )
@@ -256,7 +256,7 @@ describe('general functionality', () => {
LogLevel.Warn, LogLevel.Warn,
undefined, undefined,
'warn', 'warn',
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -276,7 +276,7 @@ describe('create', () => {
LogLevel.Info, LogLevel.Info,
Logger.Context.Default, Logger.Context.Default,
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -300,7 +300,7 @@ describe('debug contexts', () => {
LogLevel.Debug, LogLevel.Debug,
'specific', 'specific',
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -323,7 +323,7 @@ describe('debug contexts', () => {
LogLevel.Debug, LogLevel.Debug,
'namespace:foo', 'namespace:foo',
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -345,7 +345,7 @@ describe('debug contexts', () => {
LogLevel.Debug, LogLevel.Debug,
'namespace:bar:baz', 'namespace:bar:baz',
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -367,7 +367,7 @@ describe('supports levels', () => {
LogLevel.Debug, LogLevel.Debug,
undefined, undefined,
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
@@ -376,7 +376,7 @@ describe('supports levels', () => {
LogLevel.Info, LogLevel.Info,
undefined, undefined,
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
@@ -385,7 +385,7 @@ describe('supports levels', () => {
LogLevel.Warn, LogLevel.Warn,
undefined, undefined,
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
@@ -395,7 +395,7 @@ describe('supports levels', () => {
LogLevel.Error, LogLevel.Error,
undefined, undefined,
e, e,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -418,7 +418,7 @@ describe('supports levels', () => {
LogLevel.Info, LogLevel.Info,
undefined, undefined,
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -444,7 +444,7 @@ describe('supports levels', () => {
LogLevel.Warn, LogLevel.Warn,
undefined, undefined,
message, message,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
@@ -474,7 +474,7 @@ describe('supports levels', () => {
LogLevel.Error, LogLevel.Error,
undefined, undefined,
e, e,
{}, {metadata: {}},
timestamp, timestamp,
) )
}) })
+1 -1
View File
@@ -123,7 +123,7 @@ export class Logger {
const timestamp = Date.now() const timestamp = Date.now()
const meta: Metadata = { const meta: Metadata = {
...metadata, ...metadata,
inherited: this.inheritedMetadata, metadata: this.inheritedMetadata,
} }
// send every log to syslog // send every log to syslog
+8
View File
@@ -24,6 +24,14 @@ export function prepareMetadata(
if (value instanceof Error) { if (value instanceof Error) {
value = value.toString() value = value.toString()
} }
if (
typeof value === 'object' &&
value !== null &&
Object.keys(value).length === 0 &&
value.constructor === Object
) {
return acc
}
return {...acc, [key]: value} return {...acc, [key]: value}
}, {}) }, {})
} }