From 905c2b25fcb47f129ce086d43cf27396fdc55337 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 11 Jun 2024 09:34:22 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Deleting all instances of gpr_set_log_verbosity (#36859) Deleting all instances of gpr_set_log_verbosity Closes #36859 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36859 from tanvi-jagtap:remove_gpr_set_log_verbosity_01 d7a74d06245bcfd7febfc72cbda3acca09003f8c PiperOrigin-RevId: 642297195 --- test/core/end2end/tests/no_logging.cc | 2 +- test/core/iomgr/timer_list_test.cc | 4 ++-- test/core/test_util/test_config.cc | 5 +++++ test/core/test_util/test_config.h | 3 +++ test/cpp/qps/driver.cc | 2 -- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index 52a11825d14..b84cb55b5bc 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -53,7 +53,7 @@ class Verifier { static_cast(GPR_LOG_SEVERITY_ERROR + 1); } grpc_tracer_set_enabled("all", 0); - gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); + grpc_set_absl_verbosity_debug(); gpr_set_log_function(DispatchLog); } ~Verifier() { diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 86223674e99..e3064c299ff 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -237,7 +237,7 @@ int main(int argc, char** argv) { grpc_core::ExecCtx exec_ctx; grpc_set_default_iomgr_platform(); grpc_iomgr_platform_init(); - gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); + grpc_set_absl_verbosity_debug(); add_test(); destruction_test(); grpc_iomgr_platform_shutdown(); @@ -256,7 +256,7 @@ int main(int argc, char** argv) { grpc_core::ExecCtx exec_ctx; grpc_set_default_iomgr_platform(); grpc_iomgr_platform_init(); - gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); + grpc_set_absl_verbosity_debug(); long_running_service_cleanup_test(); add_test(); destruction_test(); diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc index 2bc8a1861a9..8ddb3c9b3cc 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -138,6 +138,11 @@ void grpc_test_init(int* argc, char** argv) { srand(seed()); } +void grpc_set_absl_verbosity_debug() { + absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfo); + absl::SetVLogLevel("*grpc*/*", 2); +} + bool grpc_wait_until_shutdown(int64_t time_s) { gpr_timespec deadline = grpc_timeout_seconds_to_deadline(time_s); while (grpc_is_initialized()) { diff --git a/test/core/test_util/test_config.h b/test/core/test_util/test_config.h index 04876b7cf54..5fb385ce31c 100644 --- a/test/core/test_util/test_config.h +++ b/test/core/test_util/test_config.h @@ -49,6 +49,9 @@ void grpc_disable_all_absl_logs(void); // Returns if grpc is shutdown bool grpc_wait_until_shutdown(int64_t time_s); +// Sets absl verbosity via SetMinLogLevel and SetVLogLevel +void grpc_set_absl_verbosity_debug(void); + namespace grpc { namespace testing { diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index e8ee2da4539..d330fa9eb03 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -363,8 +363,6 @@ std::unique_ptr RunScenario( if (run_inproc) { g_inproc_servers = new std::vector; } - // Log everything from the driver - gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); // ClientContext allocations (all are destroyed at scope exit) list contexts;