chore: prefer dotted field names; drop ".log" suffix on `event.datase…

…t` (#150) - Change to adding dotted field names (`"ecs.version": "1.6.0"`), rather than namespaced fields (`"ecs": {"version": "1.6.0"}`) for most fields. This is supported by the ecs-logging spec, and arguably preferred in the ECS logging docs. It is also what the ecs-logging-java libraries do. The resulting output is slightly shorter, and accidental collisions with user fields is less likely. - Stop adding ".log" suffix to `event.dataset` field. Closes: #95
elastic · Oct 16, 2023 · 80a4b22 · 80a4b22
1 parent 7760153
commit 80a4b22
Show file tree

Hide file tree

Showing 23 changed files with 256 additions and 448 deletions.
diff --git a/docs/intro.asciidoc b/docs/intro.asciidoc
@@ -17,7 +17,7 @@ popular web frameworks. A minimal log record includes the following fields:
   "@timestamp": "2021-01-13T21:32:38.095Z",
   "log.level": "info",
   "message": "hi",
-  "ecs": {"version":"1.6.0"}
+  "ecs.version": "1.6.0"
 }
 ----
 

diff --git a/docs/morgan.asciidoc b/docs/morgan.asciidoc
@@ -85,9 +85,7 @@ similar to the following:
   "@timestamp": "2021-01-16T00:03:23.279Z",
   "log.level": "info",
   "message": "::1 - - [16/Jan/2021:00:03:23 +0000] \"GET / HTTP/1.1\" 200 13 \"-\" \"curl/7.64.1\"",
-  "ecs": {
-    "version": "1.6.0"
-  },
+  "ecs.version": "1.6.0",
   "http": {
     "version": "1.1",
     "request": {
@@ -178,19 +176,11 @@ For example, running https://github.com/elastic/ecs-logging-nodejs/blob/main/log
 ----
 % node examples/express-with-apm.js | jq .
 {
-  ...
-  "event": {
-    "dataset": "express-with-elastic-apm.log"
-  },
-  "trace": {
-    "id": "e097193afa9ac221017b45a1f674601c"
-  },
-  "transaction": {
-    "id": "c6aa5b47e01bad72"
-  },
-  "service": {
-    "name": "express-with-elastic-apm"
-  }
+  // The same fields as before, plus:
+  "trace.id": "e097193afa9ac221017b45a1f674601c",
+  "transaction.id": "c6aa5b47e01bad72",
+  "service.name": "express-with-elastic-apm",
+  "event.dataset": "express-with-elastic-apm"
 }
 ----
 

diff --git a/docs/pino.asciidoc b/docs/pino.asciidoc
@@ -68,8 +68,8 @@ Running this will produce log output similar to the following:
 
 [source,cmd]
 ----
-{"log.level":"info","@timestamp":"2021-01-19T22:51:12.142Z","ecs":{"version":"1.6.0"},"process":{"pid":82240},"host":{"hostname":"pink.local"},"message":"Hello world"}
-{"log.level":"warn","@timestamp":"2021-01-19T22:51:12.143Z","ecs":{"version":"1.6.0"},"process":{"pid":82240},"host":{"hostname":"pink.local"},"module":"foo","message":"From child"}
+{"log.level":"info","@timestamp":"2023-10-14T02:07:47.901Z","process.pid":56645,"host.hostname":"pink.local","ecs.version":"1.6.0","message":"Hello world"}
+{"log.level":"warn","@timestamp":"2023-10-14T02:07:47.901Z","process.pid":56645,"host.hostname":"pink.local","ecs.version":"1.6.0","module":"foo","message":"From child"}
 ----
 
 [float]
@@ -159,22 +159,17 @@ For example:
 ...                               # run 'curl http://localhost:3000/'
 {
   "log.level": "info",
-  "@timestamp": "2021-01-19T22:58:59.649Z",
-  "ecs": {
-    "version": "1.6.0"
-  },
-  "process": {
-    "pid": 82670
-  },
-  "host": {
-    "hostname": "pink.local"
-  },
+  "@timestamp": "2023-10-14T02:10:14.477Z",
+  "process.pid": 56697,
+  "host.hostname": "pink.local",
+  "ecs.version": "1.6.0",
   "http": {
     "version": "1.1",
     "request": {
       "method": "GET",
       "headers": {
         "host": "localhost:3000",
+        "user-agent": "curl/8.1.2",
         "accept": "*/*"
       }
     },
@@ -189,8 +184,13 @@ For example:
     "full": "http://localhost:3000/",
     "path": "/"
   },
+  "client": {
+    "address": "::ffff:127.0.0.1",
+    "ip": "::ffff:127.0.0.1",
+    "port": 49504
+  },
   "user_agent": {
-    "original": "curl/7.64.1"
+    "original": "curl/8.1.2"
   },
   "message": "handled request"
 }
@@ -220,21 +220,10 @@ For example, running https://github.com/elastic/ecs-logging-nodejs/blob/main/log
 ----
 % node examples/http-with-elastic-apm.js | jq .
 ...
-  "service": {
-    "name": "http-with-elastic-apm"
-  },
-  "event": {
-    "dataset": "http-with-elastic-apm.log"
-  },
-  "trace": {
-    "id": "a1c23e04d7174462f330f5921c8f036d"
-  },
-  "transaction": {
-    "id": "2550c4c267d4dd53"
-  },
-  "span": {
-    "id": "16a8704258dbc328"
-  },
+  "service.name": "http-with-elastic-apm",
+  "event.dataset": "http-with-elastic-apm",
+  "trace.id": "79de6da334efae17ad43758573d57f1c",
+  "transaction.id": "8bf944f94b72c54d",
 ...
 ----
 

diff --git a/docs/winston.asciidoc b/docs/winston.asciidoc
@@ -78,8 +78,8 @@ Running this script (available https://github.com/elastic/ecs-logging-nodejs/blo
 [source,cmd]
 ----
 % node examples/basic.js
-{"@timestamp":"2021-01-13T21:32:38.095Z","log.level":"info","message":"hi","ecs":{"version":"1.6.0"}}
-{"@timestamp":"2021-01-13T21:32:38.096Z","log.level":"error","message":"oops there is a problem","ecs":{"version":"1.6.0"},"foo":"bar"}
+{"@timestamp":"2023-10-14T02:14:17.302Z","log.level":"info","message":"hi","ecs.version":"1.6.0"}
+{"@timestamp":"2023-10-14T02:14:17.304Z","log.level":"error","message":"oops there is a problem","ecs.version":"1.6.0","foo":"bar"}
 ----
 
 The formatter handles serialization to JSON, so you don't need to add the
@@ -120,14 +120,12 @@ will yield (pretty-printed for readability):
   "@timestamp": "2021-01-26T17:25:07.983Z",
   "log.level": "info",
   "message": "oops",
-  "ecs": {
-    "version": "1.6.0"
-  },
   "error": {
     "type": "Error",
     "message": "boom",
     "stack_trace": "Error: boom\n    at Object.<anonymous> (..."
-  }
+  },
+  "ecs.version": "1.6.0"
 }
 ----
 
@@ -189,18 +187,16 @@ For https://github.com/elastic/ecs-logging-nodejs/blob/main/loggers/winston/exam
 % node examples/http.js | jq .    # using jq for pretty printing
 ...                               # run 'curl http://localhost:3000/'
 {
-  "@timestamp": "2021-01-13T22:00:07.442Z",
+  "@timestamp": "2023-10-14T02:15:54.768Z",
   "log.level": "info",
   "message": "handled request",
-  "ecs": {
-    "version": "1.6.0"
-  },
   "http": {
     "version": "1.1",
     "request": {
       "method": "GET",
       "headers": {
         "host": "localhost:3000",
+        "user-agent": "curl/8.1.2",
         "accept": "*/*"
       }
     },
@@ -215,9 +211,15 @@ For https://github.com/elastic/ecs-logging-nodejs/blob/main/loggers/winston/exam
     "path": "/",
     "full": "http://localhost:3000/"
   },
+  "client": {
+    "address": "::ffff:127.0.0.1",
+    "ip": "::ffff:127.0.0.1",
+    "port": 49538
+  },
   "user_agent": {
-    "original": "curl/7.64.1"
-  }
+    "original": "curl/8.1.2"
+  },
+  "ecs.version": "1.6.0"
 }
 ----
 
@@ -239,19 +241,11 @@ For example, running https://github.com/elastic/ecs-logging-nodejs/blob/main/log
 ----
 % node examples/http-with-elastic-apm.js | jq .
 ...
-  "event": {
-    "dataset": "http-with-elastic-apm.log"
-  },
-  "trace": {
-    "id": "74631535a02bbe6a07c298b28c7443f4"
-  },
-  "transaction": {
-    "id": "505400b77aba4d9a"
-  },
-  "service": {
-    "name": "http-with-elastic-apm"
-  }
-...
+  "service.name": "http-with-elastic-apm",
+  "event.dataset": "http-with-elastic-apm",
+  "trace.id": "7fd75f0f33ff49aba85d060b46dcad7e",
+  "transaction.id": "6c97c7c1b468fa05"
+}
 ----
 
 These IDs match trace data reported by the APM agent.

diff --git a/loggers/morgan/CHANGELOG.md b/loggers/morgan/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @elastic/ecs-morgan-format Changelog
 
+## Unreleased
+
+- Change to adding dotted field names (`"ecs.version": "1.6.0"`), rather than
+  namespaced fields (`"ecs": {"version": "1.6.0"}`) for most fields. This is
+  supported by the ecs-logging spec, and arguably preferred in the ECS logging
+  docs. It is also what the ecs-logging-java libraries do. The resulting output
+  is slightly shorter, and accidental collisions with user fields is less
+  likely.
+- Stop adding ".log" suffix to `event.dataset` field.
+  ([#95](https://github.com/elastic/ecs-logging-nodejs/issues/95))
+
 ## v1.1.0
 
 - Update @elastic/ecs-helpers@1.1.0 to get more robust HTTP req and res

diff --git a/loggers/morgan/examples/express-with-apm.js b/loggers/morgan/examples/express-with-apm.js
@@ -22,17 +22,18 @@
 //
 // If usage of Elastic APM is detected (i.e. the "elastic-apm-node" package
 // is being used), then log records will include trace identifiers, e.g.:
-//       "trace": { "id": "678f2a0189f259baf2ea17db8af5a4d0" },
-//       "transaction": { "id": "1cc6339964575165" },
-//       "span": { "id": "f72c52ceda81777a" },
+//       "trace.id": "678f2a0189f259baf2ea17db8af5a4d0",
+//       "transaction.id": "1cc6339964575165",
+//       "span.id": "f72c52ceda81777a",
 // to correlate log and trace data in Kibana.
 
 /* eslint-disable-next-line no-unused-vars */
 const apm = require('elastic-apm-node').start({
   serviceName: 'express-with-elastic-apm',
   centralConfig: false,
   captureExceptions: false,
-  metricsInterval: 0
+  metricsInterval: '0s',
+  logLevel: 'warn' // avoid APM agent log preamble
 })
 
 const app = require('express')()

diff --git a/loggers/morgan/index.js b/loggers/morgan/index.js
@@ -45,7 +45,7 @@ try {
 //      APM agent is detected, then log records will include the following
 //      fields:
 //        - "service.name" - the configured serviceName in the agent
-//        - "event.dataset" - set to "$serviceName.log" for correlation in Kibana
+//        - "event.dataset" - set to "$serviceName" for correlation in Kibana
 //        - "trace.id", "transaction.id", and "span.id" - if there is a current
 //          active trace when the log call is made
 //      Default true.
@@ -82,21 +82,17 @@ function ecsFormat (opts) {
     apm = elasticApm
   }
 
-  let serviceField
-  let eventField
+  const extraFields = {}
   if (apm) {
-    // https://github.com/elastic/apm-agent-nodejs/pull/1949 is adding
-    // getServiceName() in v3.11.0. Fallback to private `apm._conf`.
     // istanbul ignore next
     const serviceName = apm.getServiceName
-      ? apm.getServiceName()
+      ? apm.getServiceName() // added in [email protected]
       : apm._conf.serviceName
-    // A mis-configured APM Agent can be "started" but not have a
-    // "serviceName".
+    // A mis-configured APM Agent can be "started" but not have a "serviceName".
     // istanbul ignore else
     if (serviceName) {
-      serviceField = { name: serviceName }
-      eventField = { dataset: serviceName + '.log' }
+      extraFields['service.name'] = serviceName
+      extraFields['event.dataset'] = serviceName
     }
   }
 
@@ -105,25 +101,17 @@ function ecsFormat (opts) {
       '@timestamp': new Date().toISOString(),
       'log.level': res.statusCode < 500 ? 'info' : 'error',
       message: fmt(token, req, res),
-      ecs: { version }
-    }
-
-    if (serviceField) {
-      ecsFields.service = serviceField
-    }
-    if (eventField) {
-      ecsFields.event = eventField
+      'ecs.version': version,
+      ...extraFields
     }
 
     // https://www.elastic.co/guide/en/ecs/current/ecs-tracing.html
     if (apm) {
       const tx = apm.currentTransaction
       // istanbul ignore else
       if (tx) {
-        ecsFields.trace = ecsFields.trace || {}
-        ecsFields.trace.id = tx.traceId
-        ecsFields.transaction = ecsFields.transaction || {}
-        ecsFields.transaction.id = tx.id
+        ecsFields['trace.id'] = tx.traceId
+        ecsFields['transaction.id'] = tx.id
         // Not including `span.id` because the way morgan logs (on the HTTP
         // Response "finished" event), any spans during the request handler
         // are no longer active.

diff --git a/loggers/morgan/test/apm.test.js b/loggers/morgan/test/apm.test.js
@@ -132,10 +132,10 @@ test('tracing integration works', t => {
       t.ok(traceObjs[0].metadata, 'traceObjs[0] is metadata')
       t.ok(traceObjs[1].transaction, 'traceObjs[1] is transaction')
       const tx = traceObjs[1].transaction
-      t.equal(logObjs[0].trace.id, tx.trace_id, 'trace.id matches')
-      t.equal(logObjs[0].transaction.id, tx.id, 'transaction.id matches')
-      t.equal(logObjs[0].service.name, 'test-apm')
-      t.equal(logObjs[0].event.dataset, 'test-apm.log')
+      t.equal(logObjs[0]['trace.id'], tx.trace_id, 'trace.id matches')
+      t.equal(logObjs[0]['transaction.id'], tx.id, 'transaction.id matches')
+      t.equal(logObjs[0]['service.name'], 'test-apm')
+      t.equal(logObjs[0]['event.dataset'], 'test-apm')
       finish()
     }
   }

diff --git a/loggers/pino/CHANGELOG.md b/loggers/pino/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @elastic/ecs-pino-format Changelog
 
+## Unreleased
+
+- Change to adding dotted field names (`"ecs.version": "1.6.0"`), rather than
+  namespaced fields (`"ecs": {"version": "1.6.0"}`) for most fields. This is
+  supported by the ecs-logging spec, and arguably preferred in the ECS logging
+  docs. It is also what the ecs-logging-java libraries do. The resulting output
+  is slightly shorter, and accidental collisions with user fields is less
+  likely.
+- Stop adding ".log" suffix to `event.dataset` field.
+  ([#95](https://github.com/elastic/ecs-logging-nodejs/issues/95))
+
 ## v1.3.0
 
 - TypeScript types. ([#82](https://github.com/elastic/ecs-logging-nodejs/pull/82))

diff --git a/loggers/pino/examples/http-with-elastic-apm.js b/loggers/pino/examples/http-with-elastic-apm.js
@@ -22,17 +22,18 @@
 //
 // If usage of Elastic APM is detected (i.e. the "elastic-apm-node" package
 // is being used), then log records will include trace identifiers, e.g.:
-//       "trace": { "id": "678f2a0189f259baf2ea17db8af5a4d0" },
-//       "transaction": { "id": "1cc6339964575165" },
-//       "span": { "id": "f72c52ceda81777a" },
+//       "trace.id": "678f2a0189f259baf2ea17db8af5a4d0",
+//       "transaction.id": "1cc6339964575165",
+//       "span.id": "f72c52ceda81777a",
 // to correlate log and trace data in Kibana.
 
 /* eslint-disable-next-line no-unused-vars */
 const apm = require('elastic-apm-node').start({
   serviceName: 'http-with-elastic-apm',
   centralConfig: false,
   captureExceptions: false,
-  metricsInterval: 0
+  metricsInterval: '0s',
+  logLevel: 'warn' // avoid APM agent log preamble
 })
 
 const http = require('http')

diff --git a/loggers/pino/index.d.ts b/loggers/pino/index.d.ts
@@ -18,7 +18,7 @@ interface Config {
    * fields:
    *
    * - "service.name" - the configured serviceName in the agent
-   * - "event.dataset" - set to "$serviceName.log" for correlation in Kibana
+   * - "event.dataset" - set to "$serviceName" for correlation in Kibana
    * - "trace.id", "transaction.id", and "span.id" - if there is a current
    *   active trace when the log call is made
    *