[Jib CLI] Disable rich progress when http trace is enabled (#3153)

* Disable rich progress when http trace is enabled
* Fix Javadoc

Author: chanseokoh

jib-cli/src/main/java/com/google/cloud/tools/jib/cli/Build.java

@@ -18,7 +18,7 @@
 
 import com.google.cloud.tools.jib.api.Containerizer;
 import com.google.cloud.tools.jib.api.JibContainerBuilder;
-import com.google.cloud.tools.jib.api.LogEvent.Level;
+import com.google.cloud.tools.jib.api.LogEvent;
 import com.google.cloud.tools.jib.cli.buildfile.BuildFiles;
 import com.google.cloud.tools.jib.cli.logging.CliLogger;
 import com.google.cloud.tools.jib.plugins.common.globalconfig.GlobalConfig;
@@ -102,6 +102,7 @@ public Integer call() {
       ConsoleLogger logger =
           CliLogger.newLogger(
               commonCliOptions.getVerbosity(),
+              commonCliOptions.getHttpTrace(),
               commonCliOptions.getConsoleOutput(),
               spec.commandLine().getOut(),
               spec.commandLine().getErr(),
@@ -110,13 +111,13 @@ public Integer call() {
 
       if (!Files.isReadable(buildFile)) {
         logger.log(
-            Level.ERROR,
+            LogEvent.Level.ERROR,
             "The Build File YAML either does not exist or cannot be opened for reading: "
                 + buildFile);
         return 1;
       }
       if (!Files.isRegularFile(buildFile)) {
-        logger.log(Level.ERROR, "Build File YAML path is a not a file: " + buildFile);
+        logger.log(LogEvent.Level.ERROR, "Build File YAML path is a not a file: " + buildFile);
         return 1;
       }
 

jib-cli/src/main/java/com/google/cloud/tools/jib/cli/Jar.java

@@ -169,6 +169,7 @@ public Integer call() {
       ConsoleLogger logger =
           CliLogger.newLogger(
               commonCliOptions.getVerbosity(),
+              commonCliOptions.getHttpTrace(),
               commonCliOptions.getConsoleOutput(),
               spec.commandLine().getOut(),
               spec.commandLine().getErr(),

jib-cli/src/main/java/com/google/cloud/tools/jib/cli/logging/CliLogger.java

@@ -29,6 +29,7 @@ public class CliLogger {
    * Create a new logger for the CLI.
    *
    * @param verbosity the configure verbosity
+   * @param httpTraceLevel the log level for http trace
    * @param consoleOutput the configured consoleOutput format
    * @param stdout the writer to store stdout
    * @param stderr the writer to store stderr
@@ -38,12 +39,13 @@ public class CliLogger {
    */
   public static ConsoleLogger newLogger(
       Verbosity verbosity,
+      HttpTraceLevel httpTraceLevel,
       ConsoleOutput consoleOutput,
       PrintWriter stdout,
       PrintWriter stderr,
       SingleThreadedExecutor executor) {
     boolean enableRichProgress =
-        isRichConsole(consoleOutput) && verbosity.atLeast(Verbosity.lifecycle);
+        isRichConsole(consoleOutput, httpTraceLevel) && verbosity.atLeast(Verbosity.lifecycle);
     ConsoleLoggerBuilder builder =
         enableRichProgress
             ? ConsoleLoggerBuilder.rich(executor, false)
@@ -73,7 +75,11 @@ public static ConsoleLogger newLogger(
   }
 
   @VisibleForTesting
-  static boolean isRichConsole(ConsoleOutput consoleOutput) {
+  static boolean isRichConsole(ConsoleOutput consoleOutput, HttpTraceLevel httpTraceLevel) {
+    if (httpTraceLevel != HttpTraceLevel.off) {
+      return false;
+    }
+
     switch (consoleOutput) {
       case plain:
         return false;

jib-cli/src/test/java/com/google/cloud/tools/jib/cli/logging/CliLoggerTest.java

@@ -47,7 +47,8 @@ public class CliLoggerTest {
   private void createLoggerAndSendMessages(Verbosity verbosity, ConsoleOutput consoleOutput) {
     SingleThreadedExecutor executor = new SingleThreadedExecutor();
     ConsoleLogger logger =
-        CliLogger.newLogger(verbosity, consoleOutput, mockOut, mockErr, executor);
+        CliLogger.newLogger(
+            verbosity, HttpTraceLevel.off, consoleOutput, mockOut, mockErr, executor);
 
     logger.log(Level.DEBUG, "debug");
     logger.log(Level.INFO, "info");
@@ -190,23 +191,28 @@ public void testLog_debug_richConsole() {
 
   @Test
   public void testIsRichConsole_true() {
-    assertThat(CliLogger.isRichConsole(ConsoleOutput.rich)).isTrue();
+    assertThat(CliLogger.isRichConsole(ConsoleOutput.rich, HttpTraceLevel.off)).isTrue();
+  }
+
+  @Test
+  public void testIsRichConsole_falseIfHttpTrace() {
+    assertThat(CliLogger.isRichConsole(ConsoleOutput.rich, HttpTraceLevel.config)).isFalse();
   }
 
   @Test
   public void testIsRichConsole_false() {
-    assertThat(CliLogger.isRichConsole(ConsoleOutput.plain)).isFalse();
+    assertThat(CliLogger.isRichConsole(ConsoleOutput.plain, HttpTraceLevel.off)).isFalse();
   }
 
   @Test
   public void testIsRightConsole_autoWindowsTrue() {
     System.setProperty("os.name", "windows");
-    assertThat(CliLogger.isRichConsole(ConsoleOutput.auto)).isTrue();
+    assertThat(CliLogger.isRichConsole(ConsoleOutput.auto, HttpTraceLevel.off)).isTrue();
   }
 
   @Test
   public void testIsRightConsole_autoDumbTermFalse() {
     environmentVariables.set("TERM", "dumb");
-    assertThat(CliLogger.isRichConsole(ConsoleOutput.auto)).isFalse();
+    assertThat(CliLogger.isRichConsole(ConsoleOutput.auto, HttpTraceLevel.off)).isFalse();
   }
 }