feat(helpers): bump ecs.version to 1.6.0; do not lowercase http.request.method

Author: trentm

helpers/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+- Update ECS version to "1.6.0". Relevant [ECS changes](https://github.com/elastic/ecs/blob/master/CHANGELOG.md#160):
+  - "span.id" - This field is included by the loggers when integrating with APM.
+  - "Deprecate guidance to lowercase http.request.method."
+    Now when using `formatHttpRequest` the "http.request.method" field will no
+    longer be lowercased.
 - Fix possible crash in `formatHttpRequest` if `req.socket` is not available.
   ([#17](https://github.com/elastic/ecs-logging-nodejs/issues/17))
 - Add support for the hapi request object being passed to `formatHttpRequest`

helpers/lib/http-formatters.js

@@ -43,7 +43,7 @@ function formatHttpRequest (ecs, req) {
   ecs.http = ecs.http || {}
   ecs.http.version = httpVersion
   ecs.http.request = ecs.http.request || {}
-  ecs.http.request.method = method.toLowerCase()
+  ecs.http.request.method = method
 
   ecs.url = ecs.url || {}
   ecs.url.full = (socket && socket.encrypted ? 'https://' : 'http://') + headers.host + url

helpers/lib/index.js

@@ -22,7 +22,7 @@ const errorFormatters = require('./error-formatters')
 const httpFormatters = require('./http-formatters')
 
 module.exports = {
-  version: '1.5.0',
+  version: '1.6.0',
   stringify,
   ...errorFormatters,
   ...httpFormatters

helpers/test/basic.test.js

@@ -161,7 +161,7 @@ test('formatHttpRequest and formatHttpResponse should return a valid ecs object'
     t.deepEqual(line.http, {
       version: '1.1',
       request: {
-        method: 'post',
+        method: 'POST',
         headers: {
           'content-type': 'application/json',
           host: `localhost:${server.address().port}`,

helpers/test/express.test.js

@@ -50,7 +50,7 @@ test('express res/req serialization', t => {
     t.deepEqual(rec.http, {
       version: '1.1',
       request: {
-        method: 'get',
+        method: 'GET',
         headers: {
           host: `localhost:${server.address().port}`,
           connection: 'close'

helpers/test/hapi.test.js

@@ -59,7 +59,7 @@ test('hapi res/req serialization', testOpts, t => {
     t.deepEqual(rec.http, {
       version: '1.1',
       request: {
-        method: 'get',
+        method: 'GET',
         headers: {
           host: `localhost:${server.info.port}`,
           connection: 'close'