diff --git a/java/google/registry/proxy/BUILD b/java/google/registry/proxy/BUILD index c3cecd8b8..15d248d09 100644 --- a/java/google/registry/proxy/BUILD +++ b/java/google/registry/proxy/BUILD @@ -31,6 +31,7 @@ java_library( "@com_google_auto_value", "@com_google_code_findbugs_jsr305", "@com_google_dagger", + "@com_google_flogger", "@com_google_guava", "@com_google_monitoring_client_metrics", "@com_google_monitoring_client_stackdriver", diff --git a/java/google/registry/proxy/ProxyServer.java b/java/google/registry/proxy/ProxyServer.java index 59edcd1c6..e896ceffe 100644 --- a/java/google/registry/proxy/ProxyServer.java +++ b/java/google/registry/proxy/ProxyServer.java @@ -19,6 +19,7 @@ import static google.registry.proxy.handler.RelayHandler.RELAY_CHANNEL_KEY; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.flogger.FluentLogger; import com.google.monitoring.metrics.MetricReporter; import google.registry.proxy.Protocol.BackendProtocol; import google.registry.proxy.Protocol.FrontendProtocol; @@ -51,6 +52,8 @@ import javax.inject.Provider; public class ProxyServer implements Runnable { private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); + // TODO (b/78466557): remove dummy flogger. + private static final FluentLogger flogger = FluentLogger.forEnclosingClass(); /** Maximum length of the queue of incoming connections. */ private static final int MAX_SOCKET_BACKLOG = 128; @@ -170,7 +173,7 @@ public class ProxyServer implements Runnable { // Wait for binding to be established for each listening port. ChannelFuture serverChannelFuture = serverBootstrap.bind(port).sync(); if (serverChannelFuture.isSuccess()) { - logger.infofmt( + flogger.atInfo().log( "Start listening on port %s for %s protocol.", port, protocol.name()); Channel serverChannel = serverChannelFuture.channel(); serverChannel.attr(PROTOCOL_KEY).set(protocol); diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 251f195ff..6ab8a98c6 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -67,6 +67,7 @@ def domain_registry_repositories( omit_com_google_dagger_producers=False, omit_com_google_errorprone_error_prone_annotations=False, omit_com_google_errorprone_javac_shaded=False, + omit_com_google_flogger=False, omit_com_google_gdata_core=False, omit_com_google_googlejavaformat_google_java_format=False, omit_com_google_guava=False, @@ -249,6 +250,8 @@ def domain_registry_repositories( com_google_errorprone_error_prone_annotations() if not omit_com_google_errorprone_javac_shaded: com_google_errorprone_javac_shaded() + if not omit_com_google_flogger: + com_google_flogger() if not omit_com_google_gdata_core: com_google_gdata_core() if not omit_com_google_googlejavaformat_google_java_format: @@ -1253,6 +1256,18 @@ def com_google_errorprone_javac_shaded(): ], ) +def com_google_flogger(): + java_import_external( + name = "com_google_flogger", + licenses = ["notice"], # Apache 2.0 + jar_sha256 = "82f6d7fcafe92adabbb3e0ccc82c2b3a40c5c72343fe2a3226b34f8fa0f61bcb", + jar_urls = [ + "http://repo1.maven.org/maven2/com/google/flogger/flogger/0.1/flogger-0.1.jar", + "http://maven.ibiblio.org/maven2/com/google/flogger/flogger/0.1/flogger-0.1.jar", + ], + deps = ["@com_google_code_findbugs_jsr305"], +) + def com_google_gdata_core(): java_import_external( name = "com_google_gdata_core",