[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log (#36879)

[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 #36879

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36879 from tanvi-jagtap:test_folder_gpr_log 40eeeaf987
PiperOrigin-RevId: 643593896
pull/36912/head^2
Tanvi Jagtap 6 months ago committed by Copybara-Service
parent a82cba7150
commit b57c7e9fc3
  1. 4
      test/core/address_utils/parse_address_with_named_scope_id_test.cc
  2. 5
      test/core/client_channel/BUILD
  3. 3
      test/core/client_channel/client_channel_test.cc
  4. 2
      test/core/end2end/fixtures/http_proxy_fixture.cc
  5. 12
      test/core/iomgr/fd_posix_test.cc
  6. 10
      test/core/slice/slice_test.cc

@ -51,7 +51,7 @@ static void test_grpc_parse_ipv6_parity_with_getaddrinfo(
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(target); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(target);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;
@ -75,7 +75,7 @@ static void test_grpc_parse_ipv6_parity_with_getaddrinfo(
struct sockaddr_in6 resolve_with_gettaddrinfo(const char* uri_text) { struct sockaddr_in6 resolve_with_gettaddrinfo(const char* uri_text) {
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
EXPECT_TRUE(uri.ok()); EXPECT_TRUE(uri.ok());
} }
std::string host; std::string host;

@ -57,7 +57,10 @@ grpc_yodel_simple_test(
grpc_yodel_simple_test( grpc_yodel_simple_test(
name = "load_balanced_call_destination", name = "load_balanced_call_destination",
srcs = ["load_balanced_call_destination_test.cc"], srcs = ["load_balanced_call_destination_test.cc"],
external_deps = ["gtest"], external_deps = [
"absl/log:log",
"gtest",
],
deps = [ deps = [
"//:grpc_client_channel", "//:grpc_client_channel",
"//test/core/call/yodel:yodel_test", "//test/core/call/yodel:yodel_test",

@ -17,6 +17,7 @@
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include "absl/log/log.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
@ -118,7 +119,7 @@ class ClientChannelTest : public YodelTest {
RefCountedPtr<Subchannel> CreateSubchannel( RefCountedPtr<Subchannel> CreateSubchannel(
const grpc_resolved_address& address, const grpc_resolved_address& address,
const ChannelArgs& args) override { const ChannelArgs& args) override {
gpr_log(GPR_INFO, "CreateSubchannel: args=%s", args.ToString().c_str()); LOG(INFO) << "CreateSubchannel: args=" << args.ToString();
return Subchannel::Create(MakeOrphanable<TestConnector>(), address, args); return Subchannel::Create(MakeOrphanable<TestConnector>(), address, args);
} }
}; };

@ -208,7 +208,7 @@ static void on_read_request_done_locked(void* arg, grpc_error_handle error);
static void proxy_connection_failed(proxy_connection* conn, static void proxy_connection_failed(proxy_connection* conn,
failure_type failure, const char* prefix, failure_type failure, const char* prefix,
grpc_error_handle error) { grpc_error_handle error) {
gpr_log(GPR_INFO, "%s: %s", prefix, grpc_core::StatusToString(error).c_str()); LOG(INFO) << prefix << ": " << grpc_core::StatusToString(error);
// Decide whether we should shut down the client and server. // Decide whether we should shut down the client and server.
bool shutdown_client = false; bool shutdown_client = false;
bool shutdown_server = false; bool shutdown_server = false;

@ -164,8 +164,7 @@ static void session_read_cb(void* arg, // session
// before notify_on_read is called. // before notify_on_read is called.
grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure);
} else { } else {
grpc_core::Crash(absl::StrFormat("Unhandled read error %s", LOG(FATAL) << "Unhandled read error " << grpc_core::StrError(errno);
grpc_core::StrError(errno).c_str()));
} }
} }
} }
@ -330,8 +329,7 @@ static void client_session_write(void* arg, // client
} }
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
} else { } else {
grpc_core::Crash(absl::StrFormat("unknown errno %s", LOG(FATAL) << "unknown errno " << grpc_core::StrError(errno).c_str();
grpc_core::StrError(errno).c_str()));
} }
} }
@ -348,12 +346,10 @@ static void client_start(client* cl, int port) {
pfd.events = POLLOUT; pfd.events = POLLOUT;
pfd.revents = 0; pfd.revents = 0;
if (poll(&pfd, 1, -1) == -1) { if (poll(&pfd, 1, -1) == -1) {
gpr_log(GPR_ERROR, "poll() failed during connect; errno=%d", errno); LOG(FATAL) << "poll() failed during connect; errno=" << errno;
abort();
} }
} else { } else {
grpc_core::Crash( LOG(FATAL) << "Failed to connect to the server (errno=" << errno << ")";
absl::StrFormat("Failed to connect to the server (errno=%d)", errno));
} }
} }

@ -33,7 +33,6 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/memory.h"
@ -395,14 +394,19 @@ size_t SumSlice(const Slice& slice) {
TEST(SliceTest, ExternalAsOwned) { TEST(SliceTest, ExternalAsOwned) {
auto external_string = std::make_unique<std::string>(RandomString(1024)); auto external_string = std::make_unique<std::string>(RandomString(1024));
Slice slice = Slice::FromExternalString(*external_string); Slice slice = Slice::FromExternalString(*external_string);
const auto initial_sum = SumSlice(slice); const size_t initial_sum = SumSlice(slice);
Slice owned = slice.AsOwned(); Slice owned = slice.AsOwned();
EXPECT_EQ(initial_sum, SumSlice(owned)); EXPECT_EQ(initial_sum, SumSlice(owned));
external_string.reset(); external_string.reset();
// In ASAN (where we can be sure that it'll crash), go ahead and read the // In ASAN (where we can be sure that it'll crash), go ahead and read the
// bytes we just deleted. // bytes we just deleted.
if (BuiltUnderAsan()) { if (BuiltUnderAsan()) {
ASSERT_DEATH({ gpr_log(GPR_DEBUG, "%" PRIdPTR, SumSlice(slice)); }, ""); ASSERT_DEATH(
{
size_t sum = SumSlice(slice);
VLOG(2) << sum;
},
"");
} }
EXPECT_EQ(initial_sum, SumSlice(owned)); EXPECT_EQ(initial_sum, SumSlice(owned));
} }

Loading…
Cancel
Save