rename trace_id to uid_trace_id

Author: Ian-Nara

src/main/java/com/uid2/optout/sqs/SqsMessageParser.java

@@ -32,7 +32,7 @@ public static List<SqsParsedMessage> parseAndSortMessages(List<Message> messages
             try {
                 // parse message body
                 JsonObject body = new JsonObject(message.body());
-                traceId = body.getString("trace_id");
+                traceId = body.getString("uid_trace_id");
 
                 String identityHash = body.getString("identity_hash");
                 String advertisingId = body.getString("advertising_id");

src/main/java/com/uid2/optout/vertx/OptOutServiceVerticle.java

@@ -388,7 +388,7 @@ private void handleQueue(RoutingContext routingContext) {
             JsonObject messageBody = new JsonObject()
                     .put(IDENTITY_HASH, identityHash)
                     .put(ADVERTISING_ID, advertisingId)
-                    .put("trace_id", traceId)
+                    .put("uid_trace_id", traceId)
                     .put("client_ip", clientIp)
                     .put("email", email)
                     .put("phone", phone);

src/test/java/com/uid2/optout/vertx/OptOutSqsLogProducerTest.java

@@ -172,7 +172,7 @@ private Message createMessage(String hash, String id, long timestampMs, String e
         if (email != null) body.put("email", email);
         if (phone != null) body.put("phone", phone);
         if (clientIp != null) body.put("client_ip", clientIp);
-        if (traceId != null) body.put("trace_id", traceId);
+        if (traceId != null) body.put("uid_trace_id", traceId);
 
         Map<MessageSystemAttributeName, String> attrs = new HashMap<>();
         attrs.put(MessageSystemAttributeName.SENT_TIMESTAMP, String.valueOf(timestampMs));