diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD index 9adb5fde3..4ac333465 100644 --- a/java/google/registry/keyring/api/BUILD +++ b/java/google/registry/keyring/api/BUILD @@ -13,6 +13,8 @@ java_library( "//java/google/registry/util", "@com_google_code_findbugs_jsr305", "@com_google_dagger", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@org_bouncycastle_bcpg_jdk15on", "@org_bouncycastle_bcpkix_jdk15on", diff --git a/java/google/registry/keyring/api/ComparatorKeyring.java b/java/google/registry/keyring/api/ComparatorKeyring.java index 48b1f89ce..5897d9514 100644 --- a/java/google/registry/keyring/api/ComparatorKeyring.java +++ b/java/google/registry/keyring/api/ComparatorKeyring.java @@ -16,7 +16,7 @@ package google.registry.keyring.api; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; -import com.google.common.logging.FormattingLogger; +import com.google.common.flogger.FluentLogger; import google.registry.util.ComparingInvocationHandler; import java.io.IOException; import java.io.PrintWriter; @@ -43,8 +43,7 @@ import org.bouncycastle.openpgp.PGPPublicKey; */ public final class ComparatorKeyring extends ComparingInvocationHandler { - @VisibleForTesting - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private ComparatorKeyring(Keyring original, Keyring second) { super(Keyring.class, original, second); @@ -61,7 +60,7 @@ public final class ComparatorKeyring extends ComparingInvocationHandler @Override protected void log(Method method, String message) { - logger.severefmt("ComparatorKeyring.%s: %s", method.getName(), message); + logger.atSevere().log("ComparatorKeyring.%s: %s", method.getName(), message); } /** Implements equals for the PGP classes. */ @@ -124,7 +123,8 @@ public final class ComparatorKeyring extends ComparingInvocationHandler return Arrays.equals(a.getFingerprint(), b.getFingerprint()) && Arrays.equals(a.getEncoded(), b.getEncoded()); } catch (IOException e) { - logger.severe(e, "ComparatorKeyring error: PGPPublicKey.getEncoded failed."); + logger.atSevere().withCause(e).log( + "ComparatorKeyring error: PGPPublicKey.getEncoded failed."); return false; } } @@ -147,7 +147,8 @@ public final class ComparatorKeyring extends ComparingInvocationHandler try { return Arrays.equals(a.getEncoded(), b.getEncoded()); } catch (IOException e) { - logger.severe(e, "ComparatorKeyring error: PublicKeyPacket.getEncoded failed."); + logger.atSevere().withCause(e).log( + "ComparatorKeyring error: PublicKeyPacket.getEncoded failed."); return false; } } diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index b92dece7a..2b90db630 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/java/google/registry/mapreduce/inputs/BUILD @@ -17,6 +17,8 @@ java_library( "@com_google_appengine_tools_appengine_pipeline", "@com_google_code_findbugs_jsr305", "@com_google_dagger", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@javax_servlet_api", "@joda_time", diff --git a/java/google/registry/mapreduce/inputs/ChildEntityReader.java b/java/google/registry/mapreduce/inputs/ChildEntityReader.java index 9e5011bfc..367319461 100644 --- a/java/google/registry/mapreduce/inputs/ChildEntityReader.java +++ b/java/google/registry/mapreduce/inputs/ChildEntityReader.java @@ -23,7 +23,6 @@ import com.google.appengine.tools.mapreduce.InputReader; import com.google.appengine.tools.mapreduce.ShardContext; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.annotation.Entity; import google.registry.model.EppResource; @@ -42,8 +41,6 @@ class ChildEntityReader extend private static final long serialVersionUID = 7481761146349663848L; - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); - /** This reader uses an EppResourceEntityReader under the covers to iterate over EPP resources. */ private final EppResourceEntityReader eppResourceEntityReader; diff --git a/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java b/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java index aedc0f33b..c6e28509f 100644 --- a/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java +++ b/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java @@ -19,7 +19,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.api.datastore.Cursor; import com.google.appengine.api.datastore.QueryResultIterator; import com.google.appengine.tools.mapreduce.InputReader; -import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.cmd.Query; import google.registry.model.ofy.CommitLogBucket; @@ -32,8 +31,6 @@ import org.joda.time.DateTime; class CommitLogManifestReader extends RetryingInputReader, Key> { - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); - /** * Memory estimation for this reader. * diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java index c1938bbb3..4027b1956 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java @@ -21,7 +21,6 @@ import com.google.appengine.api.datastore.Cursor; import com.google.appengine.api.datastore.QueryResultIterator; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; -import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.cmd.Query; import google.registry.model.EppResource; @@ -32,8 +31,6 @@ import javax.annotation.Nullable; /** Base class for {@link InputReader} classes that map over {@link EppResourceIndex}. */ abstract class EppResourceBaseReader extends RetryingInputReader { - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); - /** Number of bytes in 1MB of memory, used for memory estimates. */ static final long ONE_MB = 1024 * 1024; diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java index 52d7bdf76..dda110c50 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java @@ -18,6 +18,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import com.google.appengine.tools.mapreduce.InputReader; import com.google.common.collect.ImmutableSet; +import com.google.common.flogger.FluentLogger; import com.googlecode.objectify.Key; import google.registry.model.EppResource; import google.registry.model.index.EppResourceIndex; @@ -27,6 +28,8 @@ import java.util.NoSuchElementException; /** Reader that maps over {@link EppResourceIndex} and returns resources. */ class EppResourceEntityReader extends EppResourceBaseReader { + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + private static final long serialVersionUID = -8042933349899971801L; /** @@ -61,7 +64,7 @@ class EppResourceEntityReader extends EppResourceBaseRead Key key = nextQueryResult().getKey(); EppResource resource = ofy().load().key(key).now(); if (resource == null) { - logger.severefmt("EppResourceIndex key %s points at a missing resource", key); + logger.atSevere().log("EppResourceIndex key %s points at a missing resource", key); continue; } // Postfilter to distinguish polymorphic types (e.g. DomainBase and DomainResource). diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index 3398140b9..bdd33ba9e 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/java/google/registry/ui/server/registrar/BUILD @@ -31,6 +31,8 @@ java_library( "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", "@com_google_dagger", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_re2j", "@io_bazel_rules_closure//closure/templates", diff --git a/java/google/registry/ui/server/registrar/SessionUtils.java b/java/google/registry/ui/server/registrar/SessionUtils.java index 0661deff2..eb36bc6eb 100644 --- a/java/google/registry/ui/server/registrar/SessionUtils.java +++ b/java/google/registry/ui/server/registrar/SessionUtils.java @@ -21,7 +21,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentPresent; import com.google.appengine.api.users.User; import com.google.common.base.Strings; -import com.google.common.logging.FormattingLogger; +import com.google.common.flogger.FluentLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.model.registrar.Registrar; @@ -40,7 +40,7 @@ import javax.servlet.http.HttpSession; @Immutable public class SessionUtils { - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); public static final String CLIENT_ID_ATTRIBUTE = "clientId"; @@ -102,11 +102,12 @@ public class SessionUtils { // Use the clientId if it exists if (clientId != null) { if (!hasAccessToRegistrar(clientId, user.getUserId())) { - logger.infofmt("Registrar Console access revoked: %s", clientId); + logger.atInfo().log("Registrar Console access revoked: %s", clientId); session.invalidate(); return false; } - logger.infofmt("Associating user %s with given registrar %s.", user.getUserId(), clientId); + logger.atInfo().log( + "Associating user %s with given registrar %s.", user.getUserId(), clientId); return true; } @@ -114,7 +115,7 @@ public class SessionUtils { Optional registrar = findRegistrarForUser(user.getUserId()); if (registrar.isPresent()) { verify(hasAccessToRegistrar(registrar.get(), user.getUserId())); - logger.infofmt( + logger.atInfo().log( "Associating user %s with found registrar %s.", user.getUserId(), registrar.get().getClientId()); session.setAttribute(CLIENT_ID_ATTRIBUTE, registrar.get().getClientId()); @@ -125,20 +126,20 @@ public class SessionUtils { // registryAdminClientId if (userAuthInfo.isUserAdmin()) { if (Strings.isNullOrEmpty(registryAdminClientId)) { - logger.infofmt( + logger.atInfo().log( "Cannot associate admin user %s with configured client Id." + " ClientId is null or empty.", user.getUserId()); return false; } if (!Registrar.loadByClientIdCached(registryAdminClientId).isPresent()) { - logger.infofmt( + logger.atInfo().log( "Cannot associate admin user %s with configured client Id %s." + " Registrar does not exist.", user.getUserId(), registryAdminClientId); return false; } - logger.infofmt( + logger.atInfo().log( "User %s is an admin with no associated registrar." + " Automatically associating the user with configured client Id %s.", user.getUserId(), registryAdminClientId); @@ -147,7 +148,7 @@ public class SessionUtils { } // We couldn't find any relevant clientId - logger.infofmt("User not associated with any Registrar: %s", user.getUserId()); + logger.atInfo().log("User not associated with any Registrar: %s", user.getUserId()); return false; } @@ -173,7 +174,7 @@ public class SessionUtils { String registrarClientId = contact.getParent().getName(); Optional result = Registrar.loadByClientIdCached(registrarClientId); if (!result.isPresent()) { - logger.severefmt( + logger.atSevere().log( "A contact record exists for non-existent registrar: %s.", Key.create(contact)); } return result; @@ -183,7 +184,7 @@ public class SessionUtils { protected static boolean hasAccessToRegistrar(String clientId, final String gaeUserId) { Optional registrar = Registrar.loadByClientIdCached(clientId); if (!registrar.isPresent()) { - logger.warningfmt("Registrar '%s' disappeared from Datastore!", clientId); + logger.atWarning().log("Registrar '%s' disappeared from Datastore!", clientId); return false; } return hasAccessToRegistrar(registrar.get(), gaeUserId); diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index f72db933f..258ceafab 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -15,6 +15,8 @@ java_library( "@com_google_code_findbugs_jsr305", "@com_google_dagger", "@com_google_errorprone_error_prone_annotations", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_re2j", "@com_ibm_icu_icu4j", diff --git a/java/google/registry/util/RequestStatusCheckerImpl.java b/java/google/registry/util/RequestStatusCheckerImpl.java index e2ca073f1..128501479 100644 --- a/java/google/registry/util/RequestStatusCheckerImpl.java +++ b/java/google/registry/util/RequestStatusCheckerImpl.java @@ -22,7 +22,7 @@ import com.google.apphosting.api.ApiProxy; import com.google.apphosting.api.ApiProxy.Environment; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; -import com.google.common.logging.FormattingLogger; +import com.google.common.flogger.FluentLogger; import java.util.Collections; import javax.inject.Inject; @@ -31,8 +31,7 @@ public class RequestStatusCheckerImpl implements RequestStatusChecker { private static final long serialVersionUID = -8161977032130865437L; - @VisibleForTesting - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); @VisibleForTesting static LogService logService = LogServiceFactory.getLogService(); @@ -56,7 +55,7 @@ public class RequestStatusCheckerImpl implements RequestStatusChecker { public String getLogId() { String requestLogId = ApiProxy.getCurrentEnvironment().getAttributes().get(REQUEST_LOG_ID_KEY).toString(); - logger.infofmt("Current requestLogId: %s", requestLogId); + logger.atInfo().log("Current requestLogId: %s", requestLogId); // We want to make sure there actually is a log to query for this request, even if the request // dies right after this call. // @@ -85,12 +84,12 @@ public class RequestStatusCheckerImpl implements RequestStatusChecker { // request is too new (it can take several seconds until the logs are available for "fetch"). // So we have to assume it's "running" in that case. if (requestLogs == null) { - logger.infofmt( + logger.atInfo().log( "Queried an unrecognized requestLogId %s - assume it's running", requestLogId); return true; } - logger.infofmt( - "Found logs for requestLogId %s - isFinished: %s", requestLogId, requestLogs.isFinished()); + logger.atInfo().log( + "Found logs for requestLogId %s - isFinished: %b", requestLogId, requestLogs.isFinished()); return !requestLogs.isFinished(); } } diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index b47ed0abd..399b05084 100644 --- a/java/google/registry/whois/BUILD +++ b/java/google/registry/whois/BUILD @@ -20,6 +20,8 @@ java_library( "@com_google_auto_value", "@com_google_code_findbugs_jsr305", "@com_google_dagger", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_monitoring_client_metrics", "@javax_servlet_api", diff --git a/java/google/registry/whois/WhoisReader.java b/java/google/registry/whois/WhoisReader.java index 724f63690..62c05b3e6 100644 --- a/java/google/registry/whois/WhoisReader.java +++ b/java/google/registry/whois/WhoisReader.java @@ -21,8 +21,8 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.common.base.Joiner; +import com.google.common.flogger.FluentLogger; import com.google.common.io.CharStreams; -import com.google.common.logging.FormattingLogger; import com.google.common.net.InetAddresses; import com.google.common.net.InternetDomainName; import google.registry.config.RegistryConfig.Config; @@ -63,7 +63,7 @@ import org.joda.time.DateTime; */ class WhoisReader { - static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); /** * These are strings that will always trigger a specific query type when they are sent at @@ -115,7 +115,7 @@ class WhoisReader { // Try to parse the argument as a domain name. try { - logger.infofmt("Attempting domain lookup command using domain name %s", tokens.get(1)); + logger.atInfo().log("Attempting domain lookup command using domain name %s", tokens.get(1)); return commandFactory.domainLookup( InternetDomainName.from(canonicalizeDomainName(tokens.get(1))), fullOutput); } catch (IllegalArgumentException iae) { @@ -134,7 +134,7 @@ class WhoisReader { // Try to parse the argument as an IP address. try { - logger.infofmt( + logger.atInfo().log( "Attempting nameserver lookup command using %s as an IP address", tokens.get(1)); return commandFactory.nameserverLookupByIp(InetAddresses.forString(tokens.get(1))); } catch (IllegalArgumentException iae) { @@ -143,7 +143,7 @@ class WhoisReader { // Try to parse the argument as a host name. try { - logger.infofmt( + logger.atInfo().log( "Attempting nameserver lookup command using %s as a hostname", tokens.get(1)); return commandFactory.nameserverLookupByHost(InternetDomainName.from( canonicalizeDomainName(tokens.get(1)))); @@ -163,7 +163,7 @@ class WhoisReader { "Too few arguments to '%s' command.", REGISTRAR_LOOKUP_COMMAND)); } String registrarLookupArgument = Joiner.on(' ').join(tokens.subList(1, tokens.size())); - logger.infofmt( + logger.atInfo().log( "Attempting registrar lookup command using registrar %s", registrarLookupArgument); return commandFactory.registrarLookup(registrarLookupArgument); } @@ -172,7 +172,7 @@ class WhoisReader { if (tokens.size() == 1) { // Try to parse it as an IP address. If successful, then this is a lookup on a nameserver. try { - logger.infofmt("Attempting nameserver lookup using %s as an IP address", arg1); + logger.atInfo().log("Attempting nameserver lookup using %s as an IP address", arg1); return commandFactory.nameserverLookupByIp(InetAddresses.forString(arg1)); } catch (IllegalArgumentException iae) { // Silently ignore this exception. @@ -187,19 +187,19 @@ class WhoisReader { Optional tld = findTldForName(targetName); if (!tld.isPresent()) { // This target is not under any configured TLD, so just try it as a registrar name. - logger.infofmt("Attempting registrar lookup using %s as a registrar", arg1); + logger.atInfo().log("Attempting registrar lookup using %s as a registrar", arg1); return new RegistrarLookupCommand(arg1); } // If the target is exactly one level above the TLD, then this is a second level domain // (SLD) and we should do a domain lookup on it. if (targetName.parent().equals(tld.get())) { - logger.infofmt("Attempting domain lookup using %s as a domain name", targetName); + logger.atInfo().log("Attempting domain lookup using %s as a domain name", targetName); return commandFactory.domainLookup(targetName, fullOutput); } // The target is more than one level above the TLD, so we'll assume it's a nameserver. - logger.infofmt("Attempting nameserver lookup using %s as a hostname", targetName); + logger.atInfo().log("Attempting nameserver lookup using %s as a hostname", targetName); return commandFactory.nameserverLookupByHost(targetName); } catch (IllegalArgumentException e) { // Silently ignore this exception. @@ -211,7 +211,7 @@ class WhoisReader { // The only case left is that there are multiple tokens with no particular command given. We'll // assume this is a registrar lookup, since there's really nothing else it could be. String registrarLookupArgument = Joiner.on(' ').join(tokens); - logger.infofmt( + logger.atInfo().log( "Attempting registrar lookup employing %s as a registrar", registrarLookupArgument); return commandFactory.registrarLookup(registrarLookupArgument); } diff --git a/javatests/google/registry/keyring/api/BUILD b/javatests/google/registry/keyring/api/BUILD index adc6f54a3..784094c04 100644 --- a/javatests/google/registry/keyring/api/BUILD +++ b/javatests/google/registry/keyring/api/BUILD @@ -13,6 +13,8 @@ java_library( deps = [ "//java/google/registry/keyring/api", "//javatests/google/registry/testing", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava_testlib", "@com_google_truth", "@com_google_truth_extensions_truth_java8_extension", diff --git a/javatests/google/registry/keyring/api/ComparatorKeyringTest.java b/javatests/google/registry/keyring/api/ComparatorKeyringTest.java index a541045b0..8da1cae57 100644 --- a/javatests/google/registry/keyring/api/ComparatorKeyringTest.java +++ b/javatests/google/registry/keyring/api/ComparatorKeyringTest.java @@ -21,6 +21,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.flogger.LoggerConfig; import com.google.common.testing.TestLogHandler; import java.io.IOException; import java.util.logging.Level; @@ -80,12 +81,12 @@ public class ComparatorKeyringTest { @Before public void setUp() { - ComparatorKeyring.logger.getFormattingLogger().addHandler(testLogHandler); + LoggerConfig.getConfig(ComparatorKeyring.class).addHandler(testLogHandler); } @After public void tearDown() { - ComparatorKeyring.logger.getFormattingLogger().removeHandler(testLogHandler); + LoggerConfig.getConfig(ComparatorKeyring.class).removeHandler(testLogHandler); } @Test diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index 19a93213d..a2d3b207d 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/javatests/google/registry/ui/server/registrar/BUILD @@ -27,6 +27,8 @@ java_library( "//third_party/objectify:objectify-v4_1", "@com_braintreepayments_gateway_braintree_java", "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_guava_testlib", "@com_google_truth", diff --git a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java index d2b3a37ce..51c309ac1 100644 --- a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java +++ b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import com.google.appengine.api.users.User; +import com.google.common.flogger.LoggerConfig; import com.google.common.testing.NullPointerTester; import com.google.common.testing.TestLogHandler; import google.registry.model.registrar.RegistrarContact; @@ -77,7 +78,7 @@ public class SessionUtilsTest { @Before public void before() throws Exception { - SessionUtils.logger.getFormattingLogger().addHandler(testLogHandler); + LoggerConfig.getConfig(SessionUtils.class).addHandler(testLogHandler); sessionUtils = new SessionUtils(); sessionUtils.registryAdminClientId = ADMIN_CLIENT_ID; persistResource(loadRegistrar(ADMIN_CLIENT_ID)); @@ -86,7 +87,7 @@ public class SessionUtilsTest { @After public void after() throws Exception { - SessionUtils.logger.getFormattingLogger().removeHandler(testLogHandler); + LoggerConfig.getConfig(SessionUtils.class).removeHandler(testLogHandler); } /** User needs to be logged in before calling checkRegistrarConsoleLogin */ diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD index dc7d2f3c8..527877caa 100644 --- a/javatests/google/registry/util/BUILD +++ b/javatests/google/registry/util/BUILD @@ -16,6 +16,8 @@ java_library( "//javatests/google/registry/testing", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_guava_testlib", "@com_google_re2j", diff --git a/javatests/google/registry/util/RequestStatusCheckerImplTest.java b/javatests/google/registry/util/RequestStatusCheckerImplTest.java index a7dd2b88a..cc81fe77b 100644 --- a/javatests/google/registry/util/RequestStatusCheckerImplTest.java +++ b/javatests/google/registry/util/RequestStatusCheckerImplTest.java @@ -25,6 +25,7 @@ import com.google.appengine.api.log.LogService; import com.google.appengine.api.log.RequestLogs; import com.google.apphosting.api.ApiProxy; import com.google.common.collect.ImmutableList; +import com.google.common.flogger.LoggerConfig; import com.google.common.testing.TestLogHandler; import google.registry.testing.AppEngineRule; import java.util.logging.Level; @@ -69,12 +70,12 @@ public final class RequestStatusCheckerImplTest { public AppEngineRule appEngineRule = AppEngineRule.builder().build(); @Before public void setUp() { - RequestStatusCheckerImpl.logger.getFormattingLogger().addHandler(logHandler); + LoggerConfig.getConfig(RequestStatusCheckerImpl.class).addHandler(logHandler); RequestStatusCheckerImpl.logService = mock(LogService.class); } @After public void tearDown() { - RequestStatusCheckerImpl.logger.getFormattingLogger().removeHandler(logHandler); + LoggerConfig.getConfig(RequestStatusCheckerImpl.class).removeHandler(logHandler); } // If a logId is unrecognized, it could be that the log hasn't been uploaded yet - so we assume diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index d4117375d..07f4fa62b 100644 --- a/javatests/google/registry/whois/BUILD +++ b/javatests/google/registry/whois/BUILD @@ -22,6 +22,8 @@ java_library( "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_testing", "@com_google_dagger", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_guava_testlib", "@com_google_truth", diff --git a/javatests/google/registry/whois/WhoisReaderTest.java b/javatests/google/registry/whois/WhoisReaderTest.java index 9d68ac99a..b9c39c018 100644 --- a/javatests/google/registry/whois/WhoisReaderTest.java +++ b/javatests/google/registry/whois/WhoisReaderTest.java @@ -19,6 +19,7 @@ import static google.registry.testing.DatastoreHelper.createTlds; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.LogsSubject.assertAboutLogs; +import com.google.common.flogger.LoggerConfig; import com.google.common.testing.TestLogHandler; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; @@ -41,7 +42,7 @@ public class WhoisReaderTest { @Before public void init() { createTlds("tld", "xn--kgbechtv", "1.test"); - WhoisReader.logger.getFormattingLogger().addHandler(testLogHandler); + LoggerConfig.getConfig(WhoisReader.class).addHandler(testLogHandler); } @SuppressWarnings({"TypeParameterUnusedInFormals", "unchecked"})