feat:add caller/callee port in RpcContext

trpc-group · Sep 20, 2024 · 779c0c1 · 779c0c1
1 parent df0f77f
commit 779c0c1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/filter/ConsumerInvokerHeadFilter.java b/trpc-core/src/main/java/com/tencent/trpc/core/filter/ConsumerInvokerHeadFilter.java
@@ -47,7 +47,7 @@ public CompletionStage<Response> filter(Invoker<?> invoker, Request request) {
         ConsumerInvoker consumerInvoker = (ConsumerInvoker) invoker;
         // combine with DefClusterInvocationHandler#genRequest to complete the information of the request.
         prepareRequestInfoBeforeInvoke(request, consumerInvoker);
-        contextWithRemoteCalleeIp(context, request);
+        contextWithRemoteCalleeAddr(context, request);
         startLog(context, request);
         CompletableFuture<Response> future = invoker.invoke(request).toCompletableFuture();
         if (logger.isDebugEnabled()) {
@@ -66,15 +66,21 @@ public CompletionStage<Response> filter(Invoker<?> invoker, Request request) {
     }
 
     /**
-     * Set the request remote callee IP to RpcContext, with the key as CTX_CALLEE_REMOTE_IP.
+     * Set the request remote callee addr to RpcContext.
+     * Caller IP: CTX_CALLEE_REMOTE_IP
+     * Caller PORT: CTX_CALLEE_REMOTE_PORT
      *
      * @param context RpcContext
      * @param request Request
      */
-    private void contextWithRemoteCalleeIp(RpcContext context, Request request) {
+    private void contextWithRemoteCalleeAddr(RpcContext context, Request request) {
         Optional.ofNullable(request.getMeta().getRemoteAddress()).ifPresent(remoteAddr
-                -> RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_CALLEE_REMOTE_IP,
-                remoteAddr.getAddress().getHostAddress()));
+                -> {
+            RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_CALLEE_REMOTE_IP,
+                    remoteAddr.getAddress().getHostAddress());
+            RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_CALLEE_REMOTE_PORT,
+                    remoteAddr.getPort());
+        });
     }
 
     private void prepareRequestInfoBeforeInvoke(Request request,

diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderInvokerHeadFilter.java b/trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderInvokerHeadFilter.java
@@ -52,7 +52,7 @@ public int getOrder() {
     public CompletionStage<Response> filter(Invoker<?> invoker, Request request) {
         RpcServerContext serverContext = (RpcServerContext) (request.getContext());
         prepareRequestInfoBeforeInvoke(request, (ProviderInvoker) invoker);
-        contextWithRemoteCallerIp(serverContext, request);
+        contextWithRemoteCallerAddr(serverContext, request);
         startLog(serverContext, request);
         CompletableFuture<Response> future = invoker.invoke(request).toCompletableFuture();
         if (logger.isDebugEnabled()) {
@@ -62,15 +62,21 @@ public CompletionStage<Response> filter(Invoker<?> invoker, Request request) {
     }
 
     /**
-     * Set the request remote caller IP to RpcServerContext, with the key as CTX_CALLER_REMOTE_IP.
+     * Set the request remote caller addr to RpcServerContext.
+     * Caller IP: CTX_CALLER_REMOTE_IP
+     * Caller PORT: CTX_CALLER_REMOTE_PORT
      *
      * @param serverContext RpcServerContext
      * @param request Request
      */
-    private void contextWithRemoteCallerIp(RpcServerContext serverContext, Request request) {
+    private void contextWithRemoteCallerAddr(RpcServerContext serverContext, Request request) {
         Optional.ofNullable(request.getMeta().getRemoteAddress()).ifPresent(remoteAddr
-                -> RpcContextUtils.putValueMapValue(serverContext, RpcContextValueKeys.CTX_CALLER_REMOTE_IP,
-                remoteAddr.getAddress().getHostAddress()));
+                -> {
+            RpcContextUtils.putValueMapValue(serverContext, RpcContextValueKeys.CTX_CALLER_REMOTE_IP,
+                    remoteAddr.getAddress().getHostAddress());
+            RpcContextUtils.putValueMapValue(serverContext, RpcContextValueKeys.CTX_CALLER_REMOTE_PORT,
+                    remoteAddr.getPort());
+        });
 
     }
 

diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/rpc/RpcContextValueKeys.java b/trpc-core/src/main/java/com/tencent/trpc/core/rpc/RpcContextValueKeys.java
@@ -27,10 +27,18 @@ public class RpcContextValueKeys {
      * Caller Remote IP.
      */
     public static final String CTX_CALLER_REMOTE_IP = "ctx_caller_remote_ip";
+    /**
+     * Caller Remote PORT.
+     */
+    public static final String CTX_CALLER_REMOTE_PORT = "ctx_caller_remote_port";
     /**
      * Callee Remote IP.
      */
     public static final String CTX_CALLEE_REMOTE_IP = "ctx_callee_remote_ip";
+    /**
+     * Callee Remote PORT.
+     */
+    public static final String CTX_CALLEE_REMOTE_PORT = "ctx_callee_remote_port";
     /**
      * Full link timeout key.
      */