Update ChannelLogger to Java logger level mapping

grpc · Sep 17, 2021 · 188ecd9 · 188ecd9
1 parent 38a554c
commit 188ecd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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              |
    * +---------------------+-------------------+-------------------+
    * </pre>

diff --git 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
@@ -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");