Add ipAddress to RequestAttempt & include port in serialization (#1692)

Netflix · Nov 2, 2023 · ffce212 · ffce212
1 parent e46ab42
commit ffce212
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 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
@@ -454,7 +454,8 @@ private void proxyRequestToOrigin() {
                     zuulRequest, channelCtx.channel().eventLoop(), attemptNum, passport, chosenServer, chosenHostAddr);
 
             storeAndLogOriginRequestInfo();
-            currentRequestAttempt = origin.newRequestAttempt(chosenServer.get(), context, attemptNum);
+            currentRequestAttempt =
+                    origin.newRequestAttempt(chosenServer.get(), chosenHostAddr.get(), context, attemptNum);
             requestAttempts.add(currentRequestAttempt);
             passport.add(PassportState.ORIGIN_CONN_ACQUIRE_START);
 

diff --git a/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempt.java b/zuul-core/src/main/java/com/netflix/zuul/niws/RequestAttempt.java
@@ -31,6 +31,7 @@
 import io.netty.handler.timeout.ReadTimeoutException;
 
 import javax.net.ssl.SSLHandshakeException;
+import java.net.InetAddress;
 
 /**
  * User: [email protected]
@@ -51,6 +52,7 @@ public class RequestAttempt {
     private String instanceId;
     private String host;
     private int port;
+    private String ipAddress;
     private String vip;
     private String region;
     private String availabilityZone;
@@ -61,6 +63,7 @@ public class RequestAttempt {
     public RequestAttempt(
             int attemptNumber,
             InstanceInfo server,
+            InetAddress serverAddr,
             String targetVip,
             String chosenWarmupLB,
             int status,
@@ -99,6 +102,10 @@ public RequestAttempt(
             }
         }
 
+        if (serverAddr != null) {
+            ipAddress = serverAddr.getHostAddress();
+        }
+
         this.status = status;
         this.error = error;
         this.exceptionType = exceptionType;
@@ -108,7 +115,11 @@ public RequestAttempt(
     }
 
     public RequestAttempt(
-            final DiscoveryResult server, final IClientConfig clientConfig, int attemptNumber, int readTimeout) {
+            final DiscoveryResult server,
+            InetAddress serverAddr,
+            final IClientConfig clientConfig,
+            int attemptNumber,
+            int readTimeout) {
         this.status = -1;
         this.attempt = attemptNumber;
         this.readTimeout = readTimeout;
@@ -141,6 +152,10 @@ public RequestAttempt(
             }
         }
 
+        if (serverAddr != null) {
+            ipAddress = serverAddr.getHostAddress();
+        }
+
         if (clientConfig != null) {
             this.connectTimeout = clientConfig.get(IClientConfigKey.Keys.ConnectTimeout);
         }
@@ -200,6 +215,10 @@ public int getPort() {
         return port;
     }
 
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
     public String getRegion() {
         return region;
     }
@@ -256,6 +275,10 @@ public void setPort(int port) {
         this.port = port;
     }
 
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
     public void setVip(String vip) {
         this.vip = vip;
     }
@@ -338,6 +361,11 @@ public ObjectNode toJsonNode() {
         putNullableAttribute(root, "asg", asg);
         putNullableAttribute(root, "instanceId", instanceId);
         putNullableAttribute(root, "vip", vip);
+        putNullableAttribute(root, "ipAddress", ipAddress);
+
+        if (port > 0) {
+            root.put("port", port);
+        }
 
         if (status < 1) {
             root.put("readTimeout", readTimeout);

diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOrigin.java b/zuul-core/src/main/java/com/netflix/zuul/origins/BasicNettyOrigin.java
@@ -130,8 +130,10 @@ public int getMaxRetriesForRequest(SessionContext context) {
     }
 
     @Override
-    public RequestAttempt newRequestAttempt(DiscoveryResult server, SessionContext zuulCtx, int attemptNum) {
-        return new RequestAttempt(server, config, attemptNum, config.get(CommonClientConfigKey.ReadTimeout));
+    public RequestAttempt newRequestAttempt(
+            DiscoveryResult server, InetAddress serverAddr, SessionContext zuulCtx, int attemptNum) {
+        return new RequestAttempt(
+                server, serverAddr, config, attemptNum, config.get(CommonClientConfigKey.ReadTimeout));
     }
 
     @Override

diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/NettyOrigin.java b/zuul-core/src/main/java/com/netflix/zuul/origins/NettyOrigin.java
@@ -70,7 +70,8 @@ void onRequestExecutionFailed(
 
     void recordFinalResponse(final HttpResponseMessage resp);
 
-    RequestAttempt newRequestAttempt(final DiscoveryResult server, final SessionContext zuulCtx, int attemptNum);
+    RequestAttempt newRequestAttempt(
+            final DiscoveryResult server, final InetAddress serverAddr, final SessionContext zuulCtx, int attemptNum);
 
     String getIpAddrFromServer(DiscoveryResult server);