Added id and child logger to request and response

lib/tcp-server.js

@@ -9,6 +9,9 @@ module.exports = function serverPlugin (upring, opts, next) {
   upring._server.listen(opts.port, opts.host, onListen)
   upring._server.on('error', upring.emit.bind(upring, 'error'))
 
+  const genReqId = opts.genReqId || reqIdGenFactory()
+  upring.genReqId = genReqId
+
   function handler (stream) {
     if (upring.closed) {
       stream.on('error', noop)
@@ -24,13 +27,27 @@ module.exports = function serverPlugin (upring, opts, next) {
       upring.log.debug({ address: stream.address() }, 'closed connection')
       upring._inbound.delete(instance)
     })
-    instance.on('request', upring._dispatch)
+    instance.on('request', onRequest)
+  }
+
+  function onRequest (req, reply) {
+    req.id = genReqId(req)
+    req.log = upring.log.child({ reqId: req.id })
+    upring._dispatch(req, reply)
   }
 
   function onListen () {
     upring.log.debug({ address: upring._server.address() }, 'listening')
     next()
   }
+
+  function reqIdGenFactory () {
+    var maxInt = 2147483647
+    var nextReqId = 0
+    return function _genReqId (req) {
+      return req.id || (nextReqId = (nextReqId + 1) & maxInt)
+    }
+  }
 }
 
 function noop () {}

upring.js

@@ -208,6 +208,8 @@ UpRing.prototype.request = function (obj, callback, _count) {
     return
   }
 
+  obj.id = this.genReqId(obj)
+
   if (this._hashring.allocatedToMe(obj.key)) {
     this.log.trace({ msg: obj }, 'local call')
     this._dispatch(obj, dezalgo(callback))
@@ -249,6 +251,10 @@ UpRing.prototype.request = function (obj, callback, _count) {
           return
         }
       }
+      if (obj.id != null) {
+        result.id = obj.id
+        result.log = this.log.child({ reqId: result.id })
+      }
       callback(err, result)
     })
   }