Skip to content
Open
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
3 changes: 3 additions & 0 deletions packages/ecs-morgan-format/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { IncomingMessage, ServerResponse } from 'http';
import type { FormatFn } from "morgan";

interface Config {
Expand Down Expand Up @@ -42,6 +43,8 @@ interface Config {
/** Specify "event.dataset" field. Defaults `${serviceName}`. */
eventDataset?: string;

/** Callback for custom modification of the fields */
logHook: (event: { record: any, req: IncomingMessage, res: ServerResponse }) => void;
}

declare function ecsFormat(config?: Config): FormatFn;
Expand Down
2 changes: 2 additions & 0 deletions packages/ecs-morgan-format/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ function ecsFormat (opts) {
formatHttpRequest(ecsFields, req)
formatHttpResponse(ecsFields, res)

opts.logHook && opts.logHook({ record: ecsFields, req, res })

return stringify(ecsFields)
}
}
Expand Down
23 changes: 23 additions & 0 deletions packages/ecs-morgan-format/test/basic.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,26 @@ test('can configure correlation fields', t => {
t.end()
})
})

test('can provide custom fields', t => {
t.plan(2)

const stream = split().on('data', line => {
const rec = JSON.parse(line)
t.equal(rec.labels.custom, 'customValue')
})
const logger = morgan(
ecsFormat({
logHook ({ record, req, res }) {
record.labels = record.labels || {}
record.labels.custom = 'customValue'
}
}),
{ stream }
)

makeExpressServerAndRequest(logger, '/', {}, null, function (err) {
t.error(err)
t.end()
})
})