diff --git a/src/main/java/com/uid2/admin/salt/SaltRotation.java b/src/main/java/com/uid2/admin/salt/SaltRotation.java index aa8945d2..2f942651 100644 --- a/src/main/java/com/uid2/admin/salt/SaltRotation.java +++ b/src/main/java/com/uid2/admin/salt/SaltRotation.java @@ -184,7 +184,7 @@ private void logSaltAges(String saltCountType, TargetDate targetDate, Collection } for (var entry : ages.entrySet()) { - LOGGER.info("salt-count-type={} target-date={} age={} salt-count={}", + LOGGER.info("salt_count_type={} target_date={} age={} salt_count={}", saltCountType, targetDate, entry.getKey(), diff --git a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java index c96a647a..8669ab24 100644 --- a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java +++ b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java @@ -366,17 +366,17 @@ void logsSaltAgesOnRotation() throws Exception { var expected = Set.of( // Post-rotation ages, we want to look at current state - "[INFO] salt-count-type=total-salts target-date=2025-01-01 age=0 salt-count=2", // The two rotated salts, used to be 65 and 50 days old - "[INFO] salt-count-type=total-salts target-date=2025-01-01 age=5 salt-count=1", - "[INFO] salt-count-type=total-salts target-date=2025-01-01 age=10 salt-count=1", - "[INFO] salt-count-type=total-salts target-date=2025-01-01 age=50 salt-count=1", + "[INFO] salt_count_type=total-salts target_date=2025-01-01 age=0 salt_count=2", // The two rotated salts, used to be 65 and 50 days old + "[INFO] salt_count_type=total-salts target_date=2025-01-01 age=5 salt_count=1", + "[INFO] salt_count_type=total-salts target_date=2025-01-01 age=10 salt_count=1", + "[INFO] salt_count_type=total-salts target_date=2025-01-01 age=50 salt_count=1", // Pre-rotation ages, we want to see at which ages salts become refreshable, post rotation some will be 0 - "[INFO] salt-count-type=refreshable-salts target-date=2025-01-01 age=5 salt-count=1", - "[INFO] salt-count-type=refreshable-salts target-date=2025-01-01 age=65 salt-count=2", + "[INFO] salt_count_type=refreshable-salts target_date=2025-01-01 age=5 salt_count=1", + "[INFO] salt_count_type=refreshable-salts target_date=2025-01-01 age=65 salt_count=2", // Pre-rotation ages, post rotation they will all have age 0 - "[INFO] salt-count-type=rotated-salts target-date=2025-01-01 age=65 salt-count=2" + "[INFO] salt_count_type=rotated-salts target_date=2025-01-01 age=65 salt_count=2" ); var minAges = new Duration[]{Duration.ofDays(30), Duration.ofDays(60)};