Merge branch 'master' of https://github.com/ovhemert/pino-datadog

docs/API.md

@@ -77,3 +77,9 @@ Set a default service to all the logs sent to datadog
 Type: `String` *(optional)*
 
 Set a default hostname to all the logs sent to datadog
+
+#### keepMsg
+
+Type: `Boolean` *(optional)*
+
+Keep the `msg` attribute in the log record. Used to allow a Datadog facet on the message.

package.json

@@ -40,12 +40,12 @@
     "tap": "^14.10.8"
   },
   "dependencies": {
-    "axios": "^0.19.2",
+    "axios": "^0.20.0",
     "batch2": "^1.0.6",
-    "commander": "^6.0.0",
+    "commander": "^6.1.0",
     "fast-json-parse": "^1.0.3",
     "pumpify": "^2.0.1",
-    "split2": "^3.1.1",
+    "split2": "^3.2.2",
     "stream": "0.0.2",
     "through2": "^4.0.2"
   }

src/index.js

@@ -12,7 +12,7 @@ function createWriteStreamSync (options = {}) {
   const { size = 1 } = options
 
   const parseJsonStream = streams.parseJsonStream()
-  const toLogEntryStream = streams.toLogEntryStream()
+  const toLogEntryStream = streams.toLogEntryStream(options)
   const batchStream = streams.batchStream(size)
 
   const client = new datadog.Client(options)

src/streams.js

@@ -36,7 +36,7 @@ function toLogEntry (item) {
   const ddtags = Object.keys(objTags).map(k => { return `${k}:${objTags[k]}` }).join(',')
 
   const entry = Object.assign({}, item, { timestamp, status, message, host, service, ddsource, ddtags })
-  delete entry.time; delete entry.level; delete entry.msg; delete entry.hostname; delete entry.source; delete entry.labels; delete entry.tags
+  delete entry.time; delete entry.level; delete entry.hostname; delete entry.source; delete entry.labels; delete entry.tags
   if (!service) { delete entry.service }
   if (!ddsource) { delete entry.ddsource }
   if (!ddtags) { delete entry.ddtags }
@@ -46,6 +46,9 @@ function toLogEntry (item) {
 function toLogEntryStream (options = {}) {
   return through2.obj(function transport (chunk, enc, cb) {
     const entry = toLogEntry(chunk)
+    if (!options.keepMsg) {
+      delete entry.msg
+    }
     cb(null, entry)
   })
 }

test/streams.test.js

@@ -65,3 +65,20 @@ test('transforms pino log messages', t => {
   logs.forEach(log => writeStream.write(log))
   writeStream.end()
 })
+
+test('transforms pino log stream, leaves msg alone', t => {
+  const writeStream = tested.toLogEntryStream({ keepMsg: true })
+  const output = []
+  const logs = [
+    { level: 10, time: 1532081790710, msg: 'trace message' }
+  ]
+  writeStream.on('data', chunk => {
+    output.push(chunk)
+  }).on('end', () => {
+    t.equal(output[0].message, 'trace message')
+    t.equal(output[0].msg, 'trace message')
+    t.end()
+  })
+  logs.forEach(log => writeStream.write(log))
+  writeStream.end()
+})