Add Flogger to GCP proxy

This adds a dummy flogger logging statement in the GCP proxy to ensure that it
works.

TESTED=Deployed to alpha and verified that flogger works. Also passed FOSS
tests.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=196899036
This commit is contained in:
jianglai 2018-05-16 15:26:57 -07:00
parent 807ab2b27b
commit e5f4b5a17b
3 changed files with 20 additions and 1 deletions

View file

@ -31,6 +31,7 @@ java_library(
"@com_google_auto_value", "@com_google_auto_value",
"@com_google_code_findbugs_jsr305", "@com_google_code_findbugs_jsr305",
"@com_google_dagger", "@com_google_dagger",
"@com_google_flogger",
"@com_google_guava", "@com_google_guava",
"@com_google_monitoring_client_metrics", "@com_google_monitoring_client_metrics",
"@com_google_monitoring_client_stackdriver", "@com_google_monitoring_client_stackdriver",

View file

@ -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.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.flogger.FluentLogger;
import com.google.monitoring.metrics.MetricReporter; import com.google.monitoring.metrics.MetricReporter;
import google.registry.proxy.Protocol.BackendProtocol; import google.registry.proxy.Protocol.BackendProtocol;
import google.registry.proxy.Protocol.FrontendProtocol; import google.registry.proxy.Protocol.FrontendProtocol;
@ -51,6 +52,8 @@ import javax.inject.Provider;
public class ProxyServer implements Runnable { public class ProxyServer implements Runnable {
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); 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. */ /** Maximum length of the queue of incoming connections. */
private static final int MAX_SOCKET_BACKLOG = 128; 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. // Wait for binding to be established for each listening port.
ChannelFuture serverChannelFuture = serverBootstrap.bind(port).sync(); ChannelFuture serverChannelFuture = serverBootstrap.bind(port).sync();
if (serverChannelFuture.isSuccess()) { if (serverChannelFuture.isSuccess()) {
logger.infofmt( flogger.atInfo().log(
"Start listening on port %s for %s protocol.", port, protocol.name()); "Start listening on port %s for %s protocol.", port, protocol.name());
Channel serverChannel = serverChannelFuture.channel(); Channel serverChannel = serverChannelFuture.channel();
serverChannel.attr(PROTOCOL_KEY).set(protocol); serverChannel.attr(PROTOCOL_KEY).set(protocol);

View file

@ -67,6 +67,7 @@ def domain_registry_repositories(
omit_com_google_dagger_producers=False, omit_com_google_dagger_producers=False,
omit_com_google_errorprone_error_prone_annotations=False, omit_com_google_errorprone_error_prone_annotations=False,
omit_com_google_errorprone_javac_shaded=False, omit_com_google_errorprone_javac_shaded=False,
omit_com_google_flogger=False,
omit_com_google_gdata_core=False, omit_com_google_gdata_core=False,
omit_com_google_googlejavaformat_google_java_format=False, omit_com_google_googlejavaformat_google_java_format=False,
omit_com_google_guava=False, omit_com_google_guava=False,
@ -249,6 +250,8 @@ def domain_registry_repositories(
com_google_errorprone_error_prone_annotations() com_google_errorprone_error_prone_annotations()
if not omit_com_google_errorprone_javac_shaded: if not omit_com_google_errorprone_javac_shaded:
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: if not omit_com_google_gdata_core:
com_google_gdata_core() com_google_gdata_core()
if not omit_com_google_googlejavaformat_google_java_format: 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(): def com_google_gdata_core():
java_import_external( java_import_external(
name = "com_google_gdata_core", name = "com_google_gdata_core",