wip

Author: jandro996

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java

@@ -92,15 +92,15 @@ private static InetAddress doResolve(AgentSpanContext.Extracted context, Mutable
       result = coalesce(result, addr);
     }
 
-    addr = tryHeader(context.getForwardedFor(), PLAIN_IP_ADDRESS_PARSER);
+    addr = tryHeader(context.getForwarded(), FORWARDED_PARSER);
     if (addr != null) {
       if (!isIpAddrPrivate(addr)) {
         return addr;
       }
       result = coalesce(result, addr);
     }
 
-    addr = tryHeader(context.getForwarded(), FORWARDED_PARSER);
+    addr = tryHeader(context.getForwardedFor(), PLAIN_IP_ADDRESS_PARSER);
     if (addr != null) {
       if (!isIpAddrPrivate(addr)) {
         return addr;

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolverSpecification.groovy

@@ -127,10 +127,10 @@ class ClientIpAddressResolverSpecification extends Specification {
     1 * context.getXClientIp() >> null
 
     then:
-    1 * context.getForwardedFor() >> null
+    1 * context.getForwarded() >> null
 
     then:
-    1 * context.getForwarded() >> null
+    1 * context.getForwardedFor() >> null
 
     then:
     1 * context.getXClusterClientIp() >> null