From 55aef37ae8e724286634fec31bb01b26892ec3ae Mon Sep 17 00:00:00 2001
From: Samin Rahman <samin.rahman@thetradedesk.com>
Date: Wed, 18 Feb 2026 13:25:53 +1100
Subject: [PATCH 1/2] Optimized client IP retrieval

---
 .../shared/vertx/RequestCapturingHandler.java | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/uid2/shared/vertx/RequestCapturingHandler.java b/src/main/java/com/uid2/shared/vertx/RequestCapturingHandler.java
index c31d7276..bb9e3de0 100644
--- a/src/main/java/com/uid2/shared/vertx/RequestCapturingHandler.java
+++ b/src/main/java/com/uid2/shared/vertx/RequestCapturingHandler.java
@@ -62,12 +62,14 @@ public void handle(RoutingContext context) {
         }
 
         long timestamp = System.currentTimeMillis();
-        String remoteClient = null;
-        try {
-            SocketAddress remoteAddress = context.request().remoteAddress();
-            remoteClient = getClientAddress(remoteAddress);
-        } catch (NullPointerException ex) {
-            LOGGER.warn("remoteAddress() throws NullPointerException");
+        String remoteClient = getClientAddressFromHeaders(context.request());
+        if (remoteClient == null) {
+            try {
+                SocketAddress remoteAddress = context.request().remoteAddress();
+                remoteClient = remoteAddress != null ? remoteAddress.host() : null;
+            } catch (NullPointerException ex) {
+                LOGGER.warn("remoteAddress() throws NullPointerException");
+            }
         }
 
         HttpMethod method = context.request().method();
@@ -78,11 +80,33 @@ public void handle(RoutingContext context) {
         context.next();
     }
 
-    private String getClientAddress(SocketAddress inetSocketAddress) {
-        if (inetSocketAddress == null) {
+    private static String getClientAddressFromHeaders(HttpServerRequest request) {
+        if (request == null || request.headers() == null) {
             return null;
         }
-        return inetSocketAddress.host();
+        MultiMap headers = request.headers();
+        String value = headers.get("X-Forwarded-For");
+        if (value != null && !value.isEmpty()) {
+            // Leftmost is the original client (RFC 7239)
+            int comma = value.indexOf(',');
+            String client = comma >= 0 ? value.substring(0, comma).trim() : value.trim();
+            if (!client.isEmpty()) {
+                return client;
+            }
+        }
+        value = headers.get("X-Real-IP");
+        if (value != null && !value.trim().isEmpty()) {
+            return value.trim();
+        }
+        value = headers.get("True-Client-IP");
+        if (value != null && !value.trim().isEmpty()) {
+            return value.trim();
+        }
+        value = headers.get("CF-Connecting-IP");
+        if (value != null && !value.trim().isEmpty()) {
+            return value.trim();
+        }
+        return null;
     }
 
     private void captureNoThrow(RoutingContext context, long timestamp, String remoteClient, HttpVersion version, HttpMethod method, String uri) {

From 18feff8e937e7cea2dad06961ba1ba7c048e10e3 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Wed, 18 Feb 2026 02:30:48 +0000
Subject: [PATCH 2/2] [CI Pipeline] Released Snapshot version:
 11.4.5-alpha-341-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 19eb3e62..1aca0b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-shared</artifactId>
-    <version>11.4.4</version>
+    <version>11.4.5-alpha-341-SNAPSHOT</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Library for all the shared uid2 operations</description>
     <url>https://github.com/IABTechLab/uid2docs</url>