Call ShouldColor(Stderr|Stdout) in some places.

Bug: b/533162913

Author: Databean

base/cvd/cuttlefish/host/commands/cvd/BUILD.bazel

@@ -30,6 +30,7 @@ cf_cc_binary(
     srcs = ["main.cc"],
     deps = [
         ":libcvd",
+        "//cuttlefish/ansi_codes:should_color",
         "//cuttlefish/ansi_codes:terminal_colors",
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",

base/cvd/cuttlefish/host/commands/cvd/cli/commands/monitor/BUILD.bazel

@@ -33,6 +33,7 @@ cf_cc_library(
         ":log_tee",
         ":logcat",
         ":truncate",
+        "//cuttlefish/ansi_codes:should_color",
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:tee_logging",
         "//cuttlefish/host/libs/log_names",

base/cvd/cuttlefish/host/commands/cvd/cli/commands/monitor/display.cc

@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <algorithm>
 #include <cstddef>
@@ -35,7 +34,7 @@
 #include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
 
-#include "cuttlefish/common/libs/utils/environment.h"
+#include "cuttlefish/ansi_codes/should_color.h"
 #include "cuttlefish/common/libs/utils/tee_logging.h"
 #include "cuttlefish/host/commands/cvd/cli/commands/monitor/kernel.h"
 #include "cuttlefish/host/commands/cvd/cli/commands/monitor/launcher.h"
@@ -86,17 +85,10 @@ Result<std::vector<std::string>> GetLastNLines(ReaderSeeker& rs, size_t n) {
   return all_lines;
 }
 
-bool ShouldColorizeOutput(int fd) {
-  return !StringFromEnv("NO_COLOR").has_value() &&
-         (StringFromEnv("FORCE_COLOR").has_value() || isatty(fd));
-}
-
 }  // namespace
 
 LogMonitorDisplay::LogMonitorDisplay(size_t width)
-    : width_(width),
-      total_lines_drawn_(0),
-      colorize_(ShouldColorizeOutput(1)) {}
+    : width_(width), total_lines_drawn_(0), colorize_(ShouldColorStdout()) {}
 
 void LogMonitorDisplay::DrawFile(ReaderSeeker& rs, const std::string& title,
                                  size_t max_lines) {

base/cvd/cuttlefish/host/commands/cvd/main.cc

@@ -32,6 +32,7 @@
 #include "android-base/file.h"
 #include "fmt/format.h"
 
+#include "cuttlefish/ansi_codes/should_color.h"
 #include "cuttlefish/ansi_codes/terminal_colors.h"
 #include "cuttlefish/common/libs/utils/environment.h"
 #include "cuttlefish/common/libs/utils/files.h"
@@ -168,7 +169,7 @@ Result<void> CvdMain(cvd_common::Args all_args) {
  * is red.
  */
 std::string ColoredUrl(const std::string& url) {
-  if (!isatty(STDERR_FILENO)) {
+  if (!ShouldColorStderr()) {
     return url;
   }
   std::string coloring_prefix = "\033[01;31m";
@@ -236,7 +237,7 @@ int main(int argc, char** argv) {
     return 0;
   } else if (log_file.has_value() && isatty(2)) {
     VLOG(0) << result.error();
-    cuttlefish::TerminalColors colors(isatty(2));
+    cuttlefish::TerminalColors colors(cuttlefish::ShouldColorStderr());
     std::cerr << colors.Red() << "'cvd' encountered an error." << colors.Reset()
               << " Please see '" << colors.Cyan() << *log_file << colors.Reset()
               << "' for the complete failure report.\n";

base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel

@@ -46,6 +46,7 @@ cf_cc_library(
     hdrs = ["reporting.h"],
     deps = [
         "//cuttlefish/ansi_codes",
+        "//cuttlefish/ansi_codes:should_color",
         "//libbase",
         "@abseil-cpp//absl/log",
         "@fruit",

base/cvd/cuttlefish/host/commands/run_cvd/reporting.cpp

@@ -21,18 +21,28 @@
 #include "absl/log/log.h"
 
 #include "cuttlefish/ansi_codes/ansi_codes.h"
+#include "cuttlefish/ansi_codes/should_color.h"
 
 namespace cuttlefish {
 
 DiagnosticInformation::~DiagnosticInformation() = default;
 
 void DiagnosticInformation::PrintAll(
     const std::vector<DiagnosticInformation*>& infos) {
-  LOG(INFO) << kAnsiGreen << "  Run `cvd logs` to report paths to device logs."
-            << kAnsiReset;
+  static constexpr char kCvdLogsMsg[] =
+      "  Run `cvd logs` to report paths to device logs.";
+  if (ShouldColorStderr()) {
+    LOG(INFO) << kAnsiGreen << kCvdLogsMsg << kAnsiReset;
+  } else {
+    LOG(INFO) << kCvdLogsMsg;
+  }
   for (const auto& info : infos) {
     for (const auto& line : info->Diagnostics()) {
-      LOG(INFO) << kAnsiGreen << "  " << line << kAnsiReset;
+      if (ShouldColorStderr()) {
+        LOG(INFO) << kAnsiGreen << "  " << line << kAnsiReset;
+      } else {
+        LOG(INFO) << "  " << line;
+      }
     }
   }
 }

base/cvd/cuttlefish/result/BUILD.bazel

@@ -10,6 +10,7 @@ cf_cc_library(
     hdrs = ["error_type.h"],
     deps = [
         "//cuttlefish/ansi_codes",
+        "//cuttlefish/ansi_codes:should_color",
         "//libbase",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",

base/cvd/cuttlefish/result/error_type.h

@@ -27,6 +27,8 @@
 #include "android-base/expected.h"  // IWYU pragma: export
 #include "fmt/core.h"               // IWYU pragma: export
 
+#include "cuttlefish/ansi_codes/should_color.h"
+
 namespace cuttlefish {
 
 class StackTraceError;
@@ -188,7 +190,7 @@ class StackTraceError {
 
   std::string Trace() const { return fmt::format(fmt::runtime("{:v}"), *this); }
 
-  std::string FormatForEnv(bool color = (isatty(STDERR_FILENO) == 1)) const {
+  std::string FormatForEnv(bool color = ShouldColorStdout()) const {
     return fmt::format(fmt::runtime(ResultErrorFormat(color)), *this);
   }