From 8881bde311d961649fce51d4f835010edd91ea92 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Fri, 24 May 2024 02:58:58 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log (#36701) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log In this CL we are migrating from gRPCs own gpr logging mechanism to absl logging mechanism. The intention is to deprecate gpr_log in the future. We have the following mapping 1. gpr_log(GPR_INFO,...) -> LOG(INFO) 2. gpr_log(GPR_ERROR,...) -> LOG(ERROR) 3. gpr_log(GPR_DEBUG,...) -> VLOG(2) Reviewers need to check : 1. If the above mapping is correct. 2. The content of the log is as before. gpr_log format strings did not use string_view or std::string . absl LOG accepts these. So there will be some elimination of string_view and std::string related conversions. This is expected. Closes #36701 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36701 from tanvi-jagtap:test_core_gpr_log 1d8c69e9c63faf384052621e172232776bb8f986 PiperOrigin-RevId: 636850577 --- .../core/compression/message_compress_test.cc | 12 +++---- .../event_engine/event_engine_test_utils.cc | 13 ++++---- test/core/event_engine/forkable_test.cc | 9 +++--- .../posix/event_poller_posix_test.cc | 10 +++--- .../event_engine/posix/posix_endpoint_test.cc | 3 +- .../posix/posix_engine_listener_utils_test.cc | 13 ++++---- .../posix/posix_engine_test_utils.cc | 5 ++- .../posix/posix_event_engine_connect_test.cc | 4 +-- .../event_engine/posix/timer_manager_test.cc | 6 ++-- .../event_engine/test_suite/tests/dns_test.cc | 6 ++-- .../test_suite/tests/timer_test.cc | 6 ++-- .../test_suite/tools/echo_client.cc | 21 ++++++------ .../event_engine/windows/create_sockpair.cc | 13 +++----- test/core/gprpp/examine_stack_test.cc | 5 ++- test/core/http/httpcli_test.cc | 28 ++++++++-------- test/core/http/httpscli_test.cc | 14 ++++---- test/core/iomgr/error_test.cc | 5 +-- test/core/iomgr/fd_posix_test.cc | 4 +-- test/core/iomgr/resolve_address_test.cc | 14 ++++---- test/core/iomgr/tcp_posix_test.cc | 32 +++++++++---------- test/core/json/json_test.cc | 7 ++-- test/core/memory_usage/client.cc | 8 ++--- test/core/promise/sleep_test.cc | 9 +++--- test/core/resolver/binder_resolver_test.cc | 11 ++++--- .../resolver/dns_resolver_cooldown_test.cc | 27 ++++++++-------- test/core/resolver/dns_resolver_test.cc | 11 +++---- test/core/resolver/sockaddr_resolver_test.cc | 15 ++++----- .../memory_quota_stress_test.cc | 11 +++---- 28 files changed, 151 insertions(+), 171 deletions(-) diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index 9110456d054..e8aac4237a6 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -24,6 +24,7 @@ #include +#include "absl/log/log.h" #include "gtest/gtest.h" #include @@ -56,12 +57,11 @@ static void assert_passthrough(grpc_slice value, const char* algorithm_name; ASSERT_NE(grpc_compression_algorithm_name(algorithm, &algorithm_name), 0); - gpr_log(GPR_INFO, - "assert_passthrough: value_length=%" PRIuPTR - " algorithm='%s' uncompressed_split='%s' compressed_split='%s'", - GRPC_SLICE_LENGTH(value), algorithm_name, - grpc_slice_split_mode_name(uncompressed_split_mode), - grpc_slice_split_mode_name(compressed_split_mode)); + LOG(INFO) << "assert_passthrough: value_length=" << GRPC_SLICE_LENGTH(value) + << " algorithm='" << algorithm_name << "' uncompressed_split='" + << grpc_slice_split_mode_name(uncompressed_split_mode) + << "' compressed_split='" + << grpc_slice_split_mode_name(compressed_split_mode) << "'"; grpc_slice_buffer_init(&input); grpc_slice_buffer_init(&compressed_raw); diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc index 32ab6ac5276..d026f50d0b9 100644 --- a/test/core/event_engine/event_engine_test_utils.cc +++ b/test/core/event_engine/event_engine_test_utils.cc @@ -23,6 +23,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -34,7 +35,6 @@ #include #include #include -#include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" @@ -159,8 +159,8 @@ absl::Status SendValidatePayload(absl::string_view data, // Check if data written == data read std::string data_read = ExtractSliceBufferIntoString(&read_store_buf); if (data != data_read) { - gpr_log(GPR_INFO, "Data written = %s", data.data()); - gpr_log(GPR_INFO, "Data read = %s", data_read.c_str()); + LOG(INFO) << "Data written = " << data; + LOG(INFO) << "Data read = " << data_read; return absl::CancelledError("Data read != Data written"); } return absl::OkStatus(); @@ -201,8 +201,8 @@ absl::Status ConnectionManager::BindAndStartListener( for (auto& addr : addrs) { auto bind_status = listener->Bind(*URIToResolvedAddress(addr)); if (!bind_status.ok()) { - gpr_log(GPR_ERROR, "Binding listener failed: %s", - bind_status.status().ToString().c_str()); + LOG(ERROR) << "Binding listener failed: " + << bind_status.status().ToString(); return bind_status.status(); } } @@ -230,8 +230,7 @@ ConnectionManager::CreateConnection(std::string target_addr, event_engine->Connect( [this](absl::StatusOr> status) { if (!status.ok()) { - gpr_log(GPR_ERROR, "Connect failed: %s", - status.status().ToString().c_str()); + LOG(ERROR) << "Connect failed: " << status.status().ToString(); last_in_progress_connection_.SetClientEndpoint(nullptr); } else { last_in_progress_connection_.SetClientEndpoint(std::move(*status)); diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc index 9c7fdf69405..c15c3d76494 100644 --- a/test/core/event_engine/forkable_test.cc +++ b/test/core/event_engine/forkable_test.cc @@ -25,11 +25,10 @@ #include +#include "absl/log/log.h" #include "absl/types/optional.h" #include "gtest/gtest.h" -#include - #include "src/core/lib/config/config_vars.h" #include "src/core/lib/gprpp/no_destruct.h" @@ -94,14 +93,14 @@ TEST_F(ForkableTest, BasicPthreadAtForkOperations) { int child_pid = fork(); ASSERT_NE(child_pid, -1); if (child_pid == 0) { - gpr_log(GPR_DEBUG, "I am child pid: %d", getpid()); + VLOG(2) << "I am child pid: " << getpid(); forkable->CheckChild(); exit(testing::Test::HasFailure()); } else { - gpr_log(GPR_DEBUG, "I am parent pid: %d", getpid()); + VLOG(2) << "I am parent pid: " << getpid(); forkable->CheckParent(); int status; - gpr_log(GPR_DEBUG, "Waiting for child pid: %d", child_pid); + VLOG(2) << "Waiting for child pid: " << child_pid; do { // retry on EINTR, and fail otherwise if (waitpid(child_pid, &status, 0) != -1) break; diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index b1e142097a1..d6c29bcfc51 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -52,10 +52,10 @@ #include #include +#include "absl/log/log.h" #include "absl/status/status.h" #include -#include #include #include "src/core/lib/event_engine/common_closures.h" @@ -235,8 +235,8 @@ void ListenCb(server* sv, absl::Status status) { listen_em_fd->NotifyOnRead(sv->listen_closure); return; } else if (fd < 0) { - gpr_log(GPR_ERROR, "Failed to acceot a connection, returned error: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed to acceot a connection, returned error: " + << grpc_core::StrError(errno); } EXPECT_GE(fd, 0); EXPECT_LT(fd, FD_SETSIZE); @@ -349,7 +349,7 @@ void ClientStart(client* cl, int port) { pfd.events = POLLOUT; pfd.revents = 0; if (poll(&pfd, 1, -1) == -1) { - gpr_log(GPR_ERROR, "poll() failed during connect; errno=%d", errno); + LOG(ERROR) << "poll() failed during connect; errno=" << errno; abort(); } } else { @@ -389,7 +389,7 @@ class EventPollerTest : public ::testing::Test { EXPECT_NE(engine_, nullptr); scheduler_->ChangeCurrentEventEngine(engine_.get()); if (g_event_poller != nullptr) { - gpr_log(GPR_INFO, "Using poller: %s", g_event_poller->Name().c_str()); + LOG(INFO) << "Using poller: " << g_event_poller->Name(); } } diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc index b88c9f608c9..5effe01234e 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -24,6 +24,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" @@ -203,7 +204,7 @@ class PosixEndpointTest : public ::testing::TestWithParam { EXPECT_NE(posix_ee_, nullptr); scheduler_->ChangeCurrentEventEngine(posix_ee_.get()); if (poller_ != nullptr) { - gpr_log(GPR_INFO, "Using poller: %s", poller_->Name().c_str()); + LOG(INFO) << "Using poller: " << poller_->Name(); } } diff --git a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc index a3f3587a597..319d8098b06 100644 --- a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc +++ b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc @@ -33,7 +33,7 @@ #include -#include +#include "absl/log/log.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h" @@ -108,9 +108,8 @@ TEST(PosixEngineListenerUtils, ListenerContainerAddAllLocalAddressesTest) { struct ifaddrs* ifa_it; if (getifaddrs(&ifa) != 0 || ifa == nullptr) { // No ifaddresses available. - gpr_log(GPR_INFO, - "Skipping ListenerAddAllLocalAddressesTest because the machine " - "does not have interfaces configured for listening."); + LOG(INFO) << "Skipping ListenerAddAllLocalAddressesTest because the " + "machine does not have interfaces configured for listening."; return; } int num_ifaddrs = 0; @@ -123,9 +122,9 @@ TEST(PosixEngineListenerUtils, ListenerContainerAddAllLocalAddressesTest) { if (num_ifaddrs == 0 || !result.ok()) { // Its possible that the machine may not have any Ipv4/Ipv6 interfaces // configured for listening. In that case, dont fail test. - gpr_log(GPR_INFO, - "Skipping ListenerAddAllLocalAddressesTest because the machine " - "does not have Ipv6/Ipv6 interfaces configured for listening."); + LOG(INFO) << "Skipping ListenerAddAllLocalAddressesTest because the " + "machine does not have Ipv6/Ipv6 interfaces configured for " + "listening."; return; } // Some sockets have been created and bound to interfaces on the machiene. diff --git a/test/core/event_engine/posix/posix_engine_test_utils.cc b/test/core/event_engine/posix/posix_engine_test_utils.cc index fabceaf167c..6f35b9065b9 100644 --- a/test/core/event_engine/posix/posix_engine_test_utils.cc +++ b/test/core/event_engine/posix/posix_engine_test_utils.cc @@ -20,10 +20,9 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include - #include "src/core/lib/gprpp/crash.h" namespace grpc_event_engine { @@ -53,7 +52,7 @@ int ConnectToServerOrDie(const ResolvedAddress& server_address) { pfd.events = POLLOUT; pfd.revents = 0; if (poll(&pfd, 1, -1) == -1) { - gpr_log(GPR_ERROR, "poll() failed during connect; errno=%d", errno); + LOG(ERROR) << "poll() failed during connect; errno=" << errno; abort(); } } else { diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc index 294c7731742..bf89dafc3fb 100644 --- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc +++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc @@ -27,6 +27,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -37,7 +38,6 @@ #include #include #include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" @@ -121,7 +121,7 @@ std::vector CreateConnectedSockets( pfd.revents = 0; int ret = poll(&pfd, 1, 1000); if (ret == -1) { - gpr_log(GPR_ERROR, "poll() failed during connect; errno=%d", errno); + LOG(ERROR) << "poll() failed during connect; errno=" << errno; abort(); } else if (ret == 0) { // current connection attempt timed out. It indicates that the diff --git a/test/core/event_engine/posix/timer_manager_test.cc b/test/core/event_engine/posix/timer_manager_test.cc index fc2698a35a4..1cfe58a2d80 100644 --- a/test/core/event_engine/posix/timer_manager_test.cc +++ b/test/core/event_engine/posix/timer_manager_test.cc @@ -19,12 +19,12 @@ #include #include "absl/functional/any_invocable.h" +#include "absl/log/log.h" #include "absl/time/clock.h" #include "absl/time/time.h" #include "gtest/gtest.h" #include -#include #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/posix_engine/timer.h" @@ -66,8 +66,8 @@ TEST(TimerManagerTest, StressTest) { << called.load(std::memory_order_relaxed) << "/" << kTimerCount << " callbacks executed"; } - gpr_log(GPR_DEBUG, "Processed %d/%d callbacks", - called.load(std::memory_order_relaxed), kTimerCount); + VLOG(2) << "Processed " << called.load(std::memory_order_relaxed) << "/" + << kTimerCount << " callbacks"; absl::SleepFor(absl::Milliseconds(333)); } } diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc index 5f305ee0e16..6243bbdb49f 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -22,6 +22,7 @@ #include #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" @@ -128,9 +129,8 @@ class EventEngineDNSTest : public EventEngineTest { // an indication whether the test is running on RBE or not. Find a better way of // doing this. #ifndef GRPC_PORT_ISOLATED_RUNTIME - gpr_log(GPR_ERROR, - "You are invoking the test locally with Bazel, you may need to " - "invoke Bazel with --enable_runfiles=yes."); + LOG(ERROR) << "You are invoking the test locally with Bazel, you may " + "need to invoke Bazel with --enable_runfiles=yes."; #endif // GRPC_PORT_ISOLATED_RUNTIME test_records_path = grpc::testing::NormalizeFilePath(test_records_path); dns_server_path = diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc index e4b6f2986e6..543f5c97d2c 100644 --- a/test/core/event_engine/test_suite/tests/timer_test.cc +++ b/test/core/event_engine/test_suite/tests/timer_test.cc @@ -26,13 +26,13 @@ #include "absl/functional/any_invocable.h" #include "absl/functional/bind_front.h" #include "absl/functional/function_ref.h" +#include "absl/log/log.h" #include "absl/time/clock.h" #include "absl/time/time.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include -#include #include "src/core/lib/event_engine/time_util.h" #include "src/core/lib/gprpp/sync.h" @@ -197,8 +197,8 @@ TEST_F(EventEngineTimerTest, StressTestTimersNotCalledBeforeScheduled) { cv_.Wait(&mu_); } if (failed_call_count.load() != 0) { - gpr_log(GPR_DEBUG, "failed timer count: %d of %d", failed_call_count.load(), - thread_count * call_count); + VLOG(2) << "failed timer count: " << failed_call_count.load() << " of " + << (thread_count * call_count); } ASSERT_EQ(0, failed_call_count.load()); } diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc index 2ab12b61801..afc109e78ed 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -39,6 +39,7 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "absl/functional/any_invocable.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" @@ -93,14 +93,12 @@ void ReceiveAndEchoMessage(EventEngine::Endpoint* endpoint, int message_id) { endpoint->Read( [&](absl::Status status) { if (!status.ok()) { - gpr_log(GPR_ERROR, "Error reading from endpoint: %s", - status.ToString().c_str()); + LOG(ERROR) << "Error reading from endpoint: " << status; exit(1); } Slice received = buf.TakeFirst(); - gpr_log(GPR_ERROR, "Received message %d: %.*s", message_id, - static_cast(received.as_string_view().length()), - received.as_string_view().data()); + LOG(ERROR) << "Received message " << message_id << ": " + << received.as_string_view(); read_done.Notify(); }, &buf, nullptr); @@ -124,8 +122,7 @@ void RunUntilInterrupted() { engine->Connect( [&](absl::StatusOr> ep) { if (!ep.ok()) { - gpr_log(GPR_ERROR, "Error connecting: %s", - ep.status().ToString().c_str()); + LOG(ERROR) << "Error connecting: " << ep.status().ToString(); exit(1); } endpoint = std::move(*ep); @@ -134,10 +131,10 @@ void RunUntilInterrupted() { *addr, config, memory_quota->CreateMemoryAllocator("client"), 2h); connected.WaitForNotification(); CHECK_NE(endpoint.get(), nullptr); - gpr_log(GPR_DEBUG, "peer addr: %s", - ResolvedAddressToString(endpoint->GetPeerAddress())->c_str()); - gpr_log(GPR_DEBUG, "local addr: %s", - ResolvedAddressToString(endpoint->GetLocalAddress())->c_str()); + VLOG(2) << "peer addr: " + << ResolvedAddressToString(endpoint->GetPeerAddress()); + VLOG(2) << "local addr: " + << ResolvedAddressToString(endpoint->GetLocalAddress()); int message_id = 0; while (true) { SendMessage(endpoint.get(), message_id++); diff --git a/test/core/event_engine/windows/create_sockpair.cc b/test/core/event_engine/windows/create_sockpair.cc index 85d5a20b5ee..3817f98ac6f 100644 --- a/test/core/event_engine/windows/create_sockpair.cc +++ b/test/core/event_engine/windows/create_sockpair.cc @@ -18,6 +18,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "src/core/lib/event_engine/windows/win_socket.h" @@ -55,10 +56,8 @@ void CreateSockpair(SOCKET sockpair[2], DWORD flags) { auto result = WSAConnect(cli_sock, (sockaddr*)&addr, addr_len, NULL, NULL, NULL, NULL); if (result != 0) { - gpr_log(GPR_DEBUG, "%s", - GRPC_WSA_ERROR(WSAGetLastError(), "Failed in WSAConnect") - .ToString() - .c_str()); + VLOG(2) + << GRPC_WSA_ERROR(WSAGetLastError(), "Failed in WSAConnect").ToString(); abort(); } svr_sock = accept(lst_sock, (sockaddr*)&addr, &addr_len); @@ -72,13 +71,11 @@ void CreateSockpair(SOCKET sockpair[2], DWORD flags) { // logged status. WSAEINVAL is expected. auto status = PrepareSocket(cli_sock); // if (!status.ok()) { - // gpr_log(GPR_DEBUG, "Error preparing client socket: %s", - // status.ToString().c_str()); + // VLOG(2) << "Error preparing client socket: " << status.ToString(); // } status = PrepareSocket(svr_sock); // if (!status.ok()) { - // gpr_log(GPR_DEBUG, "Error preparing server socket: %s", - // status.ToString().c_str()); + // VLOG(2) << "Error preparing server socket: " << status.ToString(); // } sockpair[0] = svr_sock; diff --git a/test/core/gprpp/examine_stack_test.cc b/test/core/gprpp/examine_stack_test.cc index bb3f7f37298..f9384842c7d 100644 --- a/test/core/gprpp/examine_stack_test.cc +++ b/test/core/gprpp/examine_stack_test.cc @@ -20,11 +20,10 @@ #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" +#include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include - namespace { std::string SimpleCurrentStackTraceProvider() { return "stacktrace"; } @@ -67,7 +66,7 @@ TEST(ExamineStackTest, AbseilStackProvider) { const absl::optional stack_trace = grpc_core::GetCurrentStackTrace(); EXPECT_NE(stack_trace, absl::nullopt); - gpr_log(GPR_INFO, "stack_trace=%s", stack_trace->c_str()); + LOG(INFO) << "stack_trace=" << *stack_trace; #if !defined(NDEBUG) && !defined(GPR_MUSL_LIBC_COMPAT) // Expect to see some gtest signature on the stack (this used to be // GetCurrentStackTrace, but some operating systems have trouble with the leaf diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 2c7d7ee2aa2..773ee18ed08 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -30,6 +30,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" @@ -39,7 +40,6 @@ #include #include #include -#include #include #include @@ -163,8 +163,8 @@ void OnFinish(void* arg, grpc_error_handle error) { "Hello world!" "

This is a test

"; grpc_http_response response = request_state->response; - gpr_log(GPR_INFO, "response status=%d error=%s", response.status, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "response status=" << response.status + << " error=" << grpc_core::StatusToString(error); CHECK(error.ok()); CHECK_EQ(response.status, 200); CHECK(response.body_length == strlen(expect)); @@ -182,8 +182,8 @@ void OnFinishExpectFailure(void* arg, grpc_error_handle error) { grpc_pollset_set_destroy(request_state->pollset_set_to_destroy_eagerly); } grpc_http_response response = request_state->response; - gpr_log(GPR_INFO, "response status=%d error=%s", response.status, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "response status=" << response.status + << " error=" << grpc_core::StatusToString(error); CHECK(!error.ok()); request_state->test->RunAndKick( [request_state]() { request_state->done = true; }); @@ -194,7 +194,7 @@ TEST_F(HttpRequestTest, Get) { grpc_http_request req; grpc_core::ExecCtx exec_ctx; std::string host = absl::StrFormat("localhost:%d", g_server_port); - gpr_log(GPR_INFO, "requesting from %s", host.c_str()); + LOG(INFO) << "requesting from " << host; memset(&req, 0, sizeof(req)); auto uri = grpc_core::URI::Create("http", host, "/get", {} /* query params */, "" /* fragment */); @@ -218,7 +218,7 @@ TEST_F(HttpRequestTest, Post) { grpc_http_request req; grpc_core::ExecCtx exec_ctx; std::string host = absl::StrFormat("localhost:%d", g_server_port); - gpr_log(GPR_INFO, "posting to %s", host.c_str()); + LOG(INFO) << "posting to " << host; memset(&req, 0, sizeof(req)); req.body = const_cast("hello"); req.body_length = 5; @@ -242,9 +242,8 @@ TEST_F(HttpRequestTest, Post) { int g_fake_non_responsive_dns_server_port; void InjectNonResponsiveDNSServer(ares_channel* channel) { - gpr_log(GPR_DEBUG, - "Injecting broken nameserver list. Bad server address:|[::1]:%d|.", - g_fake_non_responsive_dns_server_port); + VLOG(2) << "Injecting broken nameserver list. Bad server address:|[::1]:" + << g_fake_non_responsive_dns_server_port << "|."; // Configure a non-responsive DNS server at the front of c-ares's nameserver // list. struct ares_addr_port_node dns_server_addrs[1]; @@ -492,10 +491,9 @@ TEST_F(HttpRequestTest, CallerPollentsAreNotReferencedAfterCallbackIsRan) { } void CancelRequest(grpc_core::HttpRequest* req) { - gpr_log( - GPR_INFO, - "test only HttpRequest::OnHandshakeDone intercept orphaning request: %p", - req); + LOG(INFO) << "test only HttpRequest::OnHandshakeDone intercept orphaning " + "request: " + << req; req->Orphan(); } @@ -511,7 +509,7 @@ TEST_F(HttpRequestTest, grpc_http_request req; grpc_core::ExecCtx exec_ctx; std::string host = absl::StrFormat("localhost:%d", g_server_port); - gpr_log(GPR_INFO, "requesting from %s", host.c_str()); + LOG(INFO) << "requesting from " << host; memset(&req, 0, sizeof(req)); auto uri = grpc_core::URI::Create("http", host, "/get", {} /* query params */, "" /* fragment */); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 55a559240b4..8bdf220bee2 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -29,6 +29,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" @@ -37,7 +38,6 @@ #include #include #include -#include #include #include @@ -163,8 +163,8 @@ void OnFinish(void* arg, grpc_error_handle error) { "Hello world!" "

This is a test

"; grpc_http_response response = request_state->response; - gpr_log(GPR_INFO, "response status=%d error=%s", response.status, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "response status=" << response.status + << " error=" << grpc_core::StatusToString(error); CHECK(error.ok()); CHECK_EQ(response.status, 200); CHECK(response.body_length == strlen(expect)); @@ -176,8 +176,8 @@ void OnFinish(void* arg, grpc_error_handle error) { void OnFinishExpectFailure(void* arg, grpc_error_handle error) { RequestState* request_state = static_cast(arg); grpc_http_response response = request_state->response; - gpr_log(GPR_INFO, "response status=%d error=%s", response.status, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "response status=" << response.status + << " error=" << grpc_core::StatusToString(error); CHECK(!error.ok()); request_state->test->RunAndKick( [request_state]() { request_state->done = true; }); @@ -188,7 +188,7 @@ TEST_F(HttpsCliTest, Get) { grpc_http_request req; grpc_core::ExecCtx exec_ctx; std::string host = absl::StrFormat("localhost:%d", g_server_port); - gpr_log(GPR_INFO, "requesting from %s", host.c_str()); + LOG(INFO) << "requesting from " << host; memset(&req, 0, sizeof(req)); grpc_arg ssl_override_arg = grpc_channel_arg_string_create( const_cast(GRPC_SSL_TARGET_NAME_OVERRIDE_ARG), @@ -214,7 +214,7 @@ TEST_F(HttpsCliTest, Post) { grpc_http_request req; grpc_core::ExecCtx exec_ctx; std::string host = absl::StrFormat("localhost:%d", g_server_port); - gpr_log(GPR_INFO, "posting to %s", host.c_str()); + LOG(INFO) << "posting to " << host; memset(&req, 0, sizeof(req)); req.body = const_cast("hello"); req.body_length = 5; diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc index 1abe1eca76e..165158b06b9 100644 --- a/test/core/iomgr/error_test.cc +++ b/test/core/iomgr/error_test.cc @@ -22,9 +22,10 @@ #include +#include "absl/log/log.h" + #include #include -#include #include "src/core/lib/gprpp/crash.h" #include "test/core/test_util/test_config.h" @@ -148,7 +149,7 @@ TEST(ErrorTest, PrintErrorString) { error = grpc_error_set_int(error, grpc_core::StatusIntProperty::kSize, 666); error = grpc_error_set_str(error, grpc_core::StatusStrProperty::kGrpcMessage, "message"); - // gpr_log(GPR_DEBUG, "%s", grpc_core::StatusToString(error).c_str()); + // VLOG(2) << grpc_core::StatusToString(error); } TEST(ErrorTest, PrintErrorStringReference) { diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 22c24827104..8497b62591a 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -36,11 +36,11 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include #include -#include #include #include @@ -396,7 +396,7 @@ static void test_grpc_fd(void) { client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); ASSERT_EQ(sv.read_bytes_total, cl.write_bytes_total); - gpr_log(GPR_INFO, "Total read bytes %" PRIdPTR, sv.read_bytes_total); + LOG(INFO) << "Total read bytes " << sv.read_bytes_total; } typedef struct fd_change_data { diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 8dc158ddf9d..ec5834646dc 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -26,11 +26,11 @@ #include "absl/functional/bind_front.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/match.h" #include #include -#include #include #include @@ -102,8 +102,7 @@ class ResolveAddressTest : public ::testing::Test { break; } grpc_core::Duration time_left = deadline - grpc_core::Timestamp::Now(); - gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64, done_, - time_left.millis()); + VLOG(2) << "done=" << done_ << ", time_left=" << time_left.millis(); ASSERT_GE(time_left, grpc_core::Duration::Zero()); grpc_pollset_worker* worker = nullptr; GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(pollset_, &worker, @@ -392,9 +391,8 @@ namespace { int g_fake_non_responsive_dns_server_port; void InjectNonResponsiveDNSServer(ares_channel* channel) { - gpr_log(GPR_DEBUG, - "Injecting broken nameserver list. Bad server address:|[::1]:%d|.", - g_fake_non_responsive_dns_server_port); + VLOG(2) << "Injecting broken nameserver list. Bad server address:|[::1]:" + << g_fake_non_responsive_dns_server_port << "|."; // Configure a non-responsive DNS server at the front of c-ares's nameserver // list. struct ares_addr_port_node dns_server_addrs[1]; @@ -450,7 +448,7 @@ class PollsetSetWrapper { grpc_core::ExecCtx::Get()->Flush(); grpc_pollset_destroy(ps_); gpr_free(ps_); - gpr_log(GPR_DEBUG, "PollsetSetWrapper:%p deleted", this); + VLOG(2) << "PollsetSetWrapper:" << this << " deleted"; } grpc_pollset_set* pollset_set() { return pss_; } @@ -461,7 +459,7 @@ class PollsetSetWrapper { grpc_pollset_init(ps_, &mu_); pss_ = grpc_pollset_set_create(); grpc_pollset_set_add_pollset(pss_, ps_); - gpr_log(GPR_DEBUG, "PollsetSetWrapper:%p created", this); + VLOG(2) << "PollsetSetWrapper:" << this << " created"; } gpr_mu* mu_; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 9f50defcc42..6117be2beb1 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -37,10 +37,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" @@ -171,8 +171,8 @@ static void read_cb(void* user_data, grpc_error_handle error) { read_bytes = count_slices(state->incoming.slices, state->incoming.count, ¤t_data); state->read_bytes += read_bytes; - gpr_log(GPR_INFO, "Read %" PRIuPTR " bytes of %" PRIuPTR, read_bytes, - state->target_read_bytes); + LOG(INFO) << "Read " << read_bytes << " bytes of " + << state->target_read_bytes; if (state->read_bytes >= state->target_read_bytes) { CHECK(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); @@ -195,8 +195,8 @@ static void read_test(size_t num_bytes, size_t slice_size, grpc_timeout_milliseconds_to_deadline(kDeadlineMillis)); grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_INFO, "Read test of size %" PRIuPTR ", slice size %" PRIuPTR, - num_bytes, slice_size); + LOG(INFO) << "Read test of size " << num_bytes << ", slice size " + << slice_size; create_sockets(sv); @@ -218,7 +218,7 @@ static void read_test(size_t num_bytes, size_t slice_size, grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); - gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); + LOG(INFO) << "Wrote " << written_bytes << " bytes"; state.ep = ep; state.read_bytes = 0; @@ -260,7 +260,7 @@ static void large_read_test(size_t slice_size, int min_progress_size) { grpc_timeout_milliseconds_to_deadline(kDeadlineMillis)); grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_INFO, "Start large read test, slice size %" PRIuPTR, slice_size); + LOG(INFO) << "Start large read test, slice size " << slice_size; create_sockets(sv); @@ -282,7 +282,7 @@ static void large_read_test(size_t slice_size, int min_progress_size) { grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket(sv[0]); - gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); + LOG(INFO) << "Wrote " << written_bytes << " bytes"; state.ep = ep; state.read_bytes = 0; @@ -411,9 +411,8 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_timeout_milliseconds_to_deadline(kDeadlineMillis)); grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_INFO, - "Start write test with %" PRIuPTR " bytes, slice size %" PRIuPTR, - num_bytes, slice_size); + LOG(INFO) << "Start write test with " << num_bytes << " bytes, slice size " + << slice_size; create_sockets(sv); @@ -496,9 +495,8 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { GRPC_CLOSURE_INIT(&fd_released_cb, &on_fd_released, &rel_fd, grpc_schedule_on_exec_ctx); - gpr_log(GPR_INFO, - "Release fd read_test of size %" PRIuPTR ", slice size %" PRIuPTR, - num_bytes, slice_size); + LOG(INFO) << "Release fd read_test of size " << num_bytes << ", slice size " + << slice_size; create_sockets(sv); @@ -538,7 +536,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); - gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); + LOG(INFO) << "Wrote " << written_bytes << " bytes"; state.ep = ep; state.read_bytes = 0; @@ -555,8 +553,8 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_pollset_worker* worker = nullptr; CHECK(GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); - gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, - state.read_bytes, state.target_read_bytes); + VLOG(2) << "wakeup: read=" << state.read_bytes + << " target=" << state.target_read_bytes; gpr_mu_unlock(g_mu); grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc index 9cd1264c079..cf9f68cf212 100644 --- a/test/core/json/json_test.cc +++ b/test/core/json/json_test.cc @@ -22,6 +22,7 @@ #include #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/match.h" @@ -29,8 +30,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include - #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/test_config.h" @@ -79,7 +78,7 @@ void ValidateValue(const Json& actual, const Json& expected) { void RunSuccessTest(const char* input, const Json& expected, const char* expected_output) { - gpr_log(GPR_INFO, "parsing string \"%s\" - should succeed", input); + LOG(INFO) << "parsing string \"" << input << "\" - should succeed"; auto json = JsonParse(input); ASSERT_TRUE(json.ok()) << json.status(); ValidateValue(*json, expected); @@ -200,7 +199,7 @@ TEST(Json, Keywords) { } void RunParseFailureTest(const char* input) { - gpr_log(GPR_INFO, "parsing string \"%s\" - should fail", input); + LOG(INFO) << "parsing string \"" << input << "\" - should fail"; auto json = JsonParse(input); EXPECT_FALSE(json.ok()) << "input: \"" << input << "\""; } diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc index 3ba5ac650da..0730d977224 100644 --- a/test/core/memory_usage/client.cc +++ b/test/core/memory_usage/client.cc @@ -28,6 +28,7 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/match.h" #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include "src/core/lib/channel/channel_args.h" @@ -161,9 +161,9 @@ static MemStats send_snapshot_request(int call_idx, grpc_slice call_type) { (void*)nullptr, nullptr)); grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - gpr_log(GPR_INFO, "Call %d status %d (%s)", call_idx, calls[call_idx].status, - std::string(grpc_core::StringViewFromSlice(calls[call_idx].details)) - .c_str()); + LOG(INFO) << "Call " << call_idx << " status " << calls[call_idx].status + << " (" << grpc_core::StringViewFromSlice(calls[call_idx].details) + << ")"; CHECK_NE(response_payload_recv, nullptr); grpc_byte_buffer_reader reader; diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc index 371a7c08fa8..0d83460f0b8 100644 --- a/test/core/promise/sleep_test.cc +++ b/test/core/promise/sleep_test.cc @@ -20,11 +20,11 @@ #include #include +#include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include -#include #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/notification.h" @@ -156,7 +156,7 @@ TEST(Sleep, StressTest) { std::vector> notifications; std::vector activities; auto engine = GetDefaultEventEngine(); - gpr_log(GPR_INFO, "Starting %d sleeps for 1sec", kNumActivities); + LOG(INFO) << "Starting " << kNumActivities << " sleeps for 1sec"; for (int i = 0; i < kNumActivities; i++) { auto notification = std::make_shared(); auto activity = MakeActivity( @@ -167,9 +167,8 @@ TEST(Sleep, StressTest) { notifications.push_back(std::move(notification)); activities.push_back(std::move(activity)); } - gpr_log(GPR_INFO, - "Waiting for the first %d sleeps, whilst cancelling the other half", - kNumActivities / 2); + LOG(INFO) << "Waiting for the first " << (kNumActivities / 2) + << " sleeps, whilst cancelling the other half"; for (size_t i = 0; i < kNumActivities / 2; i++) { notifications[i]->WaitForNotification(); activities[i].reset(); diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc index b4558ccbe4d..9fad73a6704 100644 --- a/test/core/resolver/binder_resolver_test.cc +++ b/test/core/resolver/binder_resolver_test.cc @@ -43,8 +43,9 @@ #include #endif // GPR_WINDOWS +#include "absl/log/log.h" + #include -#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/resolver_registry.h" @@ -120,8 +121,8 @@ class BinderResolverTest : public ::testing::Test { }; void TestSucceeds(const char* string, const std::string& expected_path) { - gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, - std::string(factory_->scheme()).c_str()); + VLOG(2) << "test: '" << string << "' should be valid for '" + << factory_->scheme(); grpc_core::ExecCtx exec_ctx; absl::StatusOr uri = grpc_core::URI::Parse(string); ASSERT_TRUE(uri.ok()) << uri.status().ToString(); @@ -136,8 +137,8 @@ class BinderResolverTest : public ::testing::Test { } void TestFails(const char* string) { - gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, - std::string(factory_->scheme()).c_str()); + VLOG(2) << "test: '" << string << "' should be invalid for '" + << factory_->scheme(); grpc_core::ExecCtx exec_ctx; absl::StatusOr uri = grpc_core::URI::Parse(string); ASSERT_TRUE(uri.ok()) << uri.status().ToString(); diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index 71127572aad..0bc27e4b3c0 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -24,6 +24,7 @@ #include #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -34,7 +35,6 @@ #include #include #include -#include #include #include @@ -188,11 +188,10 @@ static grpc_ares_request* test_dns_lookup_ares( static auto last_resolution_time = grpc_core::Timestamp::ProcessEpoch(); auto now = grpc_core::Timestamp::FromTimespecRoundUp(gpr_now(GPR_CLOCK_MONOTONIC)); - gpr_log(GPR_DEBUG, - "last_resolution_time:%" PRId64 " now:%" PRId64 - " min_time_between:%d", - last_resolution_time.milliseconds_after_process_epoch(), - now.milliseconds_after_process_epoch(), kMinResolutionPeriodMs); + VLOG(2) << "last_resolution_time:" + << last_resolution_time.milliseconds_after_process_epoch() + << " now:" << now.milliseconds_after_process_epoch() + << " min_time_between:" << kMinResolutionPeriodMs; if (last_resolution_time != grpc_core::Timestamp::ProcessEpoch()) { EXPECT_GE(now - last_resolution_time, grpc_core::Duration::Milliseconds(kMinResolutionPeriodMs)); @@ -253,7 +252,7 @@ static void poll_pollset_until_request_done(iomgr_args* args) { break; } grpc_core::Duration time_left = deadline - grpc_core::Timestamp::Now(); - gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64, done, time_left.millis()); + VLOG(2) << "done=" << done << ", time_left=" << time_left.millis(); ASSERT_GE(time_left, grpc_core::Duration::Zero()); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); @@ -311,7 +310,7 @@ static grpc_core::NoDestruct g_all_callbacks_invoked; // from "Now()". Thus the more rounds ran, the more highlighted the // difference is between absolute and relative times values. static void on_fourth_resolution(OnResolutionCallbackArg* cb_arg) { - gpr_log(GPR_INFO, "4th: g_resolution_count: %d", g_resolution_count); + LOG(INFO) << "4th: g_resolution_count: " << g_resolution_count; ASSERT_EQ(g_resolution_count, 4); cb_arg->resolver.reset(); gpr_atm_rel_store(&g_iomgr_args.done_atm, 1); @@ -324,7 +323,7 @@ static void on_fourth_resolution(OnResolutionCallbackArg* cb_arg) { } static void on_third_resolution(OnResolutionCallbackArg* cb_arg) { - gpr_log(GPR_INFO, "3rd: g_resolution_count: %d", g_resolution_count); + LOG(INFO) << "3rd: g_resolution_count: " << g_resolution_count; ASSERT_EQ(g_resolution_count, 3); cb_arg->result_handler->SetCallback(on_fourth_resolution, cb_arg); cb_arg->resolver->RequestReresolutionLocked(); @@ -335,7 +334,7 @@ static void on_third_resolution(OnResolutionCallbackArg* cb_arg) { } static void on_second_resolution(OnResolutionCallbackArg* cb_arg) { - gpr_log(GPR_INFO, "2nd: g_resolution_count: %d", g_resolution_count); + LOG(INFO) << "2nd: g_resolution_count: " << g_resolution_count; // The resolution callback was not invoked until new data was // available, which was delayed until after the cooldown period. ASSERT_EQ(g_resolution_count, 2); @@ -348,7 +347,7 @@ static void on_second_resolution(OnResolutionCallbackArg* cb_arg) { } static void on_first_resolution(OnResolutionCallbackArg* cb_arg) { - gpr_log(GPR_INFO, "1st: g_resolution_count: %d", g_resolution_count); + LOG(INFO) << "1st: g_resolution_count: " << g_resolution_count; // There's one initial system-level resolution and one invocation of a // notification callback (the current function). ASSERT_EQ(g_resolution_count, 1); @@ -369,10 +368,10 @@ static void start_test_under_work_serializer(void* arg) { .LookupResolverFactory("dns"); absl::StatusOr uri = grpc_core::URI::Parse(res_cb_arg->uri_str); - gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", res_cb_arg->uri_str, - std::string(factory->scheme()).c_str()); + VLOG(2) << "test: '" << res_cb_arg->uri_str << "' should be valid for '" + << factory->scheme() << "'"; if (!uri.ok()) { - gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); + LOG(ERROR) << uri.status(); ASSERT_TRUE(uri.ok()); } grpc_core::ResolverArgs args; diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index e3650b05df0..14bb534ed43 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -20,13 +20,12 @@ #include #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" -#include - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" @@ -50,8 +49,8 @@ class TestResultHandler : public grpc_core::Resolver::ResultHandler { static void test_succeeds(grpc_core::ResolverFactory* factory, const char* string) { - gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, - std::string(factory->scheme()).c_str()); + VLOG(2) << "test: '" << string << "' should be valid for '" + << factory->scheme() << "'"; grpc_core::ExecCtx exec_ctx; absl::StatusOr uri = grpc_core::URI::Parse(string); if (!uri.ok()) { @@ -69,8 +68,8 @@ static void test_succeeds(grpc_core::ResolverFactory* factory, static void test_fails(grpc_core::ResolverFactory* factory, const char* string) { - gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, - std::string(factory->scheme()).c_str()); + VLOG(2) << "test: '" << string << "' should be invalid for '" + << factory->scheme() << "'"; grpc_core::ExecCtx exec_ctx; absl::StatusOr uri = grpc_core::URI::Parse(string); if (!uri.ok()) { diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc index 08bdab66f44..a4aa4bc068d 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -20,12 +20,11 @@ #include #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "gtest/gtest.h" -#include - #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/orphanable.h" @@ -47,12 +46,12 @@ class ResultHandler : public grpc_core::Resolver::ResultHandler { static void test_succeeds(grpc_core::ResolverFactory* factory, const char* string) { - gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, - std::string(factory->scheme()).c_str()); + VLOG(2) << "test: '" << string << "' should be valid for '" + << factory->scheme() << "'"; grpc_core::ExecCtx exec_ctx; absl::StatusOr uri = grpc_core::URI::Parse(string); if (!uri.ok()) { - gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); + LOG(ERROR) << uri.status().ToString(); ASSERT_TRUE(uri.ok()); } grpc_core::ResolverArgs args; @@ -70,12 +69,12 @@ static void test_succeeds(grpc_core::ResolverFactory* factory, static void test_fails(grpc_core::ResolverFactory* factory, const char* string) { - gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, - std::string(factory->scheme()).c_str()); + VLOG(2) << "test: '" << string << "' should be invalid for '" + << factory->scheme() << "'"; grpc_core::ExecCtx exec_ctx; absl::StatusOr uri = grpc_core::URI::Parse(string); if (!uri.ok()) { - gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); + LOG(ERROR) << uri.status().ToString(); ASSERT_TRUE(uri.ok()); } grpc_core::ResolverArgs args; diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc index e756040ec5c..ab1634c3775 100644 --- a/test/core/resource_quota/memory_quota_stress_test.cc +++ b/test/core/resource_quota/memory_quota_stress_test.cc @@ -25,13 +25,13 @@ #include #include "absl/base/thread_annotations.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include "gtest/gtest.h" #include #include -#include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -229,11 +229,10 @@ class StressTest { TEST(MemoryQuotaStressTest, MainTest) { if (sizeof(void*) != 8) { - gpr_log( - GPR_ERROR, - "This test assumes 64-bit processors in the values it uses for sizes. " - "Since this test is mostly aimed at TSAN coverage, and that's mostly " - "platform independent, we simply skip this test in 32-bit builds."); + LOG(ERROR) << "This test assumes 64-bit processors in the values it uses " + "for sizes. Since this test is mostly aimed at TSAN " + "coverage, and that's mostly platform independent, we simply " + "skip this test in 32-bit builds."; GTEST_SKIP(); } grpc_core::StressTest(16, 20).Run(8);