Use abseil logging instead of libbase's

base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/BUILD.bazel

@@ -24,6 +24,8 @@ cf_cc_binary(
         "//cuttlefish/host/libs/config:logging",
         "//cuttlefish/result",
         "//libbase",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
         "@gflags",
     ],
 )

base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/client.cpp

@@ -19,6 +19,8 @@
 #include <string>
 
 #include <android-base/strings.h>
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 
@@ -71,7 +73,7 @@ SharedFD TcpClient::Start() {
 
   if (client->IsOpen()) {
     last_failure_reason_ = 0;
-    LOG(DEBUG) << "Connected to socket:" << host_ << ":" << port_;
+    VLOG(0) << "Connected to socket:" << host_ << ":" << port_;
     return client;
   } else {
     // Don't log if the previous connection failed with the same error
@@ -97,7 +99,7 @@ SharedFD VsockClient::Start() {
 
   if (vsock_socket->IsOpen()) {
     last_failure_reason_ = 0;
-    LOG(DEBUG) << "Connected to vsock:" << id_ << ":" << port_;
+    VLOG(0) << "Connected to vsock:" << id_ << ":" << port_;
   } else {
     // Don't log if the previous connection failed with the same error
     if (last_failure_reason_ != vsock_socket->GetErrno()) {

base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/server.cpp

@@ -19,6 +19,8 @@
 #include <set>
 #include <thread>
 
+#include "absl/log/log.h"
+
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/result/result.h"

base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/socket_vsock_proxy.cpp

@@ -18,16 +18,15 @@
 
 #include <chrono>
 #include <memory>
-#include <sstream>
 
-#include <android-base/logging.h>
 #include <gflags/gflags.h>
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 #include "cuttlefish/common/frontend/socket_vsock_proxy/client.h"
 #include "cuttlefish/common/frontend/socket_vsock_proxy/server.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/socket2socket_proxy.h"
-#include "cuttlefish/common/libs/utils/tee_logging.h"
 #include "cuttlefish/host/commands/kernel_log_monitor/utils.h"
 #include "cuttlefish/result/result.h"
 
@@ -175,7 +174,7 @@ static Result<void> ListenEventsAndProxy(int events_fd,
     proxy = CF_EXPECT(StartProxyAsync(server, client));
   }
 
-  LOG(DEBUG) << "Start reading events to start/stop proxying";
+  VLOG(0) << "Start reading events to start/stop proxying";
   while (events->IsOpen()) {
     Result<std::optional<monitor::ReadEventResult>> received_event =
         monitor::ReadEvent(events);
@@ -189,7 +188,7 @@ static Result<void> ListenEventsAndProxy(int events_fd,
       continue;
     }
     if (!(*received_event)) {
-      LOG(DEBUG) << "Kernel log message channel closed";
+      VLOG(0) << "Kernel log message channel closed";
       break;
     }
 
@@ -224,7 +223,7 @@ Result<void> Main() {
     CF_EXPECT(ListenEventsAndProxy(FLAGS_events_fd, start_event, stop_event,
                                    *server, *client));
   } else {
-    LOG(DEBUG) << "Starting proxy";
+    VLOG(0) << "Starting proxy";
     Proxy(CF_EXPECT(server->Start()), [&client] { return client->Start(); });
   }
 
@@ -238,12 +237,11 @@ Result<void> Main() {
 int main(int argc, char* argv[]) {
   signal(SIGPIPE, SIG_IGN);
 
-  cuttlefish::DefaultSubprocessLogging(
-      argv, cuttlefish::MetadataLevel::TAG_AND_MESSAGE);
+  cuttlefish::DefaultSubprocessLogging(argv);
   google::ParseCommandLineFlags(&argc, &argv, true);
 
   if (!FLAGS_label.empty()) {
-    android::base::SetDefaultTag("proxy_" + FLAGS_label);
+    LOG(WARNING) << "Log tags unsupported with abseil logging: " << FLAGS_label;
   }
 
   auto result = cuttlefish::socket_proxy::Main();

base/cvd/cuttlefish/common/libs/concurrency/BUILD.bazel

@@ -11,4 +11,5 @@ cf_cc_library(
         "semaphore.h",
         "thread_safe_queue.h",
     ],
+    deps = ["@abseil-cpp//absl/log:check"],
 )

base/cvd/cuttlefish/common/libs/concurrency/multiplexer.h

@@ -20,6 +20,8 @@
 #include <memory>
 #include <vector>
 
+#include "absl/log/check.h"
+
 #include "cuttlefish/common/libs/concurrency/semaphore.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/common/libs/confui/BUILD.bazel

@@ -25,6 +25,8 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:contains",
         "//libbase",
         "//teeui/libteeui",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
         "@boringssl//:crypto",
     ],
 )

base/cvd/cuttlefish/common/libs/confui/packet.cpp

@@ -21,6 +21,8 @@
 #include <string>
 #include <vector>
 
+#include "absl/log/check.h"
+
 namespace cuttlefish {
 namespace confui {
 namespace packet {

base/cvd/cuttlefish/common/libs/confui/packet.h

@@ -23,7 +23,6 @@
 #include <type_traits>
 #include <vector>
 
-#include <android-base/logging.h>
 #include <android-base/strings.h>
 
 #include "cuttlefish/common/libs/confui/packet_types.h"

base/cvd/cuttlefish/common/libs/confui/utils.h

@@ -19,9 +19,9 @@
 #include <sstream>
 #include <string>
 #include <type_traits>
-#include <vector>
 
-#include <android-base/logging.h>
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 namespace cuttlefish {
 template <typename T>
@@ -59,6 +59,8 @@ inline bool IsOnlyDigits(const std::string& src) {
 
 // note that no () surrounding LOG(level) << "ConfUI:" is crucial
 #define ConfUiLog(LOG_LEVEL) LOG(LOG_LEVEL) << "ConfUI: "
+#define ConfUiLogDebug VLOG(0) << "ConfUI: "
+#define ConfUiLogVerbose VLOG(1) << "ConfUI: "
 
 // TODO([email protected]): make these look more like LOG(level)
 #define ConfUiCheck(cond) CHECK(cond) << "ConfUI: "

base/cvd/cuttlefish/common/libs/fs/BUILD.bazel

@@ -31,6 +31,8 @@ cf_cc_library(
         "//cuttlefish/posix:strerror",
         "//cuttlefish/result",
         "//libbase",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
         "@fmt",
     ],
 )

base/cvd/cuttlefish/common/libs/fs/shared_fd.cpp

@@ -38,8 +38,9 @@
 #include <vector>
 
 #include <android-base/file.h>
-#include <android-base/logging.h>
 #include <fmt/format.h>
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 #include "cuttlefish/common/libs/fs/shared_select.h"
@@ -226,7 +227,7 @@ int FileInstance::ConnectWithTimeout(const struct sockaddr* addr,
   }
 
   if (GetErrno() != EAGAIN && GetErrno() != EINPROGRESS) {
-    LOG(DEBUG) << "Immediate connection failure: " << StrError();
+    VLOG(0) << "Immediate connection failure: " << StrError();
     if (Fcntl(F_SETFL, original_flags) == -1) {
       LOG(ERROR) << "Failed to restore original flags: " << StrError();
     }

base/cvd/cuttlefish/common/libs/security/BUILD.bazel

@@ -15,6 +15,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/fs",
         "//libbase",
+        "@abseil-cpp//absl/log",
     ],
 )
 

base/cvd/cuttlefish/common/libs/security/confui_sign.cpp

@@ -20,8 +20,6 @@
 #include <optional>
 #include <vector>
 
-#include <android-base/logging.h>
-
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/common/libs/transport/BUILD.bazel

@@ -18,5 +18,6 @@ cf_cc_library(
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/result",
         "//libbase",
+        "@abseil-cpp//absl/log",
     ],
 )

base/cvd/cuttlefish/common/libs/transport/channel_sharedfd.cpp

@@ -17,8 +17,11 @@
 #include "cuttlefish/common/libs/transport/channel_sharedfd.h"
 
 #include <poll.h>
+
 #include <vector>
 
+#include "absl/log/log.h"
+
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 
 namespace cuttlefish {
@@ -41,7 +44,7 @@ Result<ManagedMessage> SharedFdChannel::ReceiveMessage() {
   CF_EXPECT(read == sizeof(RawMessage),
             "Expected " << sizeof(RawMessage) << ", received " << read << "\n"
                         << "Could not read message: " << input_->StrError());
-  LOG(DEBUG) << "Received message with id: " << message_header.command;
+  VLOG(0) << "Received message with id: " << message_header.command;
 
   auto message = CF_EXPECT(CreateMessage(message_header.command,
                                          message_header.is_response,
@@ -77,4 +80,4 @@ Result<void> SharedFdChannel::SendMessage(RawMessage& message, bool response) {
 }
 
 }  // namespace transport
-}  // namespace cuttlefish
+}  // namespace cuttlefish