refactor: httpclient args tracer to be enforced (#1421)

eggjs · Sep 15, 2017 · 6eac07e · 6eac07e
1 parent c56274b
commit 6eac07e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/core/httpclient.js b/lib/core/httpclient.js
@@ -27,8 +27,10 @@ class HttpClient extends urllib.HttpClient {
 
     args = args || {};
 
-    if (!args.ctx && !args.tracer) {
-      args.tracer = this.app.tracer;
+    if (args.ctx && args.ctx.tracer) {
+      args.tracer = args.ctx.tracer;
+    } else {
+      args.tracer = args.tracer || this.app.tracer;
     }
 
     return super.request(url, args, callback);

diff --git a/test/lib/core/httpclient.test.js b/test/lib/core/httpclient.test.js
@@ -255,11 +255,11 @@ describe('test/lib/core/httpclient.test.js', () => {
       let resTracer;
 
       httpclient.on('request', function(options) {
-        reqTracer = options.args.tracer || options.ctx.tracer;
+        reqTracer = options.args.tracer;
       });
 
       httpclient.on('response', function(options) {
-        resTracer = options.req.args.tracer || options.ctx.tracer;
+        resTracer = options.req.args.tracer;
       });
 
       let res = yield httpclient.request('https://www.alipay.com', {