Skip to content

Commit

Permalink
[NP] add pid to LogRecord (#56851)
Browse files Browse the repository at this point in the history
* add pid to LogRecord

* fix wording

* update docs

* fix legacy_logging_server tests
  • Loading branch information
mshustov authored Feb 6, 2020
1 parent 10f48db commit 5abca85
Show file tree
Hide file tree
Showing 18 changed files with 344 additions and 206 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion src/core/server/legacy/logging/appenders/legacy_appender.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,63 +46,73 @@ test('`append()` correctly pushes records to legacy platform.', () => {
level: LogLevel.Trace,
message: 'message-1',
timestamp,
pid: 5355,
},
{
context: 'context-2',
level: LogLevel.Debug,
message: 'message-2',
timestamp,
pid: 5355,
},
{
context: 'context-3.sub-context-3',
level: LogLevel.Info,
message: 'message-3',
timestamp,
pid: 5355,
},
{
context: 'context-4.sub-context-4',
level: LogLevel.Warn,
message: 'message-4',
timestamp,
pid: 5355,
},
{
context: 'context-5',
error: new Error('Some Error'),
level: LogLevel.Error,
message: 'message-5-with-error',
timestamp,
pid: 5355,
},
{
context: 'context-6',
level: LogLevel.Error,
message: 'message-6-with-message',
timestamp,
pid: 5355,
},
{
context: 'context-7.sub-context-7.sub-sub-context-7',
error: new Error('Some Fatal Error'),
level: LogLevel.Fatal,
message: 'message-7-with-error',
timestamp,
pid: 5355,
},
{
context: 'context-8.sub-context-8.sub-sub-context-8',
level: LogLevel.Fatal,
message: 'message-8-with-message',
timestamp,
pid: 5355,
},
{
context: 'context-9.sub-context-9',
level: LogLevel.Info,
message: 'message-9-with-message',
timestamp,
pid: 5355,
meta: { someValue: 3 },
},
{
context: 'context-10.sub-context-10',
level: LogLevel.Info,
message: 'message-10-with-message',
timestamp,
pid: 5355,
meta: { tags: ['tag1', 'tag2'] },
},
];
Expand All @@ -113,7 +123,12 @@ test('`append()` correctly pushes records to legacy platform.', () => {
}

const [mockLegacyLoggingServerInstance] = (LegacyLoggingServer as any).mock.instances;
expect(mockLegacyLoggingServerInstance.log.mock.calls).toMatchSnapshot();
expect(mockLegacyLoggingServerInstance.log.mock.calls).toHaveLength(records.length);
records.forEach((r, idx) => {
expect(mockLegacyLoggingServerInstance.log.mock.calls[idx][0]).toMatchSnapshot({
pid: expect.any(Number),
});
});
});

test('legacy logging server is correctly created and disposed.', async () => {
Expand Down
3 changes: 3 additions & 0 deletions src/core/server/legacy/logging/legacy_logging_server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ test('correctly forwards log records.', () => {
const timestamp = 1554433221100;
const firstLogRecord = {
timestamp: new Date(timestamp),
pid: 5355,
level: LogLevel.Info,
context: 'some-context',
message: 'some-message',
};

const secondLogRecord = {
timestamp: new Date(timestamp),
pid: 5355,
level: LogLevel.Error,
context: 'some-context.sub-context',
message: 'some-message',
Expand All @@ -47,6 +49,7 @@ test('correctly forwards log records.', () => {

const thirdLogRecord = {
timestamp: new Date(timestamp),
pid: 5355,
level: LogLevel.Trace,
context: 'some-context.sub-context',
message: 'some-message',
Expand Down
Loading

0 comments on commit 5abca85

Please sign in to comment.