Merge branch 'master' into feat/gray_group

Author: rayzhang0603

motan-core/src/main/java/com/weibo/api/motan/rpc/DefaultResponseFuture.java

@@ -84,6 +84,7 @@ public void onSuccess(Response response) {
     public void onFailure(Response response) {
         this.exception = response.getException();
         this.processTime = response.getProcessTime();
+        this.attachments = response.getAttachments();
 
         done();
     }

motan-transport-netty/src/main/java/com/weibo/api/motan/transport/netty/NettyChannelHandler.java

@@ -24,12 +24,10 @@
 import com.weibo.api.motan.rpc.*;
 import com.weibo.api.motan.transport.Channel;
 import com.weibo.api.motan.transport.MessageHandler;
-import com.weibo.api.motan.util.LoggerUtil;
-import com.weibo.api.motan.util.MotanFrameworkUtil;
-import com.weibo.api.motan.util.NetUtils;
-import com.weibo.api.motan.util.StatisticCallback;
+import com.weibo.api.motan.util.*;
 import org.jboss.netty.channel.*;
 
+import java.util.Map;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -148,6 +146,13 @@ private void processResult(final ChannelHandlerContext ctx, final DefaultRespons
         response.setSerializeNumber(request.getSerializeNumber());
         response.setRpcProtocolVersion(request.getRpcProtocolVersion());
         response.setRequestId(request.getRequestId());
+        // set rpc context attachments to response
+        Map<String, String> attachments = RpcContext.getContext().getRpcAttachments();
+        if (!CollectionUtil.isEmpty(attachments)) {
+            for (Map.Entry<String, String> entry : attachments.entrySet()) {
+                response.setAttachment(entry.getKey(), entry.getValue());
+            }
+        }
         response.setProcessTime(System.currentTimeMillis() - processStartTime);
         ChannelFuture channelFuture = null;
         if (ctx.getChannel().isConnected()) {

motan-transport-netty/src/main/java/com/weibo/api/motan/transport/netty/NettyClient.java

@@ -195,7 +195,7 @@ private Response asyncResponse(Response response, boolean async) {
         if (async || !(response instanceof ResponseFuture)) {
             return response;
         }
-
+        RpcContext.getContext().setResponse(response);
         return new DefaultResponse(response);
     }
 

motan-transport-netty/src/test/java/com/weibo/api/motan/transport/netty/NettyClientTest.java

@@ -86,6 +86,7 @@ public void testNormal() throws TransportException {
 
         Assert.assertNotNull(result);
         Assert.assertEquals("method: " + request.getMethodName() + " requestId: " + request.getRequestId(), result);
+        org.junit.Assert.assertNotNull(RpcContext.getContext().getResponse());
     }
 
     public void testAsync() throws TransportException {

motan-transport-netty4/src/main/java/com/weibo/api/motan/transport/netty4/NettyChannelHandler.java

@@ -11,6 +11,7 @@
 import com.weibo.api.motan.rpc.*;
 import com.weibo.api.motan.transport.Channel;
 import com.weibo.api.motan.transport.MessageHandler;
+import com.weibo.api.motan.util.CollectionUtil;
 import com.weibo.api.motan.util.LoggerUtil;
 import com.weibo.api.motan.util.MotanFrameworkUtil;
 import com.weibo.api.motan.util.NetUtils;
@@ -21,6 +22,7 @@
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.Map;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 
@@ -167,6 +169,13 @@ private void processResult(final ChannelHandlerContext ctx, final DefaultRespons
         response.setSerializeNumber(request.getSerializeNumber());
         response.setRpcProtocolVersion(request.getRpcProtocolVersion());
         response.setRequestId(request.getRequestId());
+        // set rpc context attachments to response
+        Map<String, String> attachments = RpcContext.getContext().getRpcAttachments();
+        if (!CollectionUtil.isEmpty(attachments)) {
+            for (Map.Entry<String, String> entry : attachments.entrySet()) {
+                response.setAttachment(entry.getKey(), entry.getValue());
+            }
+        }
         response.setProcessTime(System.currentTimeMillis() - processStartTime);
         sendResponse(ctx, response, true);
     }

motan-transport-netty4/src/main/java/com/weibo/api/motan/transport/netty4/NettyClient.java

@@ -144,6 +144,7 @@ private Response asyncResponse(Response response, boolean async) {
         if (async || !(response instanceof ResponseFuture)) {
             return response;
         }
+        RpcContext.getContext().setResponse(response);
         return new DefaultResponse(response);
     }
 

motan-transport-netty4/src/test/java/com/weibo/api/motan/transport/netty4/NettyClientTest.java

@@ -102,6 +102,7 @@ public void testNormal() {
 
             Assert.assertNotNull(result);
             Assert.assertEquals("method: " + request.getMethodName() + " requestId: " + request.getRequestId(), result);
+            Assert.assertNotNull(RpcContext.getContext().getResponse());
         } catch (Exception e) {
             fail();
         }