Fix cvd fetch logging

It was logging at INFO level only to fetch.log.

Removes handling of the verbosity flag at the fetch command handler
level and leaves it at cvd level only.

Author: jemoreira

base/cvd/cuttlefish/host/commands/cvd/cli/commands/fetch.cpp

@@ -16,8 +16,6 @@
 
 #include "cuttlefish/host/commands/cvd/cli/commands/fetch.h"
 
-#include <unistd.h>
-
 #include <memory>
 #include <string>
 #include <utility>
@@ -59,10 +57,7 @@ Result<void> CvdFetchCommandHandler::Handle(const CommandRequest& request) {
   CF_EXPECT(EnsureDirectoryExists(flags.target_directory));
 
   std::string log_file = GetFetchLogsFileName(flags.target_directory);
-  MetadataLevel metadata_level =
-      isatty(0) ? MetadataLevel::ONLY_MESSAGE : MetadataLevel::FULL;
-  ScopedLogger logger(
-      SeverityTarget::FromFile(log_file, metadata_level, flags.verbosity), "");
+  ScopedLogger logger(SeverityTarget::FromFile(log_file), "");
 
   Result<std::vector<FetchResult>> result = FetchCvdMain(flags);
   if (flags.build_api_flags.enable_caching) {

base/cvd/cuttlefish/host/commands/cvd/cli/commands/load_configs.cpp

@@ -198,10 +198,7 @@ class LoadConfigsCommand : public CvdCommandHandler {
     return CF_EXPECT(
         CommandRequestBuilder()
             .SetEnv(request.Env())
-            // The fetch operation is too verbose by default, set it to WARNING
-            // unconditionally, the full logs are available in fetch.log
-            // anyways.
-            .AddArguments({"cvd", "fetch", "-verbosity", "WARNING"})
+            .AddArguments({"cvd", "fetch"})
             .AddArguments(cvd_flags.fetch_cvd_flags)
             .Build());
   }

base/cvd/cuttlefish/host/commands/cvd/cli/selector/selector_constants.h

@@ -42,7 +42,6 @@ class SelectorFlags {
  public:
   static constexpr char kGroupName[] = "group_name";
   static constexpr char kInstanceName[] = "instance_name";
-  static constexpr char kVerbosity[] = "verbosity";
 };
 
 }  // namespace selector

base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser.cc

@@ -56,7 +56,6 @@ std::vector<Flag> GetFlagsVector(FetchFlags& fetch_flags,
   flags.emplace_back(GflagsCompatFlag("keep_downloaded_archives",
                                       fetch_flags.keep_downloaded_archives)
                          .Help("Keep downloaded zip/tar."));
-  flags.emplace_back(VerbosityFlag(fetch_flags.verbosity));
   flags.emplace_back(
       GflagsCompatFlag("host_package_build", fetch_flags.host_package_build)
           .Help("source for the host cvd tools"));

base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser.h

@@ -19,7 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "cuttlefish/common/libs/utils/tee_logging.h"
 #include "cuttlefish/host/commands/cvd/fetch/build_api_flags.h"
 #include "cuttlefish/host/commands/cvd/fetch/vector_flags.h"
 #include "cuttlefish/result/result.h"
@@ -37,7 +36,6 @@ struct FetchFlags {
   std::string target_directory = kDefaultTargetDirectory;
   std::optional<BuildString> host_package_build;
   bool keep_downloaded_archives = kDefaultKeepDownloadedArchives;
-  LogSeverity verbosity = LogSeverity::Info;
   bool helpxml = false;
   BuildApiFlags build_api_flags;
   VectorFlags vector_flags;

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

@@ -48,22 +48,13 @@ namespace cuttlefish {
 namespace {
 
 /**
- * Returns --verbosity value if ever exist in the entire commandline args
+ * Extracts --verbosity value if ever exist in the entire commandline args
  *
  * Note that this will also pick up from the subtool arguments:
  *  e.g. cvd start --verbosity=DEBUG
  *
- * This may be incorrect as the verbosity should be ideally applied to the
- * launch_cvd/cvd_internal_start only.
- *
- * However, parsing the --verbosity flag only from the driver is quite
- * complicated as we do not know the full list of the subcommands,
- * the subcommands flags, and even the selector/driver flags.
- *
- * Thus, we live with the corner case for now.
  */
-LogSeverity CvdVerbosityOption(const int argc, char** argv) {
-  cvd_common::Args all_args = ArgsToVec(argc, argv);
+LogSeverity CvdVerbosityOption(cvd_common::Args& all_args) {
   std::string verbosity_flag_value;
   std::vector<Flag> verbosity_flag{
       GflagsCompatFlag("verbosity", verbosity_flag_value)};
@@ -74,8 +65,12 @@ LogSeverity CvdVerbosityOption(const int argc, char** argv) {
   if (verbosity_flag_value.empty()) {
     return LogSeverity::Info;
   }
-  Result<LogSeverity> encoded_verbosity = ToSeverity(verbosity_flag_value);
-  return (encoded_verbosity.ok() ? *encoded_verbosity : LogSeverity::Info);
+  Result<LogSeverity> to_severity_res = ToSeverity(verbosity_flag_value);
+  if (!to_severity_res.ok()) {
+    return LogSeverity::Info;
+  }
+  LogSeverity verbosity = *to_severity_res;
+  return verbosity;
 }
 
 Result<void> EnsureCvdDirectoriesExist() {
@@ -115,13 +110,12 @@ void IncreaseFileLimit() {
   }
 }
 
-Result<void> CvdMain(int argc, char** argv, char** envp) {
+Result<void> CvdMain(cvd_common::Args all_args, char** envp) {
   if (!isatty(0)) {
     LOG(INFO) << GetVersionIds().ToString();
   }
   CF_EXPECT(EnsureCvdDirectoriesExist());
 
-  cvd_common::Args all_args = ArgsToVec(argc, argv);
   CF_EXPECT(!all_args.empty());
 
   auto env = EnvpToMap(envp);
@@ -214,16 +208,19 @@ bool ValidateHostConfiguration() {
 int main(int argc, char** argv, char** envp) {
   srand(time(NULL));
 
+  cuttlefish::cvd_common::Args all_args = cuttlefish::ArgsToVec(argc, argv);
   cuttlefish::LogSeverity verbosity =
-      cuttlefish::CvdVerbosityOption(argc, argv);
+      cuttlefish::CvdVerbosityOption(all_args);
   // set verbosity for this process
-  cuttlefish::LogToStderr("", cuttlefish::MetadataLevel::ONLY_MESSAGE,
-                          verbosity);
+  cuttlefish::MetadataLevel metadata_level =
+      isatty(0) ? cuttlefish::MetadataLevel::ONLY_MESSAGE
+                : cuttlefish::MetadataLevel::FULL;
+  cuttlefish::LogToStderr("", metadata_level, verbosity);
 
   if (!cuttlefish::ValidateHostConfiguration()) {
     return -1;
   }
-  auto result = cuttlefish::CvdMain(argc, argv, envp);
+  auto result = cuttlefish::CvdMain(std::move(all_args), envp);
   if (result.ok()) {
     return 0;
   } else {