diff --git a/lib/rpc-client/client.js b/lib/rpc-client/client.js
index 2cccea2..bee2e4b 100644
--- a/lib/rpc-client/client.js
+++ b/lib/rpc-client/client.js
@@ -24,10 +24,14 @@ var STATE_CLOSED  = 3;  // client has closed
  * RPC Client Class
  */
 var Client = function(opts) {
-  this.opts = opts || {};
+  opts = opts || {};
   this._context = opts.context;
   this._routeContext = opts.routeContext;
   this.router = opts.router || router;
+  if(this._context) {
+    opts.clientId = this._context.serverId;
+  }
+  this.opts = opts;
 
   this._station = createStation(opts);
   this.proxies = {};
@@ -167,7 +171,7 @@ pro.rpcInvoke = function(serverId, msg, cb) {
     cb(new Error('[pomelo-rpc] fail to do rpc invoke for client is not running'));
     return;
   }
-  var tracer = new Tracer(this.opts.rpcLogger, this.opts.rpcDebugLog, this._context.serverId, serverId, msg);
+  var tracer = new Tracer(this.opts.rpcLogger, this.opts.rpcDebugLog, this.opts.clientId, serverId, msg);
   this._station.dispatch(tracer, serverId, msg, null, cb);
 };
 
diff --git a/lib/rpc-client/mailboxes/blackhole.js b/lib/rpc-client/mailboxes/blackhole.js
index 028706e..45c047b 100644
--- a/lib/rpc-client/mailboxes/blackhole.js
+++ b/lib/rpc-client/mailboxes/blackhole.js
@@ -4,7 +4,8 @@ var logger = require('pomelo-logger').getLogger('pomelo-rpc', __filename);
 
 var exp = module.exports = new EventEmitter();
 
-exp.connect = function(cb) {
+exp.connect = function(tracer, cb) {
+  tracer.info('client', __filename, 'connect', 'connect to blackhole');
   process.nextTick(function() {
     utils.invokeCallback(cb, new Error('fail to connect to remote server and switch to blackhole.'));
   });
@@ -13,9 +14,10 @@ exp.connect = function(cb) {
 exp.close = function(cb) {
 };
 
-exp.send = function(msg, opts, cb) {
+exp.send = function(tracer, msg, opts, cb) {
+  tracer.info('client', __filename, 'send', 'send rpc msg to blackhole');
   logger.info('message into blackhole: %j', msg);
   process.nextTick(function() {
-    utils.invokeCallback(cb, new Error('message was forward to blackhole.'));
+    utils.invokeCallback(cb, tracer, new Error('message was forward to blackhole.'));
   });
-};
\ No newline at end of file
+};
diff --git a/lib/rpc-client/mailboxes/tcp-mailbox.js b/lib/rpc-client/mailboxes/tcp-mailbox.js
index 930d446..0f39134 100644
--- a/lib/rpc-client/mailboxes/tcp-mailbox.js
+++ b/lib/rpc-client/mailboxes/tcp-mailbox.js
@@ -9,7 +9,7 @@ var DEFAULT_INTERVAL = 50;
 
 var MailBox = function(server, opts) {
   EventEmitter.call(this);
-  opts = opts || {};
+  this.opts = opts || {};
   this.id = server.id;
   this.host = server.host;
   this.port = server.port;
@@ -104,12 +104,12 @@ pro.close = function() {
 pro.send = function(tracer, msg, opts, cb) {
   tracer.info('client', __filename, 'send', 'tcp-mailbox try to send');
   if(!this.connected) {
-    utils.invokeCallback(cb, new Error('not init.'));
+    utils.invokeCallback(cb, tracer, new Error('not init.'));
     return;
   }
 
   if(this.closed) {
-    utils.invokeCallback(cb, new Error('mailbox alread closed.'));
+    utils.invokeCallback(cb, tracer, new Error('mailbox alread closed.'));
     return;
   }
 
@@ -157,14 +157,14 @@ var processMsg = function(mailbox, pkg) {
     return;
   }
 
-  var tracer = new Tracer(mailbox.opts.rpcLogger, mailbox.opts.rpcDebugLog, mailbox.opts.context.serverId, pkg.source, pkg.resp, pkg.traceId, pkg.seqId);
+  var tracer = new Tracer(mailbox.opts.rpcLogger, mailbox.opts.rpcDebugLog, mailbox.opts.clientId, pkg.source, pkg.resp, pkg.traceId, pkg.seqId);
   var args = [tracer];
 
   pkg.resp.forEach(function(arg){
     args.push(arg);
   });
 
-  cb.apply(null, pkg.resp);
+  cb.apply(null, args);
 };
 
 /**
diff --git a/lib/rpc-client/mailboxes/ws-mailbox.js b/lib/rpc-client/mailboxes/ws-mailbox.js
index 3ddd95e..1d8f306 100644
--- a/lib/rpc-client/mailboxes/ws-mailbox.js
+++ b/lib/rpc-client/mailboxes/ws-mailbox.js
@@ -26,7 +26,7 @@ var  pro = MailBox.prototype;
 pro.connect = function(tracer, cb) {
   tracer.info('client', __filename, 'connect', 'ws-mailbox try to connect');
   if(this.connected) {
-    utils.invokeCallback(new Error('mailbox has already connected.'));
+    utils.invokeCallback(cb, new Error('mailbox has already connected.'));
     return;
   }
 
@@ -100,12 +100,12 @@ pro.close = function() {
 pro.send = function(tracer, msg, opts, cb) {
   tracer.info('client', __filename, 'send', 'ws-mailbox try to send');
   if(!this.connected) {
-    utils.invokeCallback(cb, new Error('not init.'));
+    utils.invokeCallback(cb, tracer, new Error('not init.'));
     return;
   }
 
   if(this.closed) {
-    utils.invokeCallback(cb, new Error('mailbox alread closed.'));
+    utils.invokeCallback(cb, tracer, new Error('mailbox alread closed.'));
     return;
   }
 
@@ -152,7 +152,7 @@ var processMsg = function(mailbox, pkg) {
     return;
   }
   
-  var tracer = new Tracer(mailbox.opts.rpcLogger, mailbox.opts.rpcDebugLog, mailbox.opts.context.serverId, pkg.source, pkg.resp, pkg.traceId, pkg.seqId);
+  var tracer = new Tracer(mailbox.opts.rpcLogger, mailbox.opts.rpcDebugLog, mailbox.opts.clientId, pkg.source, pkg.resp, pkg.traceId, pkg.seqId);
   var args = [tracer];
 
   pkg.resp.forEach(function(arg){
diff --git a/lib/rpc-client/mailstation.js b/lib/rpc-client/mailstation.js
index ecf9696..9201e64 100644
--- a/lib/rpc-client/mailstation.js
+++ b/lib/rpc-client/mailstation.js
@@ -16,7 +16,6 @@ var STATE_CLOSED  = 3;    // station has closed
 
 var DEFAULT_PENDING_SIZE = 1000;    // default pending message limit
 
-var app;
 /**
  * Mail station constructor.
  *
@@ -25,8 +24,6 @@ var app;
 var MailStation = function(opts) {
   EventEmitter.call(this);
   this.opts = opts;
-  app = opts.context;
-
   this.servers = {};    // remote server info map, key: server id, value: info
   this.mailboxFactory = opts.mailboxFactory || defaultMailboxFactory;
 
@@ -373,4 +370,4 @@ var flushPending = function(tracer, station, serverId) {
  */
 module.exports.create = function(opts) {
   return new MailStation(opts || {});
-};
\ No newline at end of file
+};
diff --git a/lib/rpc-server/acceptors/tcp-acceptor.js b/lib/rpc-server/acceptors/tcp-acceptor.js
index 0ac2f49..a9c2e45 100644
--- a/lib/rpc-server/acceptors/tcp-acceptor.js
+++ b/lib/rpc-server/acceptors/tcp-acceptor.js
@@ -164,7 +164,7 @@ var flush = function(acceptor) {
  * create acceptor
  *
  * @param opts init params
- * @param cb(msg, cb) callback function that would be invoked when new message arrives
+ * @param cb(tracer, msg, cb) callback function that would be invoked when new message arrives
  */
 module.exports.create = function(opts, cb) {
   return new Acceptor(opts || {}, cb);
diff --git a/lib/rpc-server/acceptors/ws-acceptor.js b/lib/rpc-server/acceptors/ws-acceptor.js
index b837322..adfdad6 100644
--- a/lib/rpc-server/acceptors/ws-acceptor.js
+++ b/lib/rpc-server/acceptors/ws-acceptor.js
@@ -152,7 +152,7 @@ var flush = function(acceptor) {
  * create acceptor
  *
  * @param opts init params
- * @param cb(msg, cb) callback function that would be invoked when new message arrives
+ * @param cb(tracer, msg, cb) callback function that would be invoked when new message arrives
  */
 module.exports.create = function(opts, cb) {
   return new Acceptor(opts || {}, cb);
diff --git a/test/rpc-client/client.js b/test/rpc-client/client.js
index a0ab0f6..543fa23 100644
--- a/test/rpc-client/client.js
+++ b/test/rpc-client/client.js
@@ -173,4 +173,4 @@ describe('client', function() {
     });
 
   });
-});
\ No newline at end of file
+});
diff --git a/test/rpc-client/mailstation.js b/test/rpc-client/mailstation.js
index 500d50c..ad19c2a 100644
--- a/test/rpc-client/mailstation.js
+++ b/test/rpc-client/mailstation.js
@@ -2,6 +2,7 @@ var lib = process.env.POMELO_RPC_COV ? 'lib-cov' : 'lib';
 var MailStation = require('../../' + lib + '/rpc-client/mailstation');
 var should = require('should');
 var Server = require('../../').server;
+var Tracer = require('../../lib/util/tracer');
 
 var WAIT_TIME = 100;
 
@@ -128,13 +129,14 @@ describe('mail station', function() {
           callbackCount++;
         };
       };
+      var tracer = new Tracer(null, false); 
 
       station.start(function(err) {
         var item;
         for(var i=0, l=serverList.length; i<l; i++) {
           count++;
           item = serverList[i];
-          station.dispatch(item.id, msg, null, func(item.id));
+          station.dispatch(tracer, item.id, msg, null, func(item.id));
         }
       });
       setTimeout(function() {
@@ -162,12 +164,14 @@ describe('mail station', function() {
         };
       };
 
+      var tracer = new Tracer(null, false); 
+
       station.start(function(err) {
         var item;
         for(var i=0, l=serverList.length; i<l; i++) {
           count++;
           item = serverList[i];
-          station.dispatch(item.id, msg, null, func(item.id));
+          station.dispatch(tracer, item.id, msg, null, func(item.id));
         }
       });
       setTimeout(function() {
@@ -187,11 +191,13 @@ describe('mail station', function() {
         station.addServer(serverList[i]);
       }
 
+      var tracer = new Tracer(null, false); 
+
       station.start(function(err) {
         // add area server
         var item = serverList[0];
         station.addServer(item);
-        station.dispatch(item.id, msg, null, function(err, remoteId) {
+        station.dispatch(tracer, item.id, msg, null, function(err, remoteId) {
           should.exist(remoteId);
           remoteId.should.equal(item.id);
           callbackCount++;
@@ -221,9 +227,11 @@ describe('mail station', function() {
         eventCount++;
       });
 
+      var tracer = new Tracer(null, false); 
+
       station.start(function(err) {
         should.exist(station);
-        station.dispatch(serverId, msg, null, function(err) {
+        station.dispatch(tracer, serverId, msg, null, function(err) {
           should.exist(err);
           'message was forward to blackhole.'.should.equal(err.message);
           callbackCount++;
@@ -263,12 +271,14 @@ describe('mail station', function() {
         };
       };
 
+      var tracer = new Tracer(null, false); 
+
       station.start(function(err) {
         // invoke the lazy connect
         var item;
         for(var i=0, l=serverList.length; i<l; i++) {
           item = serverList[i];
-          station.dispatch(item.id, msg, null, func(item.id));
+          station.dispatch(tracer, item.id, msg, null, func(item.id));
         }
 
         station.on('close', function(mailboxId) {
@@ -304,12 +314,14 @@ describe('mail station', function() {
         errorEventCount++;
       };
 
+      var tracer = new Tracer(null, false); 
+
       station.start(function(err) {
         station.stop();
         var item;
         for(i=0, l=serverList.length; i<l; i++) {
           item = serverList[i];
-          station.dispatch(item.id, msg, null, func);
+          station.dispatch(tracer, item.id, msg, null, func);
         }
       });
       setTimeout(function() {
@@ -326,7 +338,6 @@ describe('mail station', function() {
       var sid = 'connector-server-1';
       var orgMsg = msg;
       var orgOpts = {something: 'hello'};
-
       var station = MailStation.create();
       should.exist(station);
 
@@ -334,6 +345,8 @@ describe('mail station', function() {
         station.addServer(serverList[i]);
       }
 
+      var tracer = new Tracer(null, false); 
+
       station.start(function(err) {
         station.before(function(fsid, fmsg, fopts, next) {
           preFilterCount.should.equal(0);
@@ -375,7 +388,7 @@ describe('mail station', function() {
           next(fsid, fmsg, fopts);
         });
 
-        station.dispatch(sid, orgMsg, orgOpts, function() {});
+        station.dispatch(tracer, sid, orgMsg, orgOpts, function() {});
       });
 
       setTimeout(function() {
@@ -386,4 +399,4 @@ describe('mail station', function() {
       }, WAIT_TIME);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/test/rpc-client/tcp-mailbox.js b/test/rpc-client/tcp-mailbox.js
index 5d3736f..c091434 100644
--- a/test/rpc-client/tcp-mailbox.js
+++ b/test/rpc-client/tcp-mailbox.js
@@ -2,6 +2,7 @@ var lib = process.env.POMELO_RPC_COV ? 'lib-cov' : 'lib';
 var should = require('should');
 var Mailbox = require('../../' + lib + '/rpc-client/mailboxes/tcp-mailbox');
 var Server = require('../../').server;
+var Tracer = require('../../lib/util/tracer');
 
 var WAIT_TIME = 100;
 
@@ -26,6 +27,8 @@ var msg = {
   args: [1]
 };
 
+var tracer = new Tracer(console, false);
+
 describe('tcp mailbox test', function() {
   var gateway;
 
@@ -54,7 +57,7 @@ describe('tcp mailbox test', function() {
     it('should be ok for creating a mailbox and connect to the right remote server', function(done) {
       var mailbox = Mailbox.create(server);
       should.exist(mailbox);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
         mailbox.close();
         done();
@@ -70,7 +73,7 @@ describe('tcp mailbox test', function() {
 
       var mailbox = Mailbox.create(server);
       should.exist(mailbox);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.exist(err);
         done();
       });
@@ -80,10 +83,11 @@ describe('tcp mailbox test', function() {
   describe('#send', function() {
     it('should send request to remote server and get the response from callback function', function(done) {
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg, null, function(err, res) {
+        mailbox.send(tracer, msg, null, function(tracer, err, res) {
+          console.log(err, res);
           should.exist(res);
           res.should.equal(msg.args[0] + 1);
           mailbox.close();
@@ -118,22 +122,22 @@ describe('tcp mailbox test', function() {
       var callbackCount = 0;
 
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg1, null, function(err, res) {
+        mailbox.send(tracer, msg1, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 1);
           callbackCount++;
         });
 
-        mailbox.send(msg2, null, function(err, res) {
+        mailbox.send(tracer, msg2, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 2);
           callbackCount++;
         });
 
-        mailbox.send(msg3, null, function(err, res) {
+        mailbox.send(tracer, msg3, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 3);
           callbackCount++;
@@ -175,22 +179,22 @@ describe('tcp mailbox test', function() {
       var callbackCount = 0;
 
       var mailbox = Mailbox.create(server, {bufferMsg: true});
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg1, null, function(err, res) {
+        mailbox.send(tracer, msg1, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 1);
           callbackCount++;
         });
 
-        mailbox.send(msg2, null, function(err, res) {
+        mailbox.send(tracer, msg2, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 2);
           callbackCount++;
         });
 
-        mailbox.send(msg3, null, function(err, res) {
+        mailbox.send(tracer, msg3, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 3);
           callbackCount++;
@@ -241,22 +245,22 @@ describe('tcp mailbox test', function() {
       var callbackCount = 0;
 
       var mailbox = Mailbox.create(server, {bufferMsg: true});
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg1, null, function(err, res) {
+        mailbox.send(tracer, msg1, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 1);
           callbackCount++;
         });
 
-        mailbox.send(msg2, null, function(err, res) {
+        mailbox.send(tracer, msg2, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 2);
           callbackCount++;
         });
 
-        mailbox.send(msg3, null, function(err, res) {
+        mailbox.send(tracer, msg3, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 3);
           callbackCount++;
@@ -278,7 +282,7 @@ describe('tcp mailbox test', function() {
     it('should emit a close event when mailbox close', function(done) {
       var closeEventCount = 0;
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
         mailbox.on('close', function() {
           closeEventCount++;
@@ -294,10 +298,10 @@ describe('tcp mailbox test', function() {
 
     it('should return an error when try to send message by a closed mailbox', function(done) {
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
         mailbox.close();
-        mailbox.send(msg, null, function(err, res) {
+        mailbox.send(tracer, msg, null, function(tracer, err, res) {
           should.exist(err);
           done();
         });
diff --git a/test/rpc-client/ws-mailbox.js b/test/rpc-client/ws-mailbox.js
index 822f637..de9bbb7 100644
--- a/test/rpc-client/ws-mailbox.js
+++ b/test/rpc-client/ws-mailbox.js
@@ -2,6 +2,7 @@ var lib = process.env.POMELO_RPC_COV ? 'lib-cov' : 'lib';
 var should = require('should');
 var Mailbox = require('../../' + lib + '/rpc-client/mailboxes/ws-mailbox');
 var Server = require('../../').server;
+var Tracer = require('../../lib/util/tracer');
 
 var WAIT_TIME = 100;
 
@@ -26,6 +27,8 @@ var msg = {
   args: [1]
 };
 
+var tracer = new Tracer(console, false); 
+
 describe('ws mailbox test', function() {
   var gateway;
 
@@ -54,7 +57,7 @@ describe('ws mailbox test', function() {
     it('should be ok for creating a mailbox and connect to the right remote server', function(done) {
       var mailbox = Mailbox.create(server);
       should.exist(mailbox);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
         mailbox.close();
         done();
@@ -70,7 +73,7 @@ describe('ws mailbox test', function() {
 
       var mailbox = Mailbox.create(server);
       should.exist(mailbox);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.exist(err);
         done();
       });
@@ -80,10 +83,10 @@ describe('ws mailbox test', function() {
   describe('#send', function() {
     it('should send request to remote server and get the response from callback function', function(done) {
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg, null, function(err, res) {
+        mailbox.send(tracer, msg, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(msg.args[0] + 1);
           mailbox.close();
@@ -118,22 +121,22 @@ describe('ws mailbox test', function() {
       var callbackCount = 0;
 
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg1, null, function(err, res) {
+        mailbox.send(tracer, msg1, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 1);
           callbackCount++;
         });
 
-        mailbox.send(msg2, null, function(err, res) {
+        mailbox.send(tracer, msg2, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 2);
           callbackCount++;
         });
 
-        mailbox.send(msg3, null, function(err, res) {
+        mailbox.send(tracer, msg3, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 3);
           callbackCount++;
@@ -175,22 +178,22 @@ describe('ws mailbox test', function() {
       var callbackCount = 0;
 
       var mailbox = Mailbox.create(server, {bufferMsg: true});
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg1, null, function(err, res) {
+        mailbox.send(tracer, msg1, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 1);
           callbackCount++;
         });
 
-        mailbox.send(msg2, null, function(err, res) {
+        mailbox.send(tracer, msg2, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 2);
           callbackCount++;
         });
 
-        mailbox.send(msg3, null, function(err, res) {
+        mailbox.send(tracer, msg3, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 3);
           callbackCount++;
@@ -241,22 +244,22 @@ describe('ws mailbox test', function() {
       var callbackCount = 0;
 
       var mailbox = Mailbox.create(server, {bufferMsg: true});
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
 
-        mailbox.send(msg1, null, function(err, res) {
+        mailbox.send(tracer, msg1, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 1);
           callbackCount++;
         });
 
-        mailbox.send(msg2, null, function(err, res) {
+        mailbox.send(tracer, msg2, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 2);
           callbackCount++;
         });
 
-        mailbox.send(msg3, null, function(err, res) {
+        mailbox.send(tracer, msg3, null, function(tracer, err, res) {
           should.exist(res);
           res.should.equal(value + 3);
           callbackCount++;
@@ -278,7 +281,7 @@ describe('ws mailbox test', function() {
     it('should emit a close event when mailbox close', function(done) {
       var closeEventCount = 0;
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
         mailbox.on('close', function() {
           closeEventCount++;
@@ -294,10 +297,10 @@ describe('ws mailbox test', function() {
 
     it('should return an error when try to send message by a closed mailbox', function(done) {
       var mailbox = Mailbox.create(server);
-      mailbox.connect(function(err) {
+      mailbox.connect(tracer, function(err) {
         should.not.exist(err);
         mailbox.close();
-        mailbox.send(msg, null, function(err, res) {
+        mailbox.send(tracer, msg, null, function(tracer, err, res) {
           should.exist(err);
           done();
         });
diff --git a/test/rpc-server/acceptor.js b/test/rpc-server/acceptor.js
index 2713b31..1ac027b 100644
--- a/test/rpc-server/acceptor.js
+++ b/test/rpc-server/acceptor.js
@@ -13,7 +13,7 @@ describe('acceptor', function() {
     it('should be ok when listen a valid port and emit a closed event when it closed', function(done) {
       var errorCount = 0;
       var closeCount = 0;
-      var acceptor = Acceptor.create(null, function(msg, cb) {});
+      var acceptor = Acceptor.create(null, function(tracer, msg, cb) {});
 
       should.exist(acceptor);
       acceptor.on('error', function(err) {
@@ -35,7 +35,7 @@ describe('acceptor', function() {
 
     it('should emit an error when listen a port in use', function(done) {
       var errorCount = 0;
-      var acceptor = Acceptor.create(null, function(msg, cb) {});
+      var acceptor = Acceptor.create(null, function(tracer, msg, cb) {});
 
       should.exist(acceptor);
       acceptor.on('error', function(err) {
@@ -63,7 +63,7 @@ describe('acceptor', function() {
         args: [1, 'a', {param: 100}]
       };
 
-      var acceptor = Acceptor.create(null, function(msg, cb) {
+      var acceptor = Acceptor.create(null, function(tracer, msg, cb) {
         msg.should.eql(orgMsg);
         callbackCount++;
         cb(msg);
@@ -103,7 +103,7 @@ describe('acceptor', function() {
         args: [2, 'a', {param: 100}]
       };
 
-      var acceptor = Acceptor.create(null, function(msg, cb) {
+      var acceptor = Acceptor.create(null, function(tracer, msg, cb) {
         callbackCount++;
         cb(msg);
       });
@@ -131,4 +131,4 @@ describe('acceptor', function() {
       }, WAIT_TIME);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/test/rpc-server/dispatcher.js b/test/rpc-server/dispatcher.js
index a2bc21a..e62eca7 100644
--- a/test/rpc-server/dispatcher.js
+++ b/test/rpc-server/dispatcher.js
@@ -1,6 +1,7 @@
 var lib = process.env.POMELO_RPC_COV ? 'lib-cov' : 'lib';
 var route = require('../../' + lib + '/rpc-server/dispatcher').route;
 var should = require('should');
+var Tracer = require('../../lib/util/tracer');
 
 var WAIT_TIME = 20;
 
@@ -21,6 +22,8 @@ var services = {
   }
 };
 
+var tracer = new Tracer(console, false);
+
 describe('dispatcher', function() {
   it('should be find the right service object', function(done) {
     var methodStr = 'doService';
@@ -32,7 +35,7 @@ describe('dispatcher', function() {
     var callbackCount = 0;
 
     var msg1 = {namespace: namespace1, service: serviceStr1, method: methodStr, args: [value]};
-    route(msg1, services, function(err, result) {
+    route(tracer, msg1, services, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.should.equal(value + 1);
@@ -40,7 +43,7 @@ describe('dispatcher', function() {
     });
 
     var msg2 = {namespace: namespace2, service: serviceStr2, method: methodStr, args: [value]};
-    route(msg2, services, function(err, result) {
+    route(tracer, msg2, services, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.should.equal(value + 2);
@@ -64,14 +67,14 @@ describe('dispatcher', function() {
     var callbackCount = 0;
 
     var msg1 = {namespace: namespace, service: serviceStr1, method: methodStr1, args: [value]};
-    route(msg1, services, function(err, result) {
+    route(tracer, msg1, services, function(err, result) {
       should.exist(err);
       should.not.exist(result);
       callbackCount++;
     });
 
     var msg2 = {namespace: namespace, service: serviceStr2, method: methodStr2, args: [value]};
-    route(msg2, services, function(err, result) {
+    route(tracer, msg2, services, function(err, result) {
       should.exist(err);
       should.not.exist(result);
       callbackCount++;
@@ -83,4 +86,4 @@ describe('dispatcher', function() {
       done();
     }, WAIT_TIME);
   });
-});
\ No newline at end of file
+});