updated variable names

Author: sophia-chen-ttd

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

@@ -247,20 +247,22 @@ private void logSaltAges(String saltCountType, TargetDate targetDate, Collection
         }
     }
 
-    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];
+    /** Logging to monitor migration of buckets from salts to keys **/
+    private void logBucketFormatCount(TargetDate targetDate, SaltEntry[] preRotationBuckets, SaltEntry[] postRotationBuckets) {
+        int migratedKeyBucketCounter = 0, totalKeyBucketCounter = 0, totalSaltBucketCounter = 0;
 
-            if (updatedSalt.currentKey() != null) totalKeyBucketCounter++;
-            if (updatedSalt.currentSalt() != null) totalSaltBucketCounter++;
-            if (updatedSalt.currentKey() != null && oldSalt.currentSalt() != null) newKeyBucketCounter++;
+        for (int i = 0; i < preRotationBuckets.length && i < postRotationBuckets.length; i++) {
+            var oldBucket = preRotationBuckets[i];
+            var updatedBucket = postRotationBuckets[i];
+
+            if (updatedBucket.currentKey() != null) totalKeyBucketCounter++;
+            if (updatedBucket.currentSalt() != null) totalSaltBucketCounter++;
+            if (updatedBucket.currentKey() != null && oldBucket.currentSalt() != null) migratedKeyBucketCounter++;
         }
 
-        LOGGER.info("Salt rotation bucket format: target_date={} new_key_bucket_count={} total_key_bucket_count={} total_salt_bucket_count={}",
-                targetDate, newKeyBucketCounter, totalKeyBucketCounter, totalSaltBucketCounter);
+        LOGGER.info("Rotation bucket format: target_date={} migrated_key_bucket_count={} total_key_bucket_count={} total_salt_bucket_count={}",
+                targetDate, migratedKeyBucketCounter, totalKeyBucketCounter, totalSaltBucketCounter);
     }
 
     @Getter

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

@@ -732,7 +732,7 @@ void testKeyRotationSaltToKeyRotation() throws Exception {
             "true, 1, 3, 1",
             "false, 0, 1, 3"
     })
-    void testKeyRotationLogKeyBuckets(boolean v4Enabled, int expectedNewKeyBuckets, int expectedTotalKeyBuckets, int expectedTotalSaltBuckets) throws Exception {
+    void testKeyRotationLogBucketFormat(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");
 
@@ -752,10 +752,10 @@ void testKeyRotationLogKeyBuckets(boolean v4Enabled, int expectedNewKeyBuckets,
         saltRotation.rotateSalts(lastSnapshot, minAges, 1, targetDate());
 
         var expected = Set.of(
-                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",
+                String.format("[INFO] Rotation bucket format: target_date=2025-01-01 migrated_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 rotation bucket format")).collect(Collectors.toSet());
+        var actual = appender.list.stream().map(Object::toString).filter(s -> s.contains("Rotation bucket format")).collect(Collectors.toSet());
         assertThat(actual).isEqualTo(expected);
     }
 }