From 188ecd9ab17b17437905daa40edf60b50cf09067 Mon Sep 17 00:00:00 2001 From: Zhouyihai Ding Date: Thu, 16 Sep 2021 19:56:28 -0700 Subject: [PATCH] Update ChannelLogger to Java logger level mapping --- api/src/main/java/io/grpc/ChannelLogger.java | 4 ++-- .../src/main/java/io/grpc/internal/ChannelLoggerImpl.java | 3 ++- .../test/java/io/grpc/internal/ChannelLoggerImplTest.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/api/src/main/java/io/grpc/ChannelLogger.java b/api/src/main/java/io/grpc/ChannelLogger.java index a0f6114fbc3..ce654ec9d5b 100644 --- a/api/src/main/java/io/grpc/ChannelLogger.java +++ b/api/src/main/java/io/grpc/ChannelLogger.java @@ -36,8 +36,8 @@ public abstract class ChannelLogger { * | ChannelLogger Level | Channelz Severity | Java Logger Level | * +---------------------+-------------------+-------------------+ * | DEBUG | N/A | FINEST | - * | INFO | CT_INFO | FINEST | - * | WARNING | CT_WARNING | FINER | + * | INFO | CT_INFO | FINER | + * | WARNING | CT_WARNING | FINE | * | ERROR | CT_ERROR | FINE | * +---------------------+-------------------+-------------------+ * diff --git a/core/src/main/java/io/grpc/internal/ChannelLoggerImpl.java b/core/src/main/java/io/grpc/internal/ChannelLoggerImpl.java index e000d872e8a..e8504498cdb 100644 --- a/core/src/main/java/io/grpc/internal/ChannelLoggerImpl.java +++ b/core/src/main/java/io/grpc/internal/ChannelLoggerImpl.java @@ -97,8 +97,9 @@ private static Severity toTracerSeverity(ChannelLogLevel level) { private static Level toJavaLogLevel(ChannelLogLevel level) { switch (level) { case ERROR: - return Level.FINE; case WARNING: + return Level.FINE; + case INFO: return Level.FINER; default: return Level.FINEST; diff --git a/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java b/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java index 486d96fd7b9..afe8e9828c9 100644 --- a/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java +++ b/core/src/test/java/io/grpc/internal/ChannelLoggerImplTest.java @@ -100,7 +100,7 @@ public void logging() { .setTimestampNanos(200) .build(); assertThat(stats.channelTrace.events).containsExactly(event); - assertThat(logs).contains("FINER: " + logPrefix + "Warning message"); + assertThat(logs).contains("FINE: " + logPrefix + "Warning message"); clock.forwardNanos(100); logger.log(ChannelLogLevel.INFO, "Info message"); @@ -112,7 +112,7 @@ public void logging() { .setTimestampNanos(300) .build(); assertThat(stats.channelTrace.events).containsExactly(event); - assertThat(logs).contains("FINEST: " + logPrefix + "Info message"); + assertThat(logs).contains("FINER: " + logPrefix + "Info message"); clock.forwardNanos(100); logger.log(ChannelLogLevel.DEBUG, "Debug message"); @@ -154,7 +154,7 @@ public void formatLogging() { .setTimestampNanos(200) .build(); assertThat(stats.channelTrace.events).containsExactly(event); - assertThat(logs).contains("FINER: " + logPrefix + "Warning message foo, bar"); + assertThat(logs).contains("FINE: " + logPrefix + "Warning message foo, bar"); clock.forwardNanos(100); logger.log(ChannelLogLevel.INFO, "Info message {0}", "bar"); @@ -166,7 +166,7 @@ public void formatLogging() { .setTimestampNanos(300) .build(); assertThat(stats.channelTrace.events).containsExactly(event); - assertThat(logs).contains("FINEST: " + logPrefix + "Info message bar"); + assertThat(logs).contains("FINER: " + logPrefix + "Info message bar"); clock.forwardNanos(100); logger.log(ChannelLogLevel.DEBUG, "Debug message {0}", "foo");