Add application name on http1 and http2 (#13906)

apache · Mar 12, 2024 · cf53c38 · cf53c38
1 parent da2dd6d
commit cf53c38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.../src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java b/.../src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
@@ -65,7 +65,7 @@ public abstract class AbstractServerTransportListener<HEADER extends RequestMeta
     private RpcInvocationBuildContext context;
     private HttpMessageListener httpMessageListener;
 
-    public AbstractServerTransportListener(FrameworkModel frameworkModel, URL url, HttpChannel httpChannel) {
+    protected AbstractServerTransportListener(FrameworkModel frameworkModel, URL url, HttpChannel httpChannel) {
         this.frameworkModel = frameworkModel;
         this.url = url;
         this.httpChannel = httpChannel;
@@ -211,7 +211,10 @@ protected RpcInvocation buildRpcInvocation(RpcInvocationBuildContext context) {
         inv.setObjectAttachments(StreamUtils.toAttachments(httpMetadata.headers()));
         inv.put(REMOTE_ADDRESS_KEY, httpChannel.remoteAddress());
         inv.getAttributes().putAll(context.getAttributes());
-
+        String consumerAppName = httpMetadata.headers().getFirst(TripleHeaderEnum.CONSUMER_APP_NAME_KEY.getHeader());
+        if (null != consumerAppName) {
+            inv.put(TripleHeaderEnum.CONSUMER_APP_NAME_KEY, consumerAppName);
+        }
         // customizer RpcInvocation
         headerFilters.forEach(f -> f.invoke(invoker, inv));
 

diff --git a/...ain/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java b/...ain/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java
@@ -34,7 +34,6 @@
 import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.apache.dubbo.rpc.protocol.tri.DescriptorUtils;
 import org.apache.dubbo.rpc.protocol.tri.RpcInvocationBuildContext;
-import org.apache.dubbo.rpc.protocol.tri.TripleHeaderEnum;
 import org.apache.dubbo.rpc.protocol.tri.compressor.DeCompressor;
 import org.apache.dubbo.rpc.protocol.tri.compressor.Identity;
 import org.apache.dubbo.rpc.protocol.tri.h12.HttpMessageListener;
@@ -120,11 +119,6 @@ protected RpcInvocation onBuildRpcInvocationCompletion(RpcInvocation invocation)
                             getContext().getServiceDescriptor().getInterfaceName(),
                             getContext().getMethodName()));
         }
-        String consumerAppKey =
-                getHttpMetadata().headers().getFirst(TripleHeaderEnum.CONSUMER_APP_NAME_KEY.getHeader());
-        if (null != consumerAppKey) {
-            invocation.put(TripleHeaderEnum.CONSUMER_APP_NAME_KEY, consumerAppKey);
-        }
         return invocation;
     }