@nxtedition/lib 23.17.1 → 23.17.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.17.1",
+  "version": "23.17.2",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/trace.js

@@ -61,40 +61,29 @@ export function makeTrace({
         dispatcher: client,
       }).then(({ body }) => body.dump())
     } catch (err) {
-      logger.error({ err }, 'trace failed')
+      logger.error({ err, data }, 'trace failed')
     } finally {
       pending -= data.length
     }
   }
 
+  let dropCount = 0
   const warnDrop = fp.throttle(10e3, () => {
-    logger.warn('trace dropped')
+    logger.warn({ count: dropCount }, 'trace dropped')
+    dropCount = 0
   })
 
-  const prefix = `{ "create": { "_index": "trace-${index}" } }\n{ "serviceName": "${serviceName}", "op": "`
+  const prefix = `{"create":{"_index":"trace-${index}"}}\n{`
 
   function trace(obj, op) {
-    if (typeof obj === 'string') {
-      // Do nothing...
-    } else {
-      if (obj.serviceName) {
-        throw new Error('invalid property `serviceName`')
-      }
-      if (obj.op) {
-        throw new Error('invalid property `op`')
-      }
-      if (obj['@timestamp']) {
-        throw new Error('invalid property `@timestamp`')
-      }
-    }
-
     if (pending > limit) {
+      dropCount++
       warnDrop()
     } else {
       const doc = (typeof obj === 'string' ? obj : stringify(obj)).slice(1, -1)
       traceData +=
         prefix +
-        `${op}", "pid": ${process.pid}, "tid": ${threadId}, "traceId": ${genTraceId()}, "@timestamp": ${Date.now()}, ${doc} }\n`
+        `${doc},"serviceName":"${serviceName}","op":"${op}","pid":${process.pid},"tid":${threadId},"traceId":${genTraceId()},"@timestamp":${Date.now()}}\n`
       if (traceData.length > batch) {
         flushTraces()
       }