Improve Opt Out Sender error handling and observability

src/main/java/com/uid2/optout/partner/EndpointConfig.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uid2.shared.Const;
 import com.uid2.shared.auth.ClientKey;
-import io.vertx.core.http.HttpMethod;
+import io.netty.handler.codec.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
 
 import java.time.Instant;

src/main/java/com/uid2/optout/partner/OptOutPartnerEndpoint.java

@@ -1,22 +1,33 @@
 package com.uid2.optout.partner;
 
 import com.uid2.optout.web.RetryingWebClient;
+import com.uid2.optout.web.UnexpectedStatusCodeException;
 import com.uid2.shared.Utils;
 import com.uid2.shared.optout.OptOutEntry;
 import com.uid2.shared.optout.OptOutUtils;
+import io.netty.handler.codec.http.HttpMethod;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
+import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpRequest;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 public class OptOutPartnerEndpoint implements IOptOutPartnerEndpoint {
     public static final String VALUEREF_ADVERTISING_ID = "${ADVERTISING_ID}";
     public static final String VALUEREF_OPTOUT_EPOCH = "${OPTOUT_EPOCH}";
     public static final String QUOTEDVREF_ADVERTISING_ID = Pattern.quote(OptOutPartnerEndpoint.VALUEREF_ADVERTISING_ID);
     public static final String QUOTEDVEF_OPTOUT_EPOCH = Pattern.quote(OptOutPartnerEndpoint.VALUEREF_OPTOUT_EPOCH);
+
+    private static final Set<Integer> SUCCESS_STATUS_CODES = Set.of(200, 204);
+    private static final Set<Integer> RETRYABLE_STATUS_CODES = Set.of(429, 500, 502, 503, 504);
     private static final Logger LOGGER = LoggerFactory.getLogger(OptOutPartnerEndpoint.class);
+
     private final EndpointConfig config;
     private final RetryingWebClient retryingClient;
 
@@ -33,36 +44,56 @@ public String name() {
     @Override
     public Future<Void> send(OptOutEntry entry) {
         return this.retryingClient.send(
-            req -> {
-                for (String queryParam : this.config.queryParams()) {
+            (URI uri, HttpMethod method) -> {
+                URIBuilder uriBuilder = new URIBuilder(uri);
+
+                for (String queryParam : config.queryParams()) {
                     int indexOfEqualSign = queryParam.indexOf('=');
                     String paramName = queryParam.substring(0, indexOfEqualSign);
                     String paramValue = queryParam.substring(indexOfEqualSign + 1);
                     String replacedValue = replaceValueReferences(entry, paramValue);
-                    req.setQueryParam(paramName, replacedValue);
+
+                    uriBuilder.addParameter(paramName, replacedValue);
+                }
+
+                URI uriWithParams;
+                try {
+                    uriWithParams = uriBuilder.build();
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException(e);
                 }
 
+                HttpRequest.Builder builder = HttpRequest.newBuilder()
+                        .uri(uriWithParams)
+                        .method(method.toString(), HttpRequest.BodyPublishers.noBody());
+
                 for (String additionalHeader : this.config.additionalHeaders()) {
                     int indexOfColonSign = additionalHeader.indexOf(':');
                     String headerName = additionalHeader.substring(0, indexOfColonSign);
                     String headerValue = additionalHeader.substring(indexOfColonSign + 1);
                     String replacedValue = replaceValueReferences(entry, headerValue);
-                    req.headers().add(headerName, replacedValue);
+                    builder.header(headerName, replacedValue);
                 }
 
-                LOGGER.info("replaying optout " + config.url() + " - advertising_id: " + Utils.maskPii(entry.advertisingId) + ", epoch: " + String.valueOf(entry.timestamp));
+                LOGGER.info("replaying optout " + config.url() + " - advertising_id: " + Utils.maskPii(entry.advertisingId) + ", epoch: " + entry.timestamp);
 
-                return req;
+                return builder.build();
             },
             resp -> {
-                // returning tri-state boolean
-                // - TRUE: result looks good
-                // - FALSE: retry-able error code returned
-                // - NULL: failed and should not retry
-                if (resp == null) return false;
-                else if (resp.statusCode() == 200) return true;
-                else if (resp.statusCode() == 500) return false;
-                else return null;
+                if (resp == null) {
+                    throw new RuntimeException("response is null");
+                }
+
+                if (SUCCESS_STATUS_CODES.contains(resp.statusCode())) {
+                    return true;
+                }
+
+                LOGGER.info("received non-200 response: " + resp.statusCode() + "-" + resp.body() + " for optout " + config.url() + " - advertising_id: " + Utils.maskPii(entry.advertisingId) + ", epoch: " + entry.timestamp);
+                if (RETRYABLE_STATUS_CODES.contains(resp.statusCode())) {
+                    return false;
+                } else {
+                    throw new UnexpectedStatusCodeException(resp.statusCode());
+                }
             }
         );
     }

src/main/java/com/uid2/optout/util/Tuple.java

@@ -0,0 +1,31 @@
+package com.uid2.optout.util;
+
+public class Tuple {
+    public static class Tuple2<T1, T2> {
+        private final T1 item1;
+        private final T2 item2;
+
+        public Tuple2(T1 item1, T2 item2) {
+            assert item1 != null;
+            assert item2 != null;
+
+            this.item1 = item1;
+            this.item2 = item2;
+        }
+
+        public T1 getItem1() { return item1; }
+        public T2 getItem2() { return item2; }
+
+        @Override
+        public int hashCode() { return item1.hashCode() ^ item2.hashCode(); }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof Tuple2)) return false;
+            Tuple2 pairo = (Tuple2) o;
+            return this.item1.equals(pairo.item1) &&
+                    this.item2.equals(pairo.item2);
+        }
+    }
+}
+