Extract client name lookup to a method (#1732)

Netflix · Jan 26, 2024 · 8fd305b · 8fd305b
1 parent 7ccbbae
commit 8fd305b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java b/zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java
@@ -1061,11 +1061,7 @@ protected NettyOrigin getOrigin(HttpRequestMessage request) {
             return null;
         }
 
-        // make sure the restClientName will never be a raw VIP in cases where it's the fallback for another route
-        // assignment
-        String restClientVIP = primaryRoute;
-        boolean useFullName = context.getBoolean(CommonContextKeys.USE_FULL_VIP_NAME);
-        String restClientName = useFullName ? restClientVIP : VipUtils.getVIPPrefix(restClientVIP);
+        String restClientName = getClientName(context);
 
         NettyOrigin origin = null;
         // allow implementors to override the origin with custom injection logic
@@ -1075,7 +1071,7 @@ protected NettyOrigin getOrigin(HttpRequestMessage request) {
             origin = getOrCreateOrigin(originManager, overrideOriginName, request.reconstructURI(), context);
         } else if (restClientName != null) {
             // This is the normal flow - that a RoutingFilter has assigned a route
-            OriginName originName = OriginName.fromVip(restClientVIP, restClientName);
+            OriginName originName = OriginName.fromVip(primaryRoute, restClientName);
             origin = getOrCreateOrigin(originManager, originName, request.reconstructURI(), context);
         }
 
@@ -1094,6 +1090,14 @@ protected NettyOrigin getOrigin(HttpRequestMessage request) {
         return origin;
     }
 
+    protected String getClientName(SessionContext context) {
+        // make sure the restClientName will never be a raw VIP in cases where it's the fallback for another route
+        // assignment
+        String restClientVIP = context.getRouteVIP();
+        boolean useFullName = context.getBoolean(CommonContextKeys.USE_FULL_VIP_NAME);
+        return useFullName ? restClientVIP : VipUtils.getVIPPrefix(restClientVIP);
+    }
+
     /**
      * Inject your own custom VIP based on your own processing
      *