From 58c8cb830f01893cd71bd7ee9c7c75b9392cdd26 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Wed, 28 May 2025 10:58:56 +1000 Subject: [PATCH 1/4] added log line for when salt rotation is complete --- src/main/java/com/uid2/admin/salt/SaltRotation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/uid2/admin/salt/SaltRotation.java b/src/main/java/com/uid2/admin/salt/SaltRotation.java index 2f942651..2919404a 100644 --- a/src/main/java/com/uid2/admin/salt/SaltRotation.java +++ b/src/main/java/com/uid2/admin/salt/SaltRotation.java @@ -56,6 +56,7 @@ public Result rotateSalts( var postRotationSalts = rotateSalts(preRotationSalts, saltsToRotate, targetDate); + LOGGER.info("Salt rotation complete, target_date={} salts_rotated={} total_salts={}", targetDate, saltsToRotate.size(), postRotationSalts.length); logSaltAges("refreshable-salts", targetDate, refreshableSalts); logSaltAges("rotated-salts", targetDate, saltsToRotate); logSaltAges("total-salts", targetDate, Arrays.asList(postRotationSalts)); From 86809570c92b71c13cfd2c9de6dcbc3549d345f3 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Wed, 28 May 2025 11:21:38 +1000 Subject: [PATCH 2/4] updated salt rotation logging test --- src/test/java/com/uid2/admin/salt/SaltRotationTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java index 8669ab24..9d0d5296 100644 --- a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java +++ b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java @@ -365,6 +365,7 @@ void logsSaltAgesOnRotation() throws Exception { .build(); var expected = Set.of( + "[INFO] Salt rotation complete, target_date=2025-01-01 salts_rotated=2 total_salts=5", // 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", From 324a79de5cbbe22af5c785eed40e41fd778f9db5 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 29 May 2025 15:00:49 +1000 Subject: [PATCH 3/4] updated log line --- src/main/java/com/uid2/admin/salt/SaltRotation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/admin/salt/SaltRotation.java b/src/main/java/com/uid2/admin/salt/SaltRotation.java index 2919404a..5cca956e 100644 --- a/src/main/java/com/uid2/admin/salt/SaltRotation.java +++ b/src/main/java/com/uid2/admin/salt/SaltRotation.java @@ -56,7 +56,7 @@ public Result rotateSalts( var postRotationSalts = rotateSalts(preRotationSalts, saltsToRotate, targetDate); - LOGGER.info("Salt rotation complete, target_date={} salts_rotated={} total_salts={}", targetDate, saltsToRotate.size(), postRotationSalts.length); + LOGGER.info("Salt rotation complete target_date={}", targetDate); logSaltAges("refreshable-salts", targetDate, refreshableSalts); logSaltAges("rotated-salts", targetDate, saltsToRotate); logSaltAges("total-salts", targetDate, Arrays.asList(postRotationSalts)); From cab8506e325c15d228a03e88acd1f95c31d453b0 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 29 May 2025 15:01:52 +1000 Subject: [PATCH 4/4] updated log line in test --- src/test/java/com/uid2/admin/salt/SaltRotationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java index 9d0d5296..02850f9f 100644 --- a/src/test/java/com/uid2/admin/salt/SaltRotationTest.java +++ b/src/test/java/com/uid2/admin/salt/SaltRotationTest.java @@ -365,7 +365,7 @@ void logsSaltAgesOnRotation() throws Exception { .build(); var expected = Set.of( - "[INFO] Salt rotation complete, target_date=2025-01-01 salts_rotated=2 total_salts=5", + "[INFO] Salt rotation complete target_date=2025-01-01", // 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",