Migrate to internal FormattingLogger in preparation of migration to Flogger

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=197744904

java/google/registry/backup/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "backup",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/cron",
         "//java/google/registry/mapreduce",

java/google/registry/backup/CommitLogCheckpointAction.java

@@ -16,18 +16,18 @@ package google.registry.backup;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
 import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
+import com.google.common.logging.FormattingLogger;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogCheckpointRoot;
 import google.registry.request.Action;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.TaskQueueUtils;
 import javax.inject.Inject;
 import org.joda.time.DateTime;

java/google/registry/backup/DeleteOldCommitLogsAction.java

@@ -16,9 +16,9 @@ package google.registry.backup;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
 import static google.registry.model.ofy.ObjectifyService.ofy;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.util.PipelineUtils.createJobPath;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
@@ -29,6 +29,7 @@ import com.google.appengine.tools.mapreduce.ReducerInput;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultiset;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.mapreduce.MapreduceRunner;
@@ -43,7 +44,6 @@ import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

java/google/registry/backup/ExportCommitLogDiffAction.java

@@ -20,6 +20,7 @@ import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Lists.partition;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT;
 import static google.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTIONS;
 import static google.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT;
@@ -28,7 +29,6 @@ import static google.registry.model.ofy.CommitLogBucket.getBucketKey;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.isAtOrAfter;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static java.nio.channels.Channels.newOutputStream;
 import static java.util.Arrays.asList;
 import static java.util.Comparator.comparingLong;
@@ -39,6 +39,7 @@ import com.google.appengine.tools.cloudstorage.GcsService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.ImmutableObject;
@@ -49,7 +50,6 @@ import google.registry.model.ofy.CommitLogMutation;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collection;

java/google/registry/backup/GcsDiffFileLister.java

@@ -27,12 +27,12 @@ import com.google.appengine.tools.cloudstorage.GcsService;
 import com.google.appengine.tools.cloudstorage.ListItem;
 import com.google.appengine.tools.cloudstorage.ListOptions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import google.registry.backup.BackupModule.Backups;
 import google.registry.config.RegistryConfig.Config;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;

java/google/registry/backup/RestoreCommitLogsAction.java

@@ -29,6 +29,7 @@ import com.google.appengine.tools.cloudstorage.GcsService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.PeekingIterator;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Result;
 import com.googlecode.objectify.util.ResultNow;
@@ -42,7 +43,6 @@ import google.registry.model.ofy.CommitLogMutation;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Retrier;
 import java.io.IOException;
 import java.io.InputStream;

java/google/registry/batch/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "batch",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/bigquery",
         "//java/google/registry/config",
         "//java/google/registry/dns",

java/google/registry/batch/DeleteContactsAndHostsAction.java

@@ -19,6 +19,7 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static com.google.common.math.IntMath.divide;
 import static com.googlecode.objectify.Key.getKind;
 import static google.registry.flows.ResourceFlowUtils.denyPendingTransfer;
@@ -39,7 +40,6 @@ import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_DELETE;
 import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_DELETE_FAILURE;
 import static google.registry.model.reporting.HistoryEntry.Type.HOST_DELETE;
 import static google.registry.model.reporting.HistoryEntry.Type.HOST_DELETE_FAILURE;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.util.PipelineUtils.createJobPath;
 import static java.math.RoundingMode.CEILING;
 import static java.util.concurrent.TimeUnit.DAYS;
@@ -58,6 +58,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Multiset;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.batch.DeleteContactsAndHostsAction.DeletionResult.Type;
 import google.registry.dns.DnsQueue;
@@ -85,7 +86,6 @@ import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import google.registry.util.Retrier;
 import google.registry.util.SystemClock;

java/google/registry/batch/DeleteLoadTestDataAction.java

@@ -24,6 +24,7 @@ import static google.registry.request.Action.Method.POST;
 import com.google.appengine.tools.mapreduce.Mapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryEnvironment;
 import google.registry.mapreduce.MapreduceRunner;
@@ -36,7 +37,6 @@ import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.PipelineUtils;
 import java.util.List;
 import javax.inject.Inject;

java/google/registry/batch/DeleteProberDataAction.java

@@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryEnvironment;
@@ -52,7 +53,6 @@ import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.PipelineUtils;
 import java.util.List;
 import javax.inject.Inject;

java/google/registry/batch/ExpandRecurringBillingEventsAction.java

@@ -37,6 +37,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Range;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.NullInput;
@@ -58,7 +59,6 @@ import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import java.util.Optional;
 import java.util.Set;
 import javax.inject.Inject;

java/google/registry/batch/MapreduceEntityCleanupAction.java

@@ -19,6 +19,7 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 
 import com.google.appengine.api.datastore.DatastoreService;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import google.registry.batch.MapreduceEntityCleanupUtil.EligibleJobResults;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.request.Action;
@@ -26,7 +27,6 @@ import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import java.util.Optional;
 import java.util.Set;
 import javax.inject.Inject;

java/google/registry/batch/RefreshDnsOnHostRenameAction.java

@@ -41,6 +41,7 @@ import com.google.appengine.tools.mapreduce.ReducerInput;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.dns.DnsQueue;
 import google.registry.flows.async.AsyncFlowMetrics;
@@ -53,7 +54,6 @@ import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import google.registry.util.Retrier;
 import google.registry.util.SystemClock;

java/google/registry/batch/VerifyEntityIntegrityAction.java

@@ -17,6 +17,7 @@ package google.registry.batch;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static com.googlecode.objectify.Key.getKind;
 import static google.registry.model.EppResourceUtils.isActive;
 import static google.registry.model.ofy.ObjectifyService.ofy;
@@ -26,7 +27,6 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.earliestOf;
 import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.util.PipelineUtils.createJobPath;
 import static org.joda.time.DateTimeZone.UTC;
 
@@ -38,6 +38,7 @@ import com.google.appengine.tools.mapreduce.inputs.DatastoreKeyInput;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.mapreduce.inputs.EppResourceInputs;
@@ -59,7 +60,6 @@ import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import java.io.Serializable;
 import java.util.ArrayList;

java/google/registry/beam/BUILD

@@ -9,6 +9,7 @@ java_library(
     srcs = glob(["*.java"]),
     resources = glob(["sql/*"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/reporting/billing",
         "//java/google/registry/util",

java/google/registry/beam/BillingEvent.java

@@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import com.google.common.logging.FormattingLogger;
 import google.registry.reporting.billing.BillingModule;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

java/google/registry/bigquery/BUILD

@@ -8,8 +8,8 @@ java_library(
     name = "bigquery",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
-        "//java/google/registry/request",
         "//java/google/registry/util",
         "@com_google_api_client",
         "@com_google_api_client_appengine",

java/google/registry/bigquery/BigqueryConnection.java

@@ -54,6 +54,7 @@ import com.google.api.services.bigquery.model.ViewDefinition;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableTable;
 import com.google.common.io.BaseEncoding;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
@@ -62,7 +63,6 @@ import google.registry.bigquery.BigqueryUtils.DestinationFormat;
 import google.registry.bigquery.BigqueryUtils.SourceFormat;
 import google.registry.bigquery.BigqueryUtils.TableType;
 import google.registry.bigquery.BigqueryUtils.WriteDisposition;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import google.registry.util.Sleeper;
 import google.registry.util.SqlTemplate;

java/google/registry/bigquery/BigqueryFactory.java

@@ -16,7 +16,7 @@ package google.registry.bigquery;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Sets.newConcurrentHashSet;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
 import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential;
@@ -33,7 +33,7 @@ import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableSchema;
 import com.google.common.collect.ImmutableList;
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

java/google/registry/config/BUILD

@@ -9,6 +9,7 @@ java_library(
     srcs = glob(["*.java"]),
     resources = glob(["files/*.yaml"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/util",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",

java/google/registry/config/YamlUtils.java

@@ -15,10 +15,10 @@
 package google.registry.config;
 
 import static com.google.common.base.Ascii.toLowerCase;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.util.ResourceUtils.readResourceUtf8;
 
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.util.Map;
 import java.util.Optional;
 import org.yaml.snakeyaml.Yaml;

java/google/registry/cron/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "cron",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/model",
         "//java/google/registry/request",
         "//java/google/registry/request/auth",

java/google/registry/cron/TldFanoutAction.java

@@ -36,13 +36,13 @@ import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.ParameterMap;
 import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.TaskQueueUtils;
 import java.util.Optional;
 import java.util.Random;

java/google/registry/dns/BUILD

@@ -20,6 +20,7 @@ java_library(
     ),
     deps = [
         ":constants",
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/dns/writer",
         "//java/google/registry/model",

java/google/registry/dns/DnsQueue.java

@@ -34,12 +34,12 @@ import com.google.appengine.api.taskqueue.TransientFailureException;
 import com.google.apphosting.api.DeadlineExceededException;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InternetDomainName;
 import com.google.common.util.concurrent.RateLimiter;
 import google.registry.dns.DnsConstants.TargetType;
 import google.registry.model.registry.Registries;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import google.registry.util.SystemClock;
 import java.util.List;

java/google/registry/dns/DnsWriterProxy.java

@@ -15,12 +15,12 @@
 package google.registry.dns;
 
 import static com.google.common.base.Preconditions.checkState;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.logging.FormattingLogger;
 import google.registry.dns.writer.DnsWriter;
 import google.registry.model.registry.Registry;
-import google.registry.util.FormattingLogger;
 import java.util.Map;
 import javax.inject.Inject;
 

java/google/registry/dns/PublishDnsUpdatesAction.java

@@ -18,6 +18,7 @@ import static google.registry.request.Action.Method.POST;
 import static google.registry.request.RequestParameters.PARAM_TLD;
 import static google.registry.util.CollectionUtils.nullToEmpty;
 
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InternetDomainName;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.dns.DnsMetrics.ActionStatus;
@@ -32,7 +33,6 @@ import google.registry.request.auth.Auth;
 import google.registry.request.lock.LockHandler;
 import google.registry.util.Clock;
 import google.registry.util.DomainNameUtils;
-import google.registry.util.FormattingLogger;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import javax.inject.Inject;

java/google/registry/dns/ReadDnsQueueAction.java

@@ -37,6 +37,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.dns.DnsConstants.TargetType;
 import google.registry.model.registry.Registries;
@@ -46,7 +47,6 @@ import google.registry.request.Parameter;
 import google.registry.request.RequestParameters;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.TaskQueueUtils;
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;

java/google/registry/dns/writer/BUILD

@@ -8,7 +8,7 @@ java_library(
     name = "writer",
     srcs = glob(["*.java"]),
     deps = [
-        "//java/google/registry/util",
+        "//java/com/google/common/logging:formatting_logger",
         "@com_google_dagger",
         "@com_google_guava",
     ],

java/google/registry/dns/writer/VoidDnsWriter.java

@@ -14,7 +14,7 @@
 
 package google.registry.dns.writer;
 
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;

java/google/registry/dns/writer/clouddns/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "clouddns",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/dns/writer",
         "//java/google/registry/model",

java/google/registry/dns/writer/clouddns/CloudDnsWriter.java

@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InternetDomainName;
 import com.google.common.util.concurrent.RateLimiter;
 import google.registry.config.RegistryConfig.Config;
@@ -41,7 +42,6 @@ import google.registry.model.host.HostResource;
 import google.registry.model.registry.Registries;
 import google.registry.util.Clock;
 import google.registry.util.Concurrent;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Retrier;
 import java.io.IOException;
 import java.net.Inet4Address;

java/google/registry/dns/writer/clouddns/MultiplyingCloudDnsWriter.java

@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InternetDomainName;
 import com.google.common.util.concurrent.RateLimiter;
 import google.registry.config.RegistryConfig.Config;
@@ -41,7 +42,6 @@ import google.registry.model.host.HostResource;
 import google.registry.model.registry.Registries;
 import google.registry.util.Clock;
 import google.registry.util.Concurrent;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Retrier;
 import java.io.IOException;
 import java.net.Inet4Address;

java/google/registry/export/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "export",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/bigquery",
         "//java/google/registry/config",
         "//java/google/registry/gcs",

java/google/registry/export/BigqueryPollJobAction.java

@@ -25,6 +25,7 @@ import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.TaskHandle;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
+import com.google.common.logging.FormattingLogger;
 import dagger.Lazy;
 import google.registry.request.Action;
 import google.registry.request.Header;
@@ -32,7 +33,6 @@ import google.registry.request.HttpException.BadRequestException;
 import google.registry.request.HttpException.NotModifiedException;
 import google.registry.request.Payload;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.TaskQueueUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

java/google/registry/export/CheckSnapshotAction.java

@@ -15,10 +15,10 @@
 package google.registry.export;
 
 import static com.google.common.collect.Sets.intersection;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.export.LoadSnapshotAction.enqueueLoadSnapshotTask;
 import static google.registry.request.Action.Method.GET;
 import static google.registry.request.Action.Method.POST;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.appengine.api.taskqueue.QueueFactory;
 import com.google.appengine.api.taskqueue.TaskHandle;
@@ -28,6 +28,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.common.logging.FormattingLogger;
 import google.registry.export.DatastoreBackupInfo.BackupStatus;
 import google.registry.request.Action;
 import google.registry.request.HttpException.BadRequestException;
@@ -37,7 +38,6 @@ import google.registry.request.Parameter;
 import google.registry.request.RequestMethod;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import java.util.Set;
 import javax.inject.Inject;
 import org.joda.time.Duration;

java/google/registry/export/ExportDomainListsAction.java

@@ -31,6 +31,7 @@ import com.google.appengine.tools.mapreduce.ReducerInput;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.gcs.GcsUtils;
@@ -42,7 +43,6 @@ import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.storage.drive.DriveConnection;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import java.io.IOException;
 import java.io.OutputStream;

java/google/registry/export/ExportReservedTermsAction.java

@@ -21,6 +21,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import google.registry.model.registry.Registry;
 import google.registry.request.Action;
@@ -29,7 +30,6 @@ import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.storage.drive.DriveConnection;
-import google.registry.util.FormattingLogger;
 import javax.inject.Inject;
 
 /** Action that exports the publicly viewable reserved terms list for a TLD to Google Drive. */

java/google/registry/export/ExportSnapshotAction.java

@@ -17,12 +17,12 @@ package google.registry.export;
 import static google.registry.export.CheckSnapshotAction.enqueuePollTask;
 import static google.registry.request.Action.Method.POST;
 
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig;
 import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import javax.inject.Inject;
 
 /**

java/google/registry/export/LoadSnapshotAction.java

@@ -17,9 +17,9 @@ package google.registry.export;
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.export.UpdateSnapshotViewAction.createViewUpdateTask;
 import static google.registry.request.Action.Method.POST;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.api.services.bigquery.Bigquery;
 import com.google.api.services.bigquery.model.Job;
@@ -34,6 +34,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import google.registry.bigquery.BigqueryFactory;
 import google.registry.bigquery.BigqueryUtils.SourceFormat;
 import google.registry.bigquery.BigqueryUtils.WriteDisposition;
@@ -45,7 +46,6 @@ import google.registry.request.HttpException.InternalServerErrorException;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import javax.inject.Inject;
 import org.joda.time.DateTime;

java/google/registry/export/PublishDetailReportAction.java

@@ -21,6 +21,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentPresent;
 import com.google.appengine.tools.cloudstorage.GcsFilename;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import google.registry.gcs.GcsUtils;
 import google.registry.model.registrar.Registrar;
@@ -31,7 +32,6 @@ import google.registry.request.JsonActionRunner;
 import google.registry.request.JsonActionRunner.JsonAction;
 import google.registry.request.auth.Auth;
 import google.registry.storage.drive.DriveConnection;
-import google.registry.util.FormattingLogger;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.Map;

java/google/registry/export/SyncGroupMembersAction.java

@@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.groups.GroupsConnection;
 import google.registry.groups.GroupsConnection.Role;
@@ -35,7 +36,6 @@ import google.registry.model.registrar.RegistrarContact;
 import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Retrier;
 import java.io.IOException;
 import java.util.ArrayList;

java/google/registry/export/UpdateSnapshotViewAction.java

@@ -23,13 +23,13 @@ import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.ViewDefinition;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
+import com.google.common.logging.FormattingLogger;
 import google.registry.bigquery.BigqueryFactory;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.request.Action;
 import google.registry.request.HttpException.InternalServerErrorException;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import google.registry.util.SqlTemplate;
 import java.io.IOException;
 import javax.inject.Inject;

java/google/registry/export/sheet/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "sheet",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/model",
         "//java/google/registry/request",

java/google/registry/export/sheet/SheetSynchronizer.java

@@ -25,7 +25,7 @@ import com.google.api.services.sheets.v4.model.ClearValuesResponse;
 import com.google.api.services.sheets.v4.model.ValueRange;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

java/google/registry/export/sheet/SyncRegistrarsSheetAction.java

@@ -27,13 +27,13 @@ import com.google.appengine.api.modules.ModulesService;
 import com.google.appengine.api.modules.ModulesServiceFactory;
 import com.google.appengine.api.taskqueue.TaskHandle;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.request.lock.LockHandler;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import java.io.IOException;
 import java.util.Optional;

java/google/registry/flows/BUILD

@@ -23,6 +23,7 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":soy_java_wrappers",
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/dns",
         "//java/google/registry/model",

java/google/registry/flows/CheckApiAction.java

@@ -29,6 +29,7 @@ import static org.json.simple.JSONValue.toJSONString;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InternetDomainName;
 import com.google.common.net.MediaType;
 import com.google.template.soy.SoyFileSet;
@@ -46,7 +47,6 @@ import google.registry.request.Parameter;
 import google.registry.request.RequestParameters;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import java.util.Map;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;

java/google/registry/flows/EppController.java

@@ -24,6 +24,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.logging.FormattingLogger;
 import google.registry.flows.FlowModule.EppExceptionInProviderException;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppinput.EppInput;
@@ -33,7 +34,6 @@ import google.registry.model.eppoutput.Result;
 import google.registry.model.eppoutput.Result.Code;
 import google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer;
 import google.registry.monitoring.whitebox.EppMetric;
-import google.registry.util.FormattingLogger;
 import java.util.Optional;
 import java.util.logging.Level;
 import javax.inject.Inject;

java/google/registry/flows/EppRequestHandler.java

@@ -20,10 +20,10 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.request.Response;
-import google.registry.util.FormattingLogger;
 import javax.inject.Inject;
 
 /** Handle an EPP request and response. */

java/google/registry/flows/EppTlsAction.java

@@ -14,11 +14,11 @@
 
 package google.registry.flows;
 
+import com.google.common.logging.FormattingLogger;
 import google.registry.request.Action;
 import google.registry.request.Action.Method;
 import google.registry.request.Payload;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import javax.inject.Inject;
 import javax.servlet.http.HttpSession;
 

java/google/registry/flows/EppXmlTransformer.java

@@ -22,6 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
+import com.google.common.logging.FormattingLogger;
 import google.registry.flows.EppException.ParameterValueRangeErrorException;
 import google.registry.flows.EppException.ParameterValueSyntaxErrorException;
 import google.registry.flows.EppException.SyntaxErrorException;
@@ -33,7 +34,6 @@ import google.registry.model.eppinput.EppInput.WrongProtocolVersionException;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.model.host.InetAddressAdapter.IpVersionMismatchException;
 import google.registry.model.translators.CurrencyUnitAdapter.UnknownCurrencyException;
-import google.registry.util.FormattingLogger;
 import google.registry.xml.ValidationMode;
 import google.registry.xml.XmlException;
 import google.registry.xml.XmlTransformer;

java/google/registry/flows/ExtensionManager.java

@@ -22,6 +22,7 @@ import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtensio
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import google.registry.flows.EppException.CommandUseErrorException;
 import google.registry.flows.EppException.SyntaxErrorException;
 import google.registry.flows.EppException.UnimplementedExtensionException;
@@ -33,7 +34,6 @@ import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.domain.superuser.SuperuserExtension;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-import google.registry.util.FormattingLogger;
 import java.util.Set;
 import javax.inject.Inject;
 

java/google/registry/flows/FlowReporter.java

@@ -24,12 +24,12 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.flows.FlowModule.ClientId;
 import google.registry.flows.FlowModule.InputXml;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppinput.EppInput;
-import google.registry.util.FormattingLogger;
 import java.util.Optional;
 import java.util.logging.Level;
 import javax.inject.Inject;

java/google/registry/flows/FlowRunner.java

@@ -18,6 +18,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.xml.XmlTransformer.prettyPrint;
 
 import com.google.common.base.Strings;
+import com.google.common.logging.FormattingLogger;
 import google.registry.flows.FlowModule.ClientId;
 import google.registry.flows.FlowModule.DryRun;
 import google.registry.flows.FlowModule.InputXml;
@@ -27,7 +28,6 @@ import google.registry.flows.session.LoginFlow;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.monitoring.whitebox.EppMetric;
-import google.registry.util.FormattingLogger;
 import java.util.logging.Level;
 import javax.inject.Inject;
 import javax.inject.Provider;

java/google/registry/flows/TlsCredentials.java

@@ -21,6 +21,7 @@ import static google.registry.request.RequestParameters.extractRequiredHeader;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.HostAndPort;
 import com.google.common.net.InetAddresses;
 import dagger.Module;
@@ -29,7 +30,6 @@ import google.registry.flows.EppException.AuthenticationErrorException;
 import google.registry.model.registrar.Registrar;
 import google.registry.request.Header;
 import google.registry.util.CidrAddressBlock;
-import google.registry.util.FormattingLogger;
 import java.net.InetAddress;
 import java.util.Optional;
 import javax.inject.Inject;

java/google/registry/flows/async/AsyncFlowEnqueuer.java

@@ -19,12 +19,12 @@ import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
 import com.google.appengine.api.taskqueue.TransientFailureException;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.EppResource;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.HostResource;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Retrier;
 import javax.inject.Inject;
 import javax.inject.Named;

java/google/registry/flows/async/AsyncFlowMetrics.java

@@ -15,13 +15,14 @@
 package google.registry.flows.async;
 
 import static com.google.appengine.api.taskqueue.QueueConstants.maxLeaseCount;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static com.google.monitoring.metrics.EventMetric.DEFAULT_FITTER;
 import static google.registry.flows.async.AsyncFlowMetrics.OperationType.CONTACT_AND_HOST_DELETE;
 import static google.registry.flows.async.AsyncFlowMetrics.OperationType.DNS_REFRESH;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import com.google.monitoring.metrics.DistributionFitter;
 import com.google.monitoring.metrics.EventMetric;
 import com.google.monitoring.metrics.FibonacciFitter;
@@ -29,7 +30,6 @@ import com.google.monitoring.metrics.IncrementableMetric;
 import com.google.monitoring.metrics.LabelDescriptor;
 import com.google.monitoring.metrics.MetricRegistryImpl;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import javax.inject.Inject;
 import org.joda.time.DateTime;

java/google/registry/flows/session/LoginFlow.java

@@ -18,6 +18,7 @@ import static com.google.common.collect.Sets.difference;
 import static google.registry.util.CollectionUtils.nullToEmpty;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.AuthenticationErrorClosingConnectionException;
 import google.registry.flows.EppException.AuthenticationErrorException;
@@ -40,7 +41,6 @@ import google.registry.model.eppinput.EppInput.Options;
 import google.registry.model.eppinput.EppInput.Services;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.registrar.Registrar;
-import google.registry.util.FormattingLogger;
 import java.util.Optional;
 import java.util.Set;
 import javax.inject.Inject;

java/google/registry/gcs/BUILD

@@ -8,8 +8,8 @@ java_library(
     name = "gcs",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
-        "//java/google/registry/util",
         "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/gcs/GcsUtils.java

@@ -26,9 +26,9 @@ import com.google.appengine.tools.cloudstorage.ListResult;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import google.registry.config.RegistryConfig.Config;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

java/google/registry/groups/BUILD

@@ -8,8 +8,8 @@ java_library(
     name = "groups",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
-        "//java/google/registry/request",
         "//java/google/registry/util",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_admin_directory",

java/google/registry/groups/DirectoryGroupsConnection.java

@@ -29,8 +29,8 @@ import com.google.api.services.groupssettings.model.Groups;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig.Config;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.util.Set;
 import javax.inject.Inject;

java/google/registry/keyring/api/BUILD

@@ -9,6 +9,7 @@ java_library(
     srcs = glob(["*.java"]),
     resources = glob(["*.asc"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/util",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/keyring/api/ComparatorKeyring.java

@@ -16,8 +16,8 @@ package google.registry.keyring.api;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
+import com.google.common.logging.FormattingLogger;
 import google.registry.util.ComparingInvocationHandler;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;

java/google/registry/loadtest/BUILD

@@ -9,6 +9,7 @@ java_library(
     srcs = glob(["*.java"]),
     resources = glob(["templates/*.xml"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/request",
         "//java/google/registry/request/auth",

java/google/registry/loadtest/LoadTestAction.java

@@ -19,8 +19,8 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Lists.partition;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.util.ResourceUtils.readResourceUtf8;
 import static java.util.Arrays.asList;
 import static org.joda.time.DateTimeZone.UTC;
@@ -28,12 +28,12 @@ import static org.joda.time.DateTimeZone.UTC;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryEnvironment;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.security.XsrfTokenManager;
-import google.registry.util.FormattingLogger;
 import google.registry.util.TaskQueueUtils;
 import java.util.Arrays;
 import java.util.Iterator;

java/google/registry/mapreduce/BUILD

@@ -8,8 +8,8 @@ java_library(
     name = "mapreduce",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/mapreduce/inputs",
-        "//java/google/registry/model",
         "//java/google/registry/request",
         "//java/google/registry/util",
         "//third_party/objectify:objectify-v4_1",

java/google/registry/mapreduce/MapreduceRunner.java

@@ -33,9 +33,9 @@ import com.google.appengine.tools.mapreduce.outputs.NoOutput;
 import com.google.appengine.tools.pipeline.Job0;
 import com.google.appengine.tools.pipeline.JobSetting;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.logging.FormattingLogger;
 import google.registry.mapreduce.inputs.ConcatenatingInput;
 import google.registry.request.Parameter;
-import google.registry.util.FormattingLogger;
 import google.registry.util.PipelineUtils;
 import java.io.Serializable;
 import java.util.Optional;
@@ -112,13 +112,13 @@ public class MapreduceRunner {
     return this;
   }
 
-  /** Set the default number of mappers, if not overriden by the http param. */
+  /** Set the default number of mappers, if not overridden by the http param. */
   public MapreduceRunner setDefaultMapShards(int defaultMapShards) {
     this.defaultMapShards = defaultMapShards;
     return this;
   }
 
-  /** Set the default number of reducers, if not overriden by the http param. */
+  /** Set the default number of reducers, if not overridden by the http param. */
   public MapreduceRunner setDefaultReduceShards(int defaultReduceShards) {
     this.defaultReduceShards = defaultReduceShards;
     return this;

java/google/registry/mapreduce/inputs/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "inputs",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/model",
         "//java/google/registry/util",
         "//third_party/objectify:objectify-v4_1",

java/google/registry/mapreduce/inputs/ChildEntityReader.java

@@ -23,13 +23,13 @@ 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;
 import google.registry.model.ImmutableObject;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.EppResourceIndexBucket;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.util.NoSuchElementException;
 import javax.annotation.Nullable;
@@ -248,7 +248,7 @@ class ChildEntityReader<R extends EppResource, I extends ImmutableObject> extend
       return nextQueryResult();
     }
 
-    /** Retruns a new ChildReader of the same ancestor for the given type. */
+    /** Returns a new ChildReader of the same ancestor for the given type. */
     public <J> ChildReader<J> withType(Class<J> type) {
       return create(type, ancestor);
     }

java/google/registry/mapreduce/inputs/CommitLogManifestReader.java

@@ -19,11 +19,11 @@ 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;
 import google.registry.model.ofy.CommitLogManifest;
-import google.registry.util.FormattingLogger;
 import java.util.NoSuchElementException;
 import javax.annotation.Nullable;
 import org.joda.time.DateTime;

java/google/registry/mapreduce/inputs/EppResourceBaseReader.java

@@ -21,12 +21,12 @@ 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;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.index.EppResourceIndexBucket;
-import google.registry.util.FormattingLogger;
 import javax.annotation.Nullable;
 
 /** Base class for {@link InputReader} classes that map over {@link EppResourceIndex}. */

java/google/registry/mapreduce/inputs/RetryingInputReader.java

@@ -21,8 +21,8 @@ import com.google.appengine.api.datastore.Cursor;
 import com.google.appengine.api.datastore.DatastoreTimeoutException;
 import com.google.appengine.api.datastore.QueryResultIterator;
 import com.google.appengine.tools.mapreduce.InputReader;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.cmd.Query;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Retrier;
 import google.registry.util.SystemSleeper;
 import java.util.NoSuchElementException;

java/google/registry/model/BUILD

@@ -13,6 +13,7 @@ java_library(
     ]),
     visibility = ["//visibility:public"],
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/util",
         "//java/google/registry/xml",

java/google/registry/model/EppResourceUtils.java

@@ -22,6 +22,7 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import static google.registry.util.DateTimeUtils.latestOf;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Result;
 import com.googlecode.objectify.cmd.Query;
@@ -41,7 +42,6 @@ import google.registry.model.ofy.CommitLogMutation;
 import google.registry.model.registry.Registry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
-import google.registry.util.FormattingLogger;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;

java/google/registry/model/ofy/Ofy.java

@@ -28,6 +28,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Objectify;
 import com.googlecode.objectify.ObjectifyFactory;
@@ -39,7 +40,6 @@ import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.VirtualEntity;
 import google.registry.model.ofy.ReadOnlyWork.KillTransactionException;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.NonFinalForTesting;
 import google.registry.util.Sleeper;
 import google.registry.util.SystemClock;

java/google/registry/model/server/Lock.java

@@ -21,13 +21,13 @@ import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.VoidWork;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.util.FormattingLogger;
 import google.registry.util.RequestStatusChecker;
 import google.registry.util.RequestStatusCheckerImpl;
 import java.util.Optional;

java/google/registry/module/backend/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "backend",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/backup",
         "//java/google/registry/batch",
         "//java/google/registry/bigquery",

java/google/registry/module/backend/BackendServlet.java

@@ -15,9 +15,9 @@
 package google.registry.module.backend;
 
 import com.google.appengine.api.LifecycleManager;
+import com.google.common.logging.FormattingLogger;
 import com.google.monitoring.metrics.MetricReporter;
 import dagger.Lazy;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.security.Security;
 import java.util.concurrent.TimeUnit;

java/google/registry/module/frontend/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "frontend",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/braintree",
         "//java/google/registry/config",
         "//java/google/registry/dns",
@@ -26,6 +27,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_monitoring_client_metrics",
         "@javax_servlet_api",

java/google/registry/module/frontend/FrontendServlet.java

@@ -15,9 +15,10 @@
 package google.registry.module.frontend;
 
 import com.google.appengine.api.LifecycleManager;
+import com.google.common.flogger.FluentLogger;
+import com.google.common.logging.FormattingLogger;
 import com.google.monitoring.metrics.MetricReporter;
 import dagger.Lazy;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.security.Security;
 import java.util.concurrent.TimeUnit;
@@ -34,6 +35,8 @@ public final class FrontendServlet extends HttpServlet {
   private static final FrontendRequestHandler requestHandler = component.requestHandler();
   private static final Lazy<MetricReporter> metricReporter = component.metricReporter();
   private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
+  // TODO(b/): Remove this static field.
+  private static final FluentLogger flogger = FluentLogger.forEnclosingClass();
 
   @Override
   public void init() {
@@ -62,7 +65,7 @@ public final class FrontendServlet extends HttpServlet {
 
   @Override
   public void service(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
-    logger.info("Received frontend request");
+    flogger.atInfo().log("Received frontend request");
     requestHandler.handleRequest(req, rsp);
   }
 }

java/google/registry/module/pubapi/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "pubapi",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/dns",
         "//java/google/registry/flows",

java/google/registry/module/pubapi/PubApiServlet.java

@@ -15,9 +15,9 @@
 package google.registry.module.pubapi;
 
 import com.google.appengine.api.LifecycleManager;
+import com.google.common.logging.FormattingLogger;
 import com.google.monitoring.metrics.MetricReporter;
 import dagger.Lazy;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.security.Security;
 import java.util.concurrent.TimeUnit;

java/google/registry/module/tools/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "tools",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/backup",
         "//java/google/registry/config",
         "//java/google/registry/dns",

java/google/registry/module/tools/ToolsServlet.java

@@ -14,7 +14,7 @@
 
 package google.registry.module.tools;
 
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.io.IOException;
 import java.security.Security;
 import javax.servlet.http.HttpServlet;

java/google/registry/monitoring/whitebox/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "whitebox",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/bigquery",
         "//java/google/registry/config",
         "//java/google/registry/model",

java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java

@@ -21,7 +21,7 @@ import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TransientFailureException;
 import com.google.common.base.Supplier;
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.util.Map.Entry;
 import javax.inject.Inject;
 import javax.inject.Named;

java/google/registry/monitoring/whitebox/MetricsExportAction.java

@@ -17,8 +17,8 @@ package google.registry.monitoring.whitebox;
 import static com.google.common.base.Predicates.in;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.Multimaps.filterKeys;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.request.Action.Method.POST;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static java.util.stream.Collectors.joining;
 
 import com.google.api.services.bigquery.Bigquery;
@@ -28,13 +28,13 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import google.registry.bigquery.BigqueryFactory;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.ParameterMap;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.util.Map;
 import javax.inject.Inject;

java/google/registry/rdap/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "rdap",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/flows",
         "//java/google/registry/model",

java/google/registry/rdap/RdapActionBase.java

@@ -27,6 +27,7 @@ import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import com.google.re2j.Pattern;
 import com.googlecode.objectify.Key;
@@ -48,7 +49,6 @@ import google.registry.request.Response;
 import google.registry.request.auth.AuthResult;
 import google.registry.request.auth.UserAuthInfo;
 import google.registry.ui.server.registrar.SessionUtils;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;

java/google/registry/rdap/RdapDomainSearchAction.java

@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InetAddresses;
 import com.google.common.primitives.Booleans;
 import com.googlecode.objectify.Key;
@@ -45,7 +46,6 @@ import google.registry.request.HttpException.UnprocessableEntityException;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Idn;
 import java.net.InetAddress;
 import java.util.ArrayList;

java/google/registry/rdap/RdapJsonFormatter.java

@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Streams;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.InetAddresses;
 import com.googlecode.objectify.Key;
 import google.registry.config.RdapNoticeDescriptor;
@@ -49,7 +50,6 @@ import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.request.HttpException.InternalServerErrorException;
 import google.registry.request.HttpException.NotFoundException;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Idn;
 import java.net.Inet4Address;
 import java.net.Inet6Address;

java/google/registry/rde/BUILD

@@ -8,6 +8,7 @@ java_library(
     name = "rde",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/gcs",
         "//java/google/registry/keyring/api",

java/google/registry/rde/BrdaCopyAction.java

@@ -20,6 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.appengine.tools.cloudstorage.GcsFilename;
 import com.google.common.io.ByteStreams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.gcs.GcsUtils;
 import google.registry.keyring.api.KeyModule.Key;
@@ -28,7 +29,6 @@ import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.RequestParameters;
 import google.registry.request.auth.Auth;
-import google.registry.util.FormattingLogger;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;

java/google/registry/rde/DomainResourceToXjcConverter.java

@@ -15,12 +15,13 @@
 package google.registry.rde;
 
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass;
 import static google.registry.model.ofy.ObjectifyService.ofy;
-import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.common.base.Ascii;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DesignatedContact;
@@ -31,7 +32,6 @@ import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.rde.RdeMode;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
-import google.registry.util.FormattingLogger;
 import google.registry.util.Idn;
 import google.registry.xjc.domain.XjcDomainContactAttrType;
 import google.registry.xjc.domain.XjcDomainContactType;
@@ -126,7 +126,7 @@ final class DomainResourceToXjcConverter {
     // o  An OPTIONAL <trDate> element that contains the date and time of
     //    the most recent domain object successful transfer.  This element
     //    MUST NOT be present if the domain name object has never been
-    //    transfered.
+    //    transferred.
     bean.setTrDate(model.getLastTransferTime());
 
     // o  One or more <status> elements that contain the current status

java/google/registry/rde/EscrowTaskRunner.java

@@ -16,6 +16,7 @@ package google.registry.rde;
 
 import static google.registry.model.ofy.ObjectifyService.ofy;
 
+import com.google.common.logging.FormattingLogger;
 import google.registry.model.common.Cursor;
 import google.registry.model.common.Cursor.CursorType;
 import google.registry.model.registry.Registry;
@@ -23,7 +24,6 @@ import google.registry.request.HttpException.NoContentException;
 import google.registry.request.HttpException.ServiceUnavailableException;
 import google.registry.request.lock.LockHandler;
 import google.registry.util.Clock;
-import google.registry.util.FormattingLogger;
 import java.util.concurrent.Callable;
 import javax.inject.Inject;
 import org.joda.time.DateTime;

java/google/registry/rde/Ghostryde.java

@@ -24,8 +24,8 @@ import static org.bouncycastle.openpgp.PGPLiteralData.BINARY;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.io.ByteStreams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.config.RegistryConfig.Config;
-import google.registry.util.FormattingLogger;
 import google.registry.util.ImprovedInputStream;
 import google.registry.util.ImprovedOutputStream;
 import java.io.ByteArrayInputStream;

java/google/registry/rde/JSchSshSession.java

@@ -15,13 +15,13 @@
 package google.registry.rde;
 
 import com.google.common.base.Splitter;
+import com.google.common.logging.FormattingLogger;
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 import com.jcraft.jsch.SftpException;
 import google.registry.config.RegistryConfig.Config;
-import google.registry.util.FormattingLogger;
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;

java/google/registry/rde/RdeMarshaller.java

@@ -17,6 +17,7 @@ package google.registry.rde;
 import static com.google.common.base.Verify.verify;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.google.common.logging.FormattingLogger;
 import com.googlecode.objectify.Key;
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactResource;
@@ -25,7 +26,6 @@ import google.registry.model.host.HostResource;
 import google.registry.model.rde.RdeMode;
 import google.registry.model.registrar.Registrar;
 import google.registry.tldconfig.idn.IdnTable;
-import google.registry.util.FormattingLogger;
 import google.registry.xjc.XjcXmlTransformer;
 import google.registry.xjc.rde.XjcRdeContentsType;
 import google.registry.xjc.rde.XjcRdeDeposit;