(dubbo) branch 3.3 updated: Add application name on http1 and http2 (#13906)

[earthchen]

This is an automated email from the ASF dual-hosted git repository.

earthchen pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.3 by this push:
     new cf53c38179 Add application name on http1 and http2 (#13906)
cf53c38179 is described below

commit cf53c38179c13846cb760011758bd2035575fe4a
Author: TomlongTK <longqian...@maoyan.com>
AuthorDate: Tue Mar 12 14:15:42 2024 +0800

    Add application name on http1 and http2 (#13906)
---
 .../rpc/protocol/tri/h12/AbstractServerTransportListener.java      | 7 +++++--
 .../protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java    | 6 ------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
 
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
index 9839625823..5d74b831b0 100644
--- 
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
+++ 
b/dubbo-rpc/dubbo-rpc-triple/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 @@ public abstract class 
AbstractServerTransportListener<HEADER extends RequestMeta
         
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/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java
 
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java
index 63c5ee2cbc..9ae7881302 100644
--- 
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java
+++ 
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java
@@ -34,7 +34,6 @@ import org.apache.dubbo.rpc.TriRpcStatus;
 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 @@ public class GrpcHttp2ServerTransportListener extends 
GenericHttp2ServerTranspor
                             
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;
     }