Skip to content

Commit 0a25112

Browse files
committed
chore: updated
1 parent 87ac068 commit 0a25112

1 file changed

Lines changed: 7 additions & 24 deletions

File tree

  • packages/core/src/tracing/instrumentation/logging

packages/core/src/tracing/instrumentation/logging/bunyan.js

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,17 @@ function instrumentedLog(ctx, originalLog, originalArgs, markAsError) {
6767

6868
if (typeof fields === 'string') {
6969
message = fields;
70-
} else if (fields instanceof Error && typeof message === 'string') {
71-
// CASE: logger.error(new Error('msg'), 'another msg')
72-
const errorMessage = tracingUtil.extractErrorMessage(fields);
73-
message = `${errorMessage} -- ${message}`;
7470
} else if (fields instanceof Error) {
75-
// CASE: logger.error(new Error('msg'))
76-
message = tracingUtil.extractErrorMessage(fields);
77-
} else if (fields?.err instanceof Error && typeof message === 'string') {
78-
// CASE: logger.error({ err: new Error(..) }, 'another msg')
79-
const errorMessage = tracingUtil.extractErrorMessage(fields.err);
80-
message = `${errorMessage} -- ${message}`;
71+
const errorMessage = tracingUtil.extractErrorMessage(fields);
72+
message = typeof message === 'string' ? `${errorMessage} -- ${message}` : errorMessage;
8173
} else if (fields?.err instanceof Error) {
82-
// CASE: logger.error({ err: new Error(..) })
83-
message = tracingUtil.extractErrorMessage(fields.err);
84-
} else if (fields?.err && typeof fields.err.message === 'string' && typeof message === 'string') {
85-
// CASE: logger.error({ err: { message: 'msg' } }, 'another msg')
86-
message = `${fields.err.message} -- ${message}`;
74+
const errorMessage = tracingUtil.extractErrorMessage(fields.err);
75+
message = typeof message === 'string' ? `${errorMessage} -- ${message}` : errorMessage;
8776
} else if (fields?.err && typeof fields.err.message === 'string') {
88-
// CASE: logger.error({ err: { message: 'msg' } })
89-
message = fields.err.message;
90-
} else if (fields && typeof fields.message === 'string' && typeof message === 'string') {
91-
message = `${fields.message} -- ${message}`;
77+
message = typeof message === 'string' ? `${fields.err.message} -- ${message}` : fields.err.message;
9278
} else if (fields && typeof fields.message === 'string') {
93-
message = fields.message;
94-
} else if (typeof fields === 'object') {
95-
// CASE: we try our best to serialize logged objects
96-
// we do not want to directly call JSON.stringify because we do not know how big the object is and
97-
// there might be possible circular dependencies in the object.
79+
message = typeof message === 'string' ? `${fields.message} -- ${message}` : fields.message;
80+
} else if (fields && typeof fields === 'object') {
9881
const maxNoOfKeys = 100;
9982
const obj = {};
10083

0 commit comments

Comments
 (0)