From ccfc163607a15faa16aea179e0a0ea673c2353c6 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 11 Jun 2024 17:20:09 -0700 Subject: [PATCH] [Gpr_To_Absl_Logging] Replace gpr_should_log with absl::MinLogLevel() (#36870) [Gpr_To_Absl_Logging] Replace gpr_should_log with absl::MinLogLevel() Closes #36870 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36870 from tanvi-jagtap:fix_tcp_windows_gpr_should_log_01 a04c0106b7d07e857a7a18bce29098c554bc0784 PiperOrigin-RevId: 642443074 --- src/core/BUILD | 1 + src/core/load_balancing/grpclb/grpclb.cc | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core/BUILD b/src/core/BUILD index 757aaad95b0..76d3eb99400 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -4870,6 +4870,7 @@ grpc_cc_library( "absl/container:inlined_vector", "absl/functional:function_ref", "absl/log:check", + "absl/log:globals", "absl/log:log", "absl/status", "absl/status:statusor", diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index 2437e964979..c7335c297da 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -73,6 +73,8 @@ #include "absl/container/inlined_vector.h" #include "absl/functional/function_ref.h" #include "absl/log/check.h" +#include "absl/log/globals.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -1162,13 +1164,12 @@ void GrpcLb::BalancerCallState::OnBalancerMessageReceivedLocked() { upb::Arena arena; if (!GrpcLbResponseParse(response_slice, arena.ptr(), &response) || (response.type == response.INITIAL && seen_initial_response_)) { - if (gpr_should_log(GPR_LOG_SEVERITY_ERROR)) { + if (absl::MinLogLevel() <= absl::LogSeverityAtLeast::kError) { char* response_slice_str = grpc_dump_slice(response_slice, GPR_DUMP_ASCII | GPR_DUMP_HEX); - gpr_log(GPR_ERROR, - "[grpclb %p] lb_calld=%p: Invalid LB response received: '%s'. " - "Ignoring.", - grpclb_policy(), this, response_slice_str); + LOG(ERROR) << "[grpclb " << grpclb_policy() << "] lb_calld=" << this + << ": Invalid LB response received: '" << response_slice_str + << "'. Ignoring."; gpr_free(response_slice_str); } } else {