diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java index b17c12e0c..f9c4498dd 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java @@ -21,7 +21,6 @@ import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tags; import java.io.IOException; import java.util.Arrays; -import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -32,7 +31,6 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import net.logstash.logback.argument.StructuredArguments; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -742,17 +740,6 @@ public class AccountsManager { .isPostCheckMismatches()) { mismatchedAccounts.put(uuid); } - - if (dynamicConfigurationManager.getConfiguration().getAccountsDynamoDbMigrationConfiguration() - .isLogMismatches()) { - final String abbreviatedCallChain = getAbbreviatedCallChain(new RuntimeException().getStackTrace()); - - logger.info("Mismatched account data: {}", StructuredArguments.entries(Map.of( - "type", mismatchDescription, - "uuid", uuid, - "callChain", abbreviatedCallChain - ))); - } }); }); } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MigrationMismatchedAccountsTableCrawler.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MigrationMismatchedAccountsTableCrawler.java index 7c84a7675..b141d9ba6 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MigrationMismatchedAccountsTableCrawler.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MigrationMismatchedAccountsTableCrawler.java @@ -13,9 +13,11 @@ import java.io.IOException; import java.time.Duration; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; +import net.logstash.logback.argument.StructuredArguments; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; @@ -89,7 +91,9 @@ public class MigrationMismatchedAccountsTableCrawler extends ManagedPeriodicWork if (dynamicConfigurationManager.getConfiguration().getAccountsDynamoDbMigrationConfiguration() .isLogMismatches()) { - logger.info("Mismatch: {} - {}", uuid, mismatchType); + logger.info("Mismatch: {}", StructuredArguments.entries(Map.of( + "type", mismatchType, + "uuid", uuid))); } });