updated salt bucket format log to include salt count

Author: sophia-chen-ttd

src/main/java/com/uid2/admin/salt/SaltRotation.java

@@ -62,7 +62,7 @@ public Result rotateSalts(
         logSaltAges("refreshable-salts", targetDate, refreshableSalts);
         logSaltAges("rotated-salts", targetDate, saltsToRotate);
         logSaltAges("total-salts", targetDate, Arrays.asList(postRotationSalts));
-        logKeyBucketCount(targetDate, preRotationSalts, postRotationSalts);
+        logBucketFormatCount(targetDate, preRotationSalts, postRotationSalts);
 
         var nextSnapshot = new SaltSnapshot(
                 nextEffective,
@@ -247,18 +247,20 @@ private void logSaltAges(String saltCountType, TargetDate targetDate, Collection
         }
     }
 
-    private void logKeyBucketCount(TargetDate targetDate, SaltEntry[] preRotationSalts, SaltEntry[] postRotationSalts) {
-        int newKeyBucketCounter = 0;
-        int totalKeyBucketCounter = 0;
+    private void logBucketFormatCount(TargetDate targetDate, SaltEntry[] preRotationSalts, SaltEntry[] postRotationSalts) {
+        int newKeyBucketCounter = 0, totalKeyBucketCounter = 0, totalSaltBucketCounter = 0;
+
         for (int i = 0; i < preRotationSalts.length && i < postRotationSalts.length; i++) {
             var oldSalt = preRotationSalts[i];
             var updatedSalt = postRotationSalts[i];
 
             if (updatedSalt.currentKey() != null) totalKeyBucketCounter++;
+            if (updatedSalt.currentSalt() != null) totalSaltBucketCounter++;
             if (updatedSalt.currentKey() != null && oldSalt.currentSalt() != null) newKeyBucketCounter++;
         }
-        LOGGER.info("salt_bucket_count_type={} target_date={} bucket_count={}", "new-key-buckets", targetDate, newKeyBucketCounter);
-        LOGGER.info("salt_bucket_count_type={} target_date={} bucket_count={}", "total-key-buckets", targetDate, totalKeyBucketCounter);
+
+        LOGGER.info("Salt rotation bucket format: target_date={} new_key_bucket_count={} total_key_bucket_count={} total_salt_bucket_count={}",
+                targetDate, newKeyBucketCounter, totalKeyBucketCounter, totalSaltBucketCounter);
     }
 
     @Getter

src/test/java/com/uid2/admin/salt/SaltRotationTest.java

@@ -729,11 +729,12 @@ void testKeyRotationSaltToKeyRotation() throws Exception {
 
     @ParameterizedTest
     @CsvSource({
-            "true, 1, 3",
-            "false, 0, 1"
+            "true, 1, 3, 1",
+            "false, 0, 1, 3"
     })
-    void testKeyRotationLogKeyBuckets(boolean v4Enabled, int expectedNewKeyBuckets, int expectedTotalKeyBuckets) throws Exception {
+    void testKeyRotationLogKeyBuckets(boolean v4Enabled, int expectedNewKeyBuckets, int expectedTotalKeyBuckets, int expectedTotalSaltBuckets) throws Exception {
         saltRotation = new SaltRotation(keyGenerator, JsonObject.of(AdminConst.ENABLE_V4_RAW_UID, v4Enabled));
+        when(keyGenerator.generateRandomKeyString(anyInt())).thenReturn("random-key-string");
 
         final Duration[] minAges = {
                 Duration.ofDays(30)
@@ -751,10 +752,10 @@ void testKeyRotationLogKeyBuckets(boolean v4Enabled, int expectedNewKeyBuckets,
         saltRotation.rotateSalts(lastSnapshot, minAges, 1, targetDate());
 
         var expected = Set.of(
-                "[INFO] salt_bucket_count_type=new-key-buckets target_date=2025-01-01 bucket_count=" + expectedNewKeyBuckets,
-                "[INFO] salt_bucket_count_type=total-key-buckets target_date=2025-01-01 bucket_count=" + expectedTotalKeyBuckets
+                String.format("[INFO] Salt rotation bucket format: target_date=2025-01-01 new_key_bucket_count=%d total_key_bucket_count=%d total_salt_bucket_count=%d",
+                        expectedNewKeyBuckets, expectedTotalKeyBuckets, expectedTotalSaltBuckets)
         );
-        var actual = appender.list.stream().map(Object::toString).filter(s -> s.contains("salt_bucket_count_type")).collect(Collectors.toSet());
+        var actual = appender.list.stream().map(Object::toString).filter(s -> s.contains("Salt rotation bucket format")).collect(Collectors.toSet());
         assertThat(actual).isEqualTo(expected);
     }
 }