From b90be935afcbc95a2e5ea1d95e84211b0aa3f644 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Mon, 13 May 2024 23:45:35 -0700 Subject: [PATCH 1/6] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log (#36595) [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 #36595 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36595 from tanvi-jagtap:regex_test_core_iomgr_transport b0836fda1c2aca0993891e0739ae99e7843fb767 PiperOrigin-RevId: 633456839 --- test/core/iomgr/endpoint_pair_test.cc | 4 +- test/core/iomgr/endpoint_tests.cc | 26 ++++---- test/core/iomgr/resolve_address_posix_test.cc | 17 +++--- test/core/iomgr/tcp_client_posix_test.cc | 24 ++++---- test/core/iomgr/tcp_server_posix_test.cc | 59 +++++++++---------- test/core/iomgr/timer_heap_test.cc | 9 +-- test/core/iomgr/timer_list_test.cc | 8 +-- test/core/memory_usage/callback_client.cc | 21 ++++--- test/core/memory_usage/callback_server.cc | 12 ++-- test/core/memory_usage/memory_usage_test.cc | 35 ++++++----- test/core/memory_usage/server.cc | 16 ++--- test/core/security/auth_context_test.cc | 8 +-- test/core/security/credentials_test.cc | 3 +- test/core/security/fetch_oauth2.cc | 37 +++++------- .../grpc_tls_certificate_verifier_test.cc | 5 +- test/core/security/secure_endpoint_test.cc | 5 +- test/core/security/security_connector_test.cc | 37 ++++++------ .../transport/binder/end2end/fake_binder.cc | 6 +- .../binder/end2end/fuzzers/fuzzer_utils.cc | 3 +- .../transport/chttp2/hpack_encoder_test.cc | 28 ++++----- .../remove_stream_from_stalled_lists_test.cc | 20 +++---- .../transport/chttp2/settings_timeout_test.cc | 16 ++--- .../transport/chttp2/too_many_pings_test.cc | 52 +++++++--------- .../core/transport/interception_chain_test.cc | 12 ++-- 24 files changed, 220 insertions(+), 243 deletions(-) diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index e60013802e8..9d77ee44fe9 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -23,11 +23,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include #include -#include #include #include "src/core/lib/channel/channel_args.h" @@ -146,7 +146,7 @@ static void destroy_pollset(void* p, grpc_error_handle /*error*/) { TEST(EndpointPairTest, MainTest) { #ifdef GPR_WINDOWS if (grpc_event_engine::experimental::UseEventEngineClient()) { - gpr_log(GPR_INFO, "Skipping pathological EventEngine test on Windows"); + LOG(INFO) << "Skipping pathological EventEngine test on Windows"; return; } #endif diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 696f58e0572..62be76971f6 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -23,10 +23,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include "src/core/lib/gpr/useful.h" @@ -74,7 +74,7 @@ size_t count_slices(grpc_slice* slices, size_t nslices, int* current_data) { static grpc_endpoint_test_fixture begin_test(grpc_endpoint_test_config config, const char* test_name, size_t slice_size) { - gpr_log(GPR_INFO, "%s/%s", test_name, config.name); + LOG(INFO) << test_name << "/" << config.name; return config.create_fixture(slice_size); } @@ -134,7 +134,7 @@ static void read_scheduler(void* data, grpc_error_handle /* error */) { static void read_and_write_test_read_handler_read_done( read_and_write_test_state* state, int read_done_state) { - gpr_log(GPR_DEBUG, "Read handler done"); + VLOG(2) << "Read handler done"; gpr_mu_lock(g_mu); state->read_done = read_done_state; GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); @@ -197,7 +197,7 @@ static void read_and_write_test_write_handler(void* data, } } - gpr_log(GPR_DEBUG, "Write handler done"); + VLOG(2) << "Write handler done"; gpr_mu_lock(g_mu); state->write_done = 1 + (error.ok()); GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); @@ -218,18 +218,14 @@ static void read_and_write_test(grpc_endpoint_test_config config, grpc_core::ExecCtx exec_ctx; auto deadline = grpc_core::Timestamp::FromTimespecRoundUp( grpc_timeout_seconds_to_deadline(300)); - gpr_log(GPR_DEBUG, - "num_bytes=%" PRIuPTR " write_size=%" PRIuPTR " slice_size=%" PRIuPTR - " shutdown=%d", - num_bytes, write_size, slice_size, shutdown); + VLOG(2) << "num_bytes=" << num_bytes << " write_size=" << write_size + << " slice_size=" << slice_size << " shutdown=" << shutdown; if (shutdown) { - gpr_log(GPR_INFO, "Start read and write shutdown test"); + LOG(INFO) << "Start read and write shutdown test"; } else { - gpr_log(GPR_INFO, - "Start read and write test with %" PRIuPTR - " bytes, slice size %" PRIuPTR, - num_bytes, slice_size); + LOG(INFO) << "Start read and write test with " << num_bytes + << " bytes, slice size " << slice_size; } state.read_ep = f.client_ep; @@ -265,9 +261,9 @@ static void read_and_write_test(grpc_endpoint_test_config config, grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read, /*urgent=*/false, /*min_progress_size=*/1); if (shutdown) { - gpr_log(GPR_DEBUG, "shutdown read"); + VLOG(2) << "shutdown read"; grpc_endpoint_shutdown(state.read_ep, GRPC_ERROR_CREATE("Test Shutdown")); - gpr_log(GPR_DEBUG, "shutdown write"); + VLOG(2) << "shutdown write"; grpc_endpoint_shutdown(state.write_ep, GRPC_ERROR_CREATE("Test Shutdown")); } grpc_core::ExecCtx::Get()->Flush(); diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 5a487cc4d7e..c0fb77e04d2 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -26,11 +26,11 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include #include -#include #include #include @@ -105,8 +105,7 @@ static void actually_poll(void* argsp) { break; } grpc_core::Duration time_left = deadline - grpc_core::Timestamp::Now(); - gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64, args->done, - time_left.millis()); + VLOG(2) << "done=" << args->done << ", time_left=" << time_left.millis(); ASSERT_GE(time_left, grpc_core::Duration::Zero()); grpc_pollset_worker* worker = nullptr; GRPC_LOG_IF_ERROR( @@ -158,23 +157,21 @@ static void test_named_and_numeric_scope_ids(void) { // system recognizes, and then use that for the test. for (size_t i = 1; i < 65536; i++) { if (if_indextoname(i, arbitrary_interface_name) != nullptr) { - gpr_log(GPR_DEBUG, - "Found interface at index %" PRIuPTR - " named %s. Will use this for the test", - i, arbitrary_interface_name); + VLOG(2) << "Found interface at index " << i << " named " + << arbitrary_interface_name << ". Will use this for the test"; interface_index = static_cast(i); break; } } ASSERT_GT(strlen(arbitrary_interface_name), 0); // Test resolution of an ipv6 address with a named scope ID - gpr_log(GPR_DEBUG, "test resolution with a named scope ID"); + VLOG(2) << "test resolution with a named scope ID"; std::string target_with_named_scope_id = absl::StrFormat("fe80::1234%%%s", arbitrary_interface_name); resolve_address_must_succeed(target_with_named_scope_id.c_str()); gpr_free(arbitrary_interface_name); // Test resolution of an ipv6 address with a numeric scope ID - gpr_log(GPR_DEBUG, "test resolution with a numeric scope ID"); + VLOG(2) << "test resolution with a numeric scope ID"; std::string target_with_numeric_scope_id = absl::StrFormat("fe80::1234%%%d", interface_index); resolve_address_must_succeed(target_with_numeric_scope_id.c_str()); @@ -194,7 +191,7 @@ TEST(ResolveAddressUsingAresResolverPosixTest, MainTest) { } else if (resolver_type == "ares") { overrides.dns_resolver = "ares"; } else { - gpr_log(GPR_ERROR, "--resolver was not set to ares or native"); + LOG(ERROR) << "--resolver was not set to ares or native"; ASSERT_TRUE(false); } grpc_core::ConfigVars::SetOverrides(overrides); diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index b2f37db2de1..f3f24b06303 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -36,9 +36,10 @@ #include #include +#include "absl/log/log.h" + #include #include -#include #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" @@ -88,7 +89,7 @@ static void must_fail(void* /*arg*/, grpc_error_handle error) { } void test_succeeds(void) { - gpr_log(GPR_ERROR, "---- starting test_succeeds() ----"); + LOG(ERROR) << "---- starting test_succeeds() ----"; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = reinterpret_cast(resolved_addr.addr); @@ -153,11 +154,11 @@ void test_succeeds(void) { // A cancellation attempt should fail because connect already succeeded. ASSERT_EQ(grpc_tcp_client_cancel_connect(connection_handle), false); - gpr_log(GPR_ERROR, "---- finished test_succeeds() ----"); + LOG(ERROR) << "---- finished test_succeeds() ----"; } void test_fails(void) { - gpr_log(GPR_ERROR, "---- starting test_fails() ----"); + LOG(ERROR) << "---- starting test_fails() ----"; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = reinterpret_cast(resolved_addr.addr); @@ -207,11 +208,11 @@ void test_fails(void) { // A cancellation attempt should fail because connect already failed. ASSERT_EQ(grpc_tcp_client_cancel_connect(connection_handle), false); - gpr_log(GPR_ERROR, "---- finished test_fails() ----"); + LOG(ERROR) << "---- finished test_fails() ----"; } void test_connect_cancellation_succeeds(void) { - gpr_log(GPR_ERROR, "---- starting test_connect_cancellation_succeeds() ----"); + LOG(ERROR) << "---- starting test_connect_cancellation_succeeds() ----"; auto target_ipv6_addr_uri = *grpc_core::URI::Parse(absl::StrCat( "ipv6:[::1]:", std::to_string(grpc_pick_unused_port_or_die()))); auto target_ipv4_addr_uri = *grpc_core::URI::Parse(absl::StrCat( @@ -242,9 +243,8 @@ void test_connect_cancellation_succeeds(void) { if (svr_fd >= 0) { close(svr_fd); } - gpr_log(GPR_ERROR, - "Skipping test. Failed to create a phony server bound to ipv6 or " - "ipv4 address"); + LOG(ERROR) << "Skipping test. Failed to create a phony server bound to " + "ipv6 or ipv4 address"; return; } } @@ -310,11 +310,11 @@ void test_connect_cancellation_succeeds(void) { close(sock); } close(svr_fd); - gpr_log(GPR_ERROR, "---- finished test_connect_cancellation_succeeds() ----"); + LOG(ERROR) << "---- finished test_connect_cancellation_succeeds() ----"; } void test_fails_bad_addr_no_leak(void) { - gpr_log(GPR_ERROR, "---- starting test_fails_bad_addr_no_leak() ----"); + LOG(ERROR) << "---- starting test_fails_bad_addr_no_leak() ----"; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = reinterpret_cast(resolved_addr.addr); @@ -355,7 +355,7 @@ void test_fails_bad_addr_no_leak(void) { gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - gpr_log(GPR_ERROR, "---- finished test_fails_bad_addr_no_leak() ----"); + LOG(ERROR) << "---- finished test_fails_bad_addr_no_leak() ----"; } static void destroy_pollset(void* p, grpc_error_handle /*error*/) { diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index e31f6c07ded..469d6990502 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -41,9 +41,10 @@ #include +#include "absl/log/log.h" + #include #include -#include #include #include @@ -59,7 +60,7 @@ #include "src/core/lib/resource_quota/api.h" #include "test/core/test_util/port.h" -#define LOG_TEST(x) gpr_log(GPR_INFO, "%s", #x) +#define LOG_TEST(x) LOG(INFO) << #x static gpr_mu* g_mu; static grpc_pollset* g_pollset; @@ -272,7 +273,7 @@ static grpc_error_handle tcp_connect(const test_addr* remote, const struct sockaddr* remote_addr = reinterpret_cast(remote->addr.addr); - gpr_log(GPR_INFO, "Connecting to %s", remote->str); + LOG(INFO) << "Connecting to " << remote->str; gpr_mu_lock(g_mu); nconnects_before = g_nconnects; on_connect_result_init(&g_result); @@ -281,14 +282,14 @@ static grpc_error_handle tcp_connect(const test_addr* remote, gpr_mu_unlock(g_mu); return GRPC_OS_ERROR(errno, "Failed to create socket"); } - gpr_log(GPR_DEBUG, "start connect to %s", remote->str); + VLOG(2) << "start connect to " << remote->str; if (connect(clifd, remote_addr, static_cast(remote->addr.len)) != 0) { gpr_mu_unlock(g_mu); close(clifd); return GRPC_OS_ERROR(errno, "connect"); } - gpr_log(GPR_DEBUG, "wait"); + VLOG(2) << "wait"; while (g_nconnects == nconnects_before && deadline > grpc_core::Timestamp::Now()) { grpc_pollset_worker* worker = nullptr; @@ -303,7 +304,7 @@ static grpc_error_handle tcp_connect(const test_addr* remote, gpr_mu_lock(g_mu); } - gpr_log(GPR_DEBUG, "wait done"); + VLOG(2) << "wait done"; if (g_nconnects != nconnects_before + 1) { gpr_mu_unlock(g_mu); close(clifd); @@ -313,8 +314,8 @@ static grpc_error_handle tcp_connect(const test_addr* remote, *result = g_result; gpr_mu_unlock(g_mu); - gpr_log(GPR_INFO, "Result (%d, %d) fd %d", result->port_index, - result->fd_index, result->server_fd); + LOG(INFO) << "Result (" << result->port_index << ", " << result->fd_index + << ") fd " << result->server_fd; grpc_tcp_server_unref(result->server); return absl::OkStatus(); } @@ -356,12 +357,10 @@ static void test_connect(size_t num_connects, server_weak_ref_init(&weak_ref); server_weak_ref_set(&weak_ref, s); LOG_TEST("test_connect"); - gpr_log(GPR_INFO, - "clients=%lu, num chan args=%lu, remote IP=%s, test_dst_addrs=%d", - static_cast(num_connects), - static_cast( - channel_args != nullptr ? channel_args->num_args : 0), - dst_addrs != nullptr ? "" : "::", test_dst_addrs); + LOG(INFO) << "clients=" << num_connects << ", num chan args=" + << (channel_args != nullptr ? channel_args->num_args : 0) + << ", remote IP=" << (dst_addrs != nullptr ? "" : "::") + << ", test_dst_addrs=" << test_dst_addrs; memset(&resolved_addr, 0, sizeof(resolved_addr)); memset(&resolved_addr1, 0, sizeof(resolved_addr1)); resolved_addr.len = static_cast(sizeof(struct sockaddr_storage)); @@ -370,13 +369,13 @@ static void test_connect(size_t num_connects, ASSERT_TRUE(GRPC_LOG_IF_ERROR( "grpc_tcp_server_add_port", grpc_tcp_server_add_port(s, &resolved_addr, &svr_port))); - gpr_log(GPR_INFO, "Allocated port %d", svr_port); + LOG(INFO) << "Allocated port " << svr_port; ASSERT_GT(svr_port, 0); // Cannot use wildcard (port==0), because add_port() will try to reuse the // same port as a previous add_port(). svr1_port = grpc_pick_unused_port_or_die(); ASSERT_GT(svr1_port, 0); - gpr_log(GPR_INFO, "Picked unused port %d", svr1_port); + LOG(INFO) << "Picked unused port " << svr1_port; grpc_sockaddr_set_port(&resolved_addr1, svr1_port); ASSERT_EQ(grpc_tcp_server_add_port(s, &resolved_addr1, &port), absl::OkStatus()); @@ -410,8 +409,7 @@ static void test_connect(size_t num_connects, on_connect_result result; grpc_error_handle err; if (dst.addr.len == 0) { - gpr_log(GPR_DEBUG, "Skipping test of non-functional local IP %s", - dst.str); + VLOG(2) << "Skipping test of non-functional local IP " << dst.str; continue; } ASSERT_TRUE(grpc_sockaddr_set_port(&dst.addr, ports[port_num])); @@ -422,8 +420,8 @@ static void test_connect(size_t num_connects, result.server_fd >= 0 && result.server == s) { continue; } - gpr_log(GPR_ERROR, "Failed to connect to %s: %s", dst.str, - grpc_core::StatusToString(err).c_str()); + LOG(ERROR) << "Failed to connect to " << dst.str << ": " + << grpc_core::StatusToString(err); ASSERT_TRUE(test_dst_addrs); dst_addrs->addrs[dst_idx].addr.len = 0; } @@ -444,8 +442,9 @@ static void test_connect(size_t num_connects, 0); ASSERT_LE(dst.addr.len, sizeof(dst.addr.addr)); test_addr_init_str(&dst); - gpr_log(GPR_INFO, "(%d, %d) fd %d family %s listening on %s", port_num, - fd_num, fd, sock_family_name(addr->ss_family), dst.str); + LOG(INFO) << "(" << port_num << ", " << fd_num << ") fd " << fd + << " family " << sock_family_name(addr->ss_family) + << " listening on " << dst.str; for (connect_num = 0; connect_num < num_connects; ++connect_num) { on_connect_result result; on_connect_result_init(&result); @@ -482,7 +481,7 @@ static int pre_allocate_inet_sock(grpc_tcp_server* s, int family, int port, int pre_fd = socket(address.sin6_family, SOCK_STREAM, 0); if (pre_fd < 0) { - gpr_log(GPR_ERROR, "Unable to create inet socket: %m"); + LOG(ERROR) << "Unable to create inet socket: %m"; return -1; } @@ -492,13 +491,13 @@ static int pre_allocate_inet_sock(grpc_tcp_server* s, int family, int port, int b = bind(pre_fd, reinterpret_cast(&address), sizeof(address)); if (b < 0) { - gpr_log(GPR_ERROR, "Unable to bind inet socket: %m"); + LOG(ERROR) << "Unable to bind inet socket: %m"; return -1; } int l = listen(pre_fd, SOMAXCONN); if (l < 0) { - gpr_log(GPR_ERROR, "Unable to listen on inet socket: %m"); + LOG(ERROR) << "Unable to listen on inet socket: %m"; return -1; } @@ -587,20 +586,20 @@ static int pre_allocate_unix_sock(grpc_tcp_server* s, const char* path, int pre_fd = socket(address.sun_family, SOCK_STREAM, 0); if (pre_fd < 0) { - gpr_log(GPR_ERROR, "Unable to create unix socket: %m"); + LOG(ERROR) << "Unable to create unix socket: %m"; return -1; } int b = bind(pre_fd, reinterpret_cast(&address), sizeof(address)); if (b < 0) { - gpr_log(GPR_ERROR, "Unable to bind unix socket: %m"); + LOG(ERROR) << "Unable to bind unix socket: %m"; return -1; } int l = listen(pre_fd, SOMAXCONN); if (l < 0) { - gpr_log(GPR_ERROR, "Unable to listen on unix socket: %m"); + LOG(ERROR) << "Unable to listen on unix socket: %m"; return -1; } @@ -679,8 +678,8 @@ static void test_pre_allocated_unix_fd() { // If the path no longer exists, errno is 2. This can happen when // runninig the test multiple times in parallel. Do not fail the test if (absl::IsUnknown(res_conn) && res_conn.raw_code() == 2) { - gpr_log(GPR_ERROR, - "Unable to test pre_allocated unix socket: path does not exist"); + LOG(ERROR) + << "Unable to test pre_allocated unix socket: path does not exist"; grpc_tcp_server_unref(s); close(pre_fd); return; diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index 3cb7a4c7360..9fef72bebe0 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -23,8 +23,9 @@ #include +#include "absl/log/log.h" + #include -#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/crash.h" @@ -77,7 +78,7 @@ static void test1(void) { grpc_timer* test_elements = create_test_elements(num_test_elements); uint8_t* inpq = static_cast(gpr_malloc(num_test_elements)); - gpr_log(GPR_INFO, "test1"); + LOG(INFO) << "test1"; grpc_timer_heap_init(&pq); memset(inpq, 0, num_test_elements); @@ -156,7 +157,7 @@ static elem_struct* search_elems(elem_struct* elems, size_t count, } static void test2(void) { - gpr_log(GPR_INFO, "test2"); + LOG(INFO) << "test2"; grpc_timer_heap pq; @@ -227,7 +228,7 @@ static void test2(void) { } static void shrink_test(void) { - gpr_log(GPR_INFO, "shrink_test"); + LOG(INFO) << "shrink_test"; grpc_timer_heap pq; size_t i; diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index ea48b8b1f5f..aa1d545bea7 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -22,9 +22,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/crash.h" @@ -54,7 +54,7 @@ static void add_test(void) { grpc_timer timers[20]; grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_INFO, "add_test"); + LOG(INFO) << "add_test"; grpc_timer_list_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); @@ -122,7 +122,7 @@ void destruction_test(void) { grpc_timer timers[5]; grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_INFO, "destruction_test"); + LOG(INFO) << "destruction_test"; grpc_core::ExecCtx::Get()->TestOnlySetNow( grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch(0)); @@ -179,7 +179,7 @@ void long_running_service_cleanup_test(void) { grpc_timer timers[4]; grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_INFO, "long_running_service_cleanup_test"); + LOG(INFO) << "long_running_service_cleanup_test"; grpc_core::Timestamp now = grpc_core::Timestamp::Now(); CHECK(now.milliseconds_after_process_epoch() >= k25Days.millis()); diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc index ad806559f86..9444d090c4a 100644 --- a/test/core/memory_usage/callback_client.cc +++ b/test/core/memory_usage/callback_client.cc @@ -28,11 +28,11 @@ #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 "absl/strings/str_cat.h" #include -#include #include #include #include @@ -55,7 +55,7 @@ std::shared_ptr CreateChannelForTest(int index) { grpc::InsecureChannelCredentials(); if (absl::GetFlag(FLAGS_secure)) { // TODO (chennancy) Add in secure credentials - gpr_log(GPR_INFO, "Supposed to be secure, is not yet"); + LOG(INFO) << "Supposed to be secure, is not yet"; } // Channel args to prevent connection from closing after RPC is done @@ -91,7 +91,7 @@ std::shared_ptr UnaryCall(std::shared_ptr channel) { ¶ms->response, [params](const grpc::Status& status) { if (!status.ok()) { - gpr_log(GPR_ERROR, "UnaryCall RPC failed."); + LOG(ERROR) << "UnaryCall RPC failed."; } params->done.Notify(); }); @@ -111,11 +111,10 @@ std::shared_ptr GetBeforeSnapshot( [params, &before_server_memory](const grpc::Status& status) { if (status.ok()) { before_server_memory = params->snapshot_response.rss(); - gpr_log(GPR_INFO, "Server Before RPC: %ld", - params->snapshot_response.rss()); - gpr_log(GPR_INFO, "GetBeforeSnapshot succeeded."); + LOG(INFO) << "Server Before RPC: " << params->snapshot_response.rss(); + LOG(INFO) << "GetBeforeSnapshot succeeded."; } else { - gpr_log(GPR_ERROR, "GetBeforeSnapshot failed."); + LOG(ERROR) << "GetBeforeSnapshot failed."; } params->done.Notify(); }); @@ -129,11 +128,11 @@ int main(int argc, char** argv) { fake_argv[0] = argv[0]; grpc::testing::TestEnvironment env(&argc, argv); if (absl::GetFlag(FLAGS_target).empty()) { - gpr_log(GPR_ERROR, "Client: No target port entered"); + LOG(ERROR) << "Client: No target port entered"; return 1; } - gpr_log(GPR_INFO, "Client Target: %s", absl::GetFlag(FLAGS_target).c_str()); - gpr_log(GPR_INFO, "Client Size: %d", absl::GetFlag(FLAGS_size)); + LOG(INFO) << "Client Target: " << absl::GetFlag(FLAGS_target); + LOG(INFO) << "Client Size: " << absl::GetFlag(FLAGS_size); // Getting initial memory usage std::shared_ptr get_memory_channel = CreateChannelForTest(0); @@ -182,6 +181,6 @@ int main(int argc, char** argv) { static_cast(peak_server_memory - before_server_memory) / size * 1024); } - gpr_log(GPR_INFO, "Client Done"); + LOG(INFO) << "Client Done"; return 0; } diff --git a/test/core/memory_usage/callback_server.cc b/test/core/memory_usage/callback_server.cc index a00fc9e4125..7fddbba79a6 100644 --- a/test/core/memory_usage/callback_server.cc +++ b/test/core/memory_usage/callback_server.cc @@ -25,8 +25,8 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include #include @@ -60,7 +60,7 @@ class ServerCallbackImpl final grpc::CallbackServerContext* context, const grpc::testing::SimpleRequest* /* request */, grpc::testing::MemorySize* response) override { - gpr_log(GPR_INFO, "BeforeSnapshot RPC CALL RECEIVED"); + LOG(INFO) << "BeforeSnapshot RPC CALL RECEIVED"; response->set_rss(before_server_create); auto* reactor = context->DefaultReactor(); reactor->Finish(grpc::Status::OK); @@ -85,10 +85,10 @@ int main(int argc, char** argv) { signal(SIGINT, sigint_handler); std::string server_address = absl::GetFlag(FLAGS_bind); if (server_address.empty()) { - gpr_log(GPR_ERROR, "Server: No port entered"); + LOG(ERROR) << "Server: No port entered"; return 1; } - gpr_log(GPR_INFO, "Server port: %s", server_address.c_str()); + LOG(INFO) << "Server port: " << server_address; // Get initial process memory usage before creating server long before_server_create = GetMemUsage(); @@ -103,7 +103,7 @@ int main(int argc, char** argv) { std::shared_ptr creds = grpc::InsecureServerCredentials(); if (absl::GetFlag(FLAGS_secure)) { - gpr_log(GPR_INFO, "Supposed to be secure, is not yet"); + LOG(INFO) << "Supposed to be secure, is not yet"; // TODO (chennancy) Add in secure credentials } builder->AddListeningPort(server_address, creds); @@ -111,7 +111,7 @@ int main(int argc, char** argv) { // Set up the server to start accepting requests. std::shared_ptr server(builder->BuildAndStart()); - gpr_log(GPR_INFO, "Server listening on %s", server_address.c_str()); + LOG(INFO) << "Server listening on " << server_address; // Keep the program running until the server shuts down. server->Wait(); diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index 2bc0f7d6128..70617c5bb36 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_test.cc @@ -32,6 +32,7 @@ #include "absl/algorithm/container.h" #include "absl/flags/flag.h" #include "absl/flags/parse.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" @@ -39,7 +40,6 @@ #include "google/protobuf/wrappers.pb.h" #include -#include #include #include #include @@ -102,7 +102,7 @@ int RunCallBenchmark(int port, char* root, int status; // start the server - gpr_log(GPR_INFO, "starting server"); + LOG(INFO) << "starting server"; std::vector server_flags = { absl::StrCat(root, "/memory_usage_server", gpr_subprocess_binary_extension()), @@ -113,14 +113,14 @@ int RunCallBenchmark(int port, char* root, // Add scenario-specific server flags to the end of the server_flags absl::c_move(server_scenario_flags, std::back_inserter(server_flags)); Subprocess svr(server_flags); - gpr_log(GPR_INFO, "server started, pid %d", svr.GetPID()); + LOG(INFO) << "server started, pid " << svr.GetPID(); // Wait one second before starting client to give the server a chance // to start up. gpr_sleep_until(grpc_timeout_seconds_to_deadline(1)); // start the client - gpr_log(GPR_INFO, "starting client"); + LOG(INFO) << "starting client"; std::vector client_flags = { absl::StrCat(root, "/memory_usage_client", gpr_subprocess_binary_extension()), @@ -135,7 +135,7 @@ int RunCallBenchmark(int port, char* root, // Add scenario-specific client flags to the end of the client_flags absl::c_move(client_scenario_flags, std::back_inserter(client_flags)); Subprocess cli(client_flags); - gpr_log(GPR_INFO, "client started, pid %d", cli.GetPID()); + LOG(INFO) << "client started, pid " << cli.GetPID(); // wait for completion if ((status = cli.Join()) != 0) { printf("client failed with: %d", status); @@ -154,14 +154,14 @@ int RunChannelBenchmark(const std::vector& server_ports, char* root) { std::vector servers; servers.reserve(server_ports.size()); for (int port : server_ports) { - gpr_log(GPR_INFO, "starting server on port %d", port); + LOG(INFO) << "starting server on port " << port; std::vector server_flags = { absl::StrCat(root, "/memory_usage_callback_server", gpr_subprocess_binary_extension()), "--bind", grpc_core::LocalIpAndPort(port)}; if (absl::GetFlag(FLAGS_use_xds)) server_flags.emplace_back("--use_xds"); servers.emplace_back(server_flags); - gpr_log(GPR_INFO, "server started, pid %d", servers.back().GetPID()); + LOG(INFO) << "server started, pid " << servers.back().GetPID(); } // Wait one second before starting client to avoid possible race condition @@ -169,7 +169,7 @@ int RunChannelBenchmark(const std::vector& server_ports, char* root) { gpr_sleep_until(grpc_timeout_seconds_to_deadline(1)); // start the client - gpr_log(GPR_INFO, "starting client"); + LOG(INFO) << "starting client"; std::vector client_flags = { absl::StrCat(root, "/memory_usage_callback_client", gpr_subprocess_binary_extension()), @@ -183,7 +183,7 @@ int RunChannelBenchmark(const std::vector& server_ports, char* root) { absl::StrCat("--server_pid=", servers[0].GetPID())); } Subprocess cli(client_flags); - gpr_log(GPR_INFO, "client started, pid %d", cli.GetPID()); + LOG(INFO) << "client started, pid " << cli.GetPID(); // wait for completion int retval = cli.Join(); if (retval != 0) { @@ -206,7 +206,7 @@ XdsServer StartXdsServerAndConfigureBootstrap( const std::vector& server_ports) { XdsServer xds_server; int xds_server_port = grpc_pick_unused_port_or_die(); - gpr_log(GPR_INFO, "xDS server port: %d", xds_server_port); + LOG(INFO) << "xDS server port: " << xds_server_port; // Generate xDS bootstrap and set the env var. std::string bootstrap = grpc::testing::XdsBootstrapBuilder() @@ -214,7 +214,7 @@ XdsServer StartXdsServerAndConfigureBootstrap( .SetXdsChannelCredentials("insecure") .Build(); grpc_core::SetEnv("GRPC_XDS_BOOTSTRAP_CONFIG", bootstrap); - gpr_log(GPR_INFO, "xDS bootstrap: %s", bootstrap.c_str()); + LOG(INFO) << "xDS bootstrap: " << bootstrap; // Create ADS service. xds_server.ads_service = std::make_shared(); xds_server.ads_service->Start(); @@ -241,28 +241,27 @@ XdsServer StartXdsServerAndConfigureBootstrap( {XdsResourceUtils::EdsResourceArgs::Locality( "here", std::move(endpoints))}))); // Create and start server. - gpr_log(GPR_INFO, "starting xDS server..."); + LOG(INFO) << "starting xDS server..."; grpc::ServerBuilder builder; builder.RegisterService(xds_server.ads_service.get()); builder.AddListeningPort(absl::StrCat("localhost:", xds_server_port), grpc::InsecureServerCredentials()); xds_server.server = builder.BuildAndStart(); - gpr_log(GPR_INFO, "xDS server started"); + LOG(INFO) << "xDS server started"; return xds_server; } int RunBenchmark(char* root, absl::string_view benchmark, std::vector server_scenario_flags, std::vector client_scenario_flags) { - gpr_log(GPR_INFO, "running benchmark: %s", std::string(benchmark).c_str()); + LOG(INFO) << "running benchmark: " << benchmark; const size_t num_ports = benchmark == "channel_multi_address" ? 10 : 1; std::vector server_ports; server_ports.reserve(num_ports); for (size_t i = 0; i < num_ports; ++i) { server_ports.push_back(grpc_pick_unused_port_or_die()); } - gpr_log(GPR_INFO, "server ports: %s", - absl::StrJoin(server_ports, ",").c_str()); + LOG(INFO) << "server ports: " << absl::StrJoin(server_ports, ","); XdsServer xds_server; if (absl::GetFlag(FLAGS_use_xds)) { xds_server = StartXdsServerAndConfigureBootstrap(server_ports); @@ -274,11 +273,11 @@ int RunBenchmark(char* root, absl::string_view benchmark, } else if (benchmark == "channel" || benchmark == "channel_multi_address") { retval = RunChannelBenchmark(server_ports, root); } else { - gpr_log(GPR_INFO, "Not a valid benchmark name"); + LOG(INFO) << "Not a valid benchmark name"; retval = 4; } if (xds_server.server != nullptr) xds_server.server->Shutdown(); - gpr_log(GPR_INFO, "done running benchmark"); + LOG(INFO) << "done running benchmark"; return retval; } diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc index 60f6ed4cada..b071f62cf38 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -34,6 +34,7 @@ #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include @@ -44,7 +45,6 @@ #include #include #include -#include #include #include "src/core/lib/channel/channel_args.h" @@ -93,7 +93,7 @@ static fling_call calls[1000006]; static void request_call_unary(int call_idx) { if (call_idx == static_cast(sizeof(calls) / sizeof(fling_call))) { - gpr_log(GPR_INFO, "Used all call slots (10000) on server. Server exit."); + LOG(INFO) << "Used all call slots (10000) on server. Server exit."; _exit(0); } grpc_metadata_array_init(&calls[call_idx].request_metadata_recv); @@ -138,7 +138,7 @@ static void send_snapshot(void* tag, MemStats* snapshot) { op++; op->op = GRPC_OP_SEND_MESSAGE; if (payload_buffer == nullptr) { - gpr_log(GPR_INFO, "NULL payload buffer !!!"); + LOG(INFO) << "NULL payload buffer !!!"; } op->data.send_message.send_message = payload_buffer; op++; @@ -164,8 +164,8 @@ static void OnServingStatusUpdate(void* /*user_data*/, const char* uri, grpc_serving_status_update update) { absl::Status status(static_cast(update.code), update.error_message); - gpr_log(GPR_INFO, "xDS serving status notification: uri=\"%s\", status=%s", - uri, status.ToString().c_str()); + LOG(INFO) << "xDS serving status notification: uri=\"" << uri + << "\", status=" << status; } int main(int argc, char** argv) { @@ -189,7 +189,7 @@ int main(int argc, char** argv) { if (addr.empty()) { addr = grpc_core::JoinHostPort("::", grpc_pick_unused_port_or_die()); } - gpr_log(GPR_INFO, "creating server on: %s", addr.c_str()); + LOG(INFO) << "creating server on: " << addr; cq = grpc_completion_queue_create_for_next(nullptr); @@ -253,7 +253,7 @@ int main(int argc, char** argv) { while (!shutdown_finished) { if (got_sigint && !shutdown_started) { - gpr_log(GPR_INFO, "Shutting down due to SIGINT"); + LOG(INFO) << "Shutting down due to SIGINT"; shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr); grpc_server_shutdown_and_notify(server, shutdown_cq, tag(1000)); @@ -301,7 +301,7 @@ int main(int argc, char** argv) { current_snapshot = MemStats::Snapshot(); send_snapshot(s, ¤t_snapshot); } else { - gpr_log(GPR_ERROR, "Wrong call method"); + LOG(ERROR) << "Wrong call method"; } break; case FLING_SERVER_SEND_INIT_METADATA: diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index 32bf2304720..91ffb67f2b3 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -20,7 +20,7 @@ #include -#include +#include "absl/log/log.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/crash.h" @@ -33,7 +33,7 @@ TEST(AuthContextTest, EmptyContext) { grpc_core::MakeRefCounted(nullptr); grpc_auth_property_iterator it; - gpr_log(GPR_INFO, "test_empty_context"); + LOG(INFO) << "test_empty_context"; ASSERT_NE(ctx, nullptr); ASSERT_EQ(grpc_auth_context_peer_identity_property_name(ctx.get()), nullptr); it = grpc_auth_context_peer_identity(ctx.get()); @@ -54,7 +54,7 @@ TEST(AuthContextTest, SimpleContext) { grpc_auth_property_iterator it; size_t i; - gpr_log(GPR_INFO, "test_simple_context"); + LOG(INFO) << "test_simple_context"; ASSERT_NE(ctx, nullptr); grpc_auth_context_add_cstring_property(ctx.get(), "name", "chapi"); grpc_auth_context_add_cstring_property(ctx.get(), "name", "chapo"); @@ -94,7 +94,7 @@ TEST(AuthContextTest, ChainedContext) { grpc_auth_property_iterator it; size_t i; - gpr_log(GPR_INFO, "test_chained_context"); + LOG(INFO) << "test_chained_context"; grpc_auth_context_add_cstring_property(chained_ptr, "name", "padapo"); grpc_auth_context_add_cstring_property(chained_ptr, "foo", "baz"); grpc_auth_context_add_cstring_property(ctx.get(), "name", "chapi"); diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 81017be9aa8..ed7052922c8 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -27,6 +27,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -2011,7 +2012,7 @@ void auth_metadata_context_build(const char* url_scheme, char* service_url = nullptr; grpc_auth_metadata_context_reset(auth_md_context); if (last_slash == nullptr) { - gpr_log(GPR_ERROR, "No '/' found in fully qualified method name"); + LOG(ERROR) << "No '/' found in fully qualified method name"; service[0] = '\0'; method_name = gpr_strdup(""); } else if (last_slash == service) { diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index 355b368d2ca..8faad222de3 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -20,13 +20,13 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include #include #include #include -#include #include #include @@ -44,7 +44,7 @@ static grpc_call_credentials* create_sts_creds(const char* json_file_path) { if (strlen(json_file_path) == 0) { auto status = grpc::experimental::StsCredentialsOptionsFromEnv(&options); if (!status.ok()) { - gpr_log(GPR_ERROR, "%s", status.error_message().c_str()); + LOG(ERROR) << status.error_message(); return nullptr; } } else { @@ -53,7 +53,7 @@ static grpc_call_credentials* create_sts_creds(const char* json_file_path) { auto status = grpc::experimental::StsCredentialsOptionsFromJson(sts_options, &options); if (!status.ok()) { - gpr_log(GPR_ERROR, "%s", status.error_message().c_str()); + LOG(ERROR) << status.error_message(); return nullptr; } } @@ -97,46 +97,41 @@ int main(int argc, char** argv) { if (json_sts_options_file_path != nullptr && json_refresh_token_file_path != nullptr) { - gpr_log( - GPR_ERROR, - "--json_sts_options and --json_refresh_token are mutually exclusive."); + LOG(ERROR) << "--json_sts_options and --json_refresh_token are mutually " + "exclusive."; exit(1); } if (use_gce) { if (json_sts_options_file_path != nullptr || json_refresh_token_file_path != nullptr) { - gpr_log(GPR_INFO, - "Ignoring json refresh token or sts options to get a token from " - "the GCE metadata server."); + LOG(INFO) + << "Ignoring json refresh token or sts options to get a token from " + "the GCE metadata server."; } creds = grpc_google_compute_engine_credentials_create(nullptr); if (creds == nullptr) { - gpr_log(GPR_ERROR, "Could not create gce credentials."); + LOG(ERROR) << "Could not create gce credentials."; exit(1); } } else if (json_refresh_token_file_path != nullptr) { creds = create_refresh_token_creds(json_refresh_token_file_path); if (creds == nullptr) { - gpr_log(GPR_ERROR, - "Could not create refresh token creds. %s does probably not " - "contain a valid json refresh token.", - json_refresh_token_file_path); + LOG(ERROR) << "Could not create refresh token creds. " + << json_refresh_token_file_path + << " does probably not contain a valid json refresh token."; exit(1); } } else if (json_sts_options_file_path != nullptr) { creds = create_sts_creds(json_sts_options_file_path); if (creds == nullptr) { - gpr_log(GPR_ERROR, - "Could not create sts creds. %s does probably not contain a " - "valid json for sts options.", - json_sts_options_file_path); + LOG(ERROR) << "Could not create sts creds. " << json_sts_options_file_path + << " does probably not contain a valid json for sts options."; exit(1); } } else { - gpr_log( - GPR_ERROR, - "Missing --gce, --json_sts_options, or --json_refresh_token option."); + LOG(ERROR) + << "Missing --gce, --json_sts_options, or --json_refresh_token option."; exit(1); } CHECK_NE(creds, nullptr); diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc index 3a74c6453e1..80bb29ab851 100644 --- a/test/core/security/grpc_tls_certificate_verifier_test.cc +++ b/test/core/security/grpc_tls_certificate_verifier_test.cc @@ -22,8 +22,9 @@ #include #include +#include "absl/log/log.h" + #include -#include #include #include "src/core/lib/gpr/tmpfile.h" @@ -107,7 +108,7 @@ TEST_F(GrpcTlsCertificateVerifierTest, AsyncExternalVerifierFails) { EXPECT_FALSE(core_external_verifier.Verify( &request_, [&callback_completed_event](absl::Status async_status) { - gpr_log(GPR_INFO, "Callback is invoked."); + LOG(INFO) << "Callback is invoked."; EXPECT_EQ(async_status.code(), absl::StatusCode::kUnauthenticated); EXPECT_EQ(async_status.ToString(), "UNAUTHENTICATED: AsyncExternalVerifier failed"); diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index b05e6a63094..80a4af278dc 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -23,9 +23,10 @@ #include +#include "absl/log/log.h" + #include #include -#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/crash.h" @@ -281,7 +282,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_core::ExecCtx exec_ctx; int n = 0; grpc_closure done_closure; - gpr_log(GPR_INFO, "Start test left over"); + LOG(INFO) << "Start test left over"; grpc_slice_buffer_init(&incoming); GRPC_CLOSURE_INIT(&done_closure, inc_call_ctr, &n, grpc_schedule_on_exec_ctx); diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 0ea79680154..db024f79ff5 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -23,10 +23,11 @@ #include +#include "absl/log/log.h" + #include #include #include -#include #include #include "src/core/lib/config/config_vars.h" @@ -83,17 +84,16 @@ static int check_property(const grpc_auth_context* ctx, grpc_auth_context_find_properties_by_name(ctx, expected_property_name); const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); if (prop == nullptr) { - gpr_log(GPR_ERROR, "Expected value %s not found.", expected_property_value); + LOG(ERROR) << "Expected value " << expected_property_value << " not found."; return 0; } if (strncmp(prop->value, expected_property_value, prop->value_length) != 0) { - gpr_log(GPR_ERROR, "Expected value %s and got %s for property %s.", - expected_property_value, prop->value, expected_property_name); + LOG(ERROR) << "Expected value " << expected_property_value << " and got " + << prop->value << " for property " << expected_property_name; return 0; } if (grpc_auth_property_iterator_next(&it) != nullptr) { - gpr_log(GPR_ERROR, "Expected only one property for %s.", - expected_property_name); + LOG(ERROR) << "Expected only one property for " << expected_property_name; return 0; } return 1; @@ -107,24 +107,23 @@ static int check_properties( for (const auto& property_value : expected_property_values) { const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); if (prop == nullptr) { - gpr_log(GPR_ERROR, "Expected value %s not found.", - property_value.c_str()); + LOG(ERROR) << "Expected value " << property_value << " not found."; return 0; } if (strcmp(prop->name, expected_property_name) != 0) { - gpr_log(GPR_ERROR, "Expected peer property name %s and got %s.", - expected_property_name, prop->name); + LOG(ERROR) << "Expected peer property name " << expected_property_name + << " and got " << prop->name; return 0; } if (strncmp(prop->value, property_value.c_str(), prop->value_length) != 0) { - gpr_log(GPR_ERROR, "Expected peer property value %s and got %s.", - property_value.c_str(), prop->value); + LOG(ERROR) << "Expected peer property value " << property_value + << " and got " << prop->value; return 0; } } if (grpc_auth_property_iterator_next(&it) != nullptr) { - gpr_log(GPR_ERROR, "Expected only %zu property values.", - expected_property_values.size()); + LOG(ERROR) << "Expected only " << expected_property_values.size() + << " property values."; return 0; } return 1; @@ -140,20 +139,20 @@ static int check_spiffe_id(const grpc_auth_context* ctx, return 1; } if (prop != nullptr && !expect_spiffe_id) { - gpr_log(GPR_ERROR, "SPIFFE ID not expected, but got %s.", prop->value); + LOG(ERROR) << "SPIFFE ID not expected, but got " << prop->value; return 0; } if (prop == nullptr && expect_spiffe_id) { - gpr_log(GPR_ERROR, "SPIFFE ID expected, but got nullptr."); + LOG(ERROR) << "SPIFFE ID expected, but got nullptr."; return 0; } if (strncmp(prop->value, expected_spiffe_id, prop->value_length) != 0) { - gpr_log(GPR_ERROR, "Expected SPIFFE ID %s but got %s.", expected_spiffe_id, - prop->value); + LOG(ERROR) << "Expected SPIFFE ID " << expected_spiffe_id << " but got " + << prop->value; return 0; } if (grpc_auth_property_iterator_next(&it) != nullptr) { - gpr_log(GPR_ERROR, "Expected only one property for SPIFFE ID."); + LOG(ERROR) << "Expected only one property for SPIFFE ID."; return 0; } return 1; diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc index 5dc25e842c5..bc132e8fe07 100644 --- a/test/core/transport/binder/end2end/fake_binder.cc +++ b/test/core/transport/binder/end2end/fake_binder.cc @@ -17,7 +17,7 @@ #include #include -#include +#include "absl/log/log.h" #include "src/core/lib/gprpp/crash.h" @@ -173,10 +173,10 @@ void TransactionProcessor::SetDelay(absl::Duration delay) { void TransactionProcessor::Terminate() { if (!terminated_.load(std::memory_order_seq_cst)) { - gpr_log(GPR_INFO, "Terminating the processor"); + LOG(INFO) << "Terminating the processor"; terminated_.store(true, std::memory_order_seq_cst); tx_thread_.Join(); - gpr_log(GPR_INFO, "Processor terminated"); + LOG(INFO) << "Processor terminated"; } } diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc index 74d9f65665e..11609ac92f8 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc @@ -15,6 +15,7 @@ #include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h" #include "absl/log/check.h" +#include "absl/log/log.h" namespace grpc_binder { namespace fuzzing { @@ -139,7 +140,7 @@ TransactionReceiverForFuzzing::TransactionReceiverForFuzzing( binder_transport_fuzzer::IncomingParcels incoming_parcels, grpc_core::RefCountedPtr wire_reader_ref, TransactionReceiver::OnTransactCb cb) { - gpr_log(GPR_INFO, "Construct TransactionReceiverForFuzzing"); + LOG(INFO) << "Construct TransactionReceiverForFuzzing"; CreateFuzzingThread(FuzzingLoop, std::move(incoming_parcels), std::move(wire_reader_ref), std::move(cb)); } diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 2f3127a501d..28668b730da 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -24,12 +24,12 @@ #include #include +#include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include #include -#include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -93,37 +93,37 @@ static void verify_frames(grpc_slice_buffer& output, bool header_is_eof) { // Verifications if (first_frame && type != GRPC_CHTTP2_FRAME_HEADER) { - gpr_log(GPR_ERROR, "expected first frame to be of type header"); - gpr_log(GPR_ERROR, "EXPECT: 0x%x", GRPC_CHTTP2_FRAME_HEADER); - gpr_log(GPR_ERROR, "GOT: 0x%x", type); + LOG(ERROR) << "expected first frame to be of type header"; + LOG(ERROR) << "EXPECT: " << GRPC_CHTTP2_FRAME_HEADER; + LOG(ERROR) << "GOT: " << type; EXPECT_TRUE(false); } else if (first_frame && header_is_eof && !(flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM)) { - gpr_log(GPR_ERROR, "missing END_STREAM flag in HEADER frame"); + LOG(ERROR) << "missing END_STREAM flag in HEADER frame"; EXPECT_TRUE(false); } if (is_closed && (type == GRPC_CHTTP2_FRAME_DATA || type == GRPC_CHTTP2_FRAME_HEADER)) { - gpr_log(GPR_ERROR, - "stream is closed; new frame headers and data are not allowed"); + LOG(ERROR) + << "stream is closed; new frame headers and data are not allowed"; EXPECT_TRUE(false); } if (end_header && (type == GRPC_CHTTP2_FRAME_HEADER || type == GRPC_CHTTP2_FRAME_CONTINUATION)) { - gpr_log(GPR_ERROR, - "frame header is ended; new headers and continuations are not " - "allowed"); + LOG(ERROR) + << "frame header is ended; new headers and continuations are not " + "allowed"; EXPECT_TRUE(false); } if (in_header && (type == GRPC_CHTTP2_FRAME_DATA || type == GRPC_CHTTP2_FRAME_HEADER)) { - gpr_log(GPR_ERROR, - "parsing frame header; new headers and data are not allowed"); + LOG(ERROR) + << "parsing frame header; new headers and data are not allowed"; EXPECT_TRUE(false); } if (flags & ~(GRPC_CHTTP2_DATA_FLAG_END_STREAM | GRPC_CHTTP2_DATA_FLAG_END_HEADERS)) { - gpr_log(GPR_ERROR, "unexpected frame flags: 0x%x", flags); + LOG(ERROR) << "unexpected frame flags: " << flags; EXPECT_TRUE(false); } @@ -137,7 +137,7 @@ static void verify_frames(grpc_slice_buffer& output, bool header_is_eof) { if (flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM) { is_closed = true; if (type == GRPC_CHTTP2_FRAME_CONTINUATION) { - gpr_log(GPR_ERROR, "unexpected END_STREAM flag in CONTINUATION frame"); + LOG(ERROR) << "unexpected END_STREAM flag in CONTINUATION frame"; EXPECT_TRUE(false); } } diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index 0471b7e4d08..56cf4721205 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -28,6 +28,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/types/optional.h" #include @@ -38,7 +39,6 @@ #include #include #include -#include #include #include @@ -228,11 +228,11 @@ class TestServer { grpc_completion_queue_destroy(call_cq); } } - gpr_log(GPR_INFO, "test server shutdown, joining RPC threads..."); + LOG(INFO) << "test server shutdown, joining RPC threads..."; for (auto& t : rpc_threads) { t.join(); } - gpr_log(GPR_INFO, "test server threads all finished!"); + LOG(INFO) << "test server threads all finished!"; } static void HandleOneRpc(grpc_call* call, grpc_completion_queue* call_cq) { @@ -337,15 +337,15 @@ TEST(Pollers, TestDontCrashWhenTryingToReproIssueFixedBy23984) { for (auto& thread : threads) { thread.join(); } - gpr_log(GPR_DEBUG, "All RPCs completed!"); + VLOG(2) << "All RPCs completed!"; int num_calls_seen_at_server = test_server->ShutdownAndGetNumCallsHandled(); if (num_calls_seen_at_server != kNumCalls) { - gpr_log(GPR_ERROR, - "Expected server to handle %d calls, but instead it only handled " - "%d. This suggests some or all RPCs didn't make it to the server, " - "which means " - "that this test likely isn't doing what it's meant to be doing.", - kNumCalls, num_calls_seen_at_server); + LOG(ERROR) << "Expected server to handle " << kNumCalls + << " calls, but instead it only handled " + << num_calls_seen_at_server + << ". This suggests some or all RPCs didn't make it to the " + "server, which means that this test likely isn't doing what " + "it's meant to be doing."; CHECK(0); } } diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 0120a2e7bf6..e884f623fca 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -25,6 +25,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" @@ -38,7 +39,6 @@ #include #include #include -#include #include #include @@ -174,7 +174,7 @@ class Client { break; } if (state.error() != absl::OkStatus()) break; - gpr_log(GPR_INFO, "client read %" PRIuPTR " bytes", read_buffer.length); + LOG(INFO) << "client read " << read_buffer.length << " bytes"; grpc_slice_buffer_reset_and_unref(&read_buffer); } grpc_endpoint_shutdown(endpoint_, GRPC_ERROR_CREATE("shutdown")); @@ -210,7 +210,7 @@ class Client { private: static void OnEventDone(void* arg, grpc_error_handle error) { - gpr_log(GPR_INFO, "OnEventDone(): %s", StatusToString(error).c_str()); + LOG(INFO) << "OnEventDone(): " << StatusToString(error); EventState* state = static_cast(arg); state->error_ = error; gpr_atm_rel_store(&state->done_atm_, 1); @@ -255,21 +255,21 @@ TEST(SettingsTimeout, Basic) { const int server_port = grpc_pick_unused_port_or_die(); std::string server_address_string = absl::StrCat("localhost:", server_port); // Start server. - gpr_log(GPR_INFO, "starting server on %s", server_address_string.c_str()); + LOG(INFO) << "starting server on " << server_address_string; ServerThread server_thread(server_address_string.c_str()); server_thread.Start(); // Create client and connect to server. - gpr_log(GPR_INFO, "starting client connect"); + LOG(INFO) << "starting client connect"; Client client(server_address_string.c_str()); client.Connect(); // Client read. Should fail due to server dropping connection. - gpr_log(GPR_INFO, "starting client read"); + LOG(INFO) << "starting client read"; EXPECT_TRUE(client.ReadUntilError()); // Shut down client. - gpr_log(GPR_INFO, "shutting down client"); + LOG(INFO) << "shutting down client"; client.Shutdown(); // Shut down server. - gpr_log(GPR_INFO, "shutting down server"); + LOG(INFO) << "shutting down server"; server_thread.Shutdown(); // Clean up. } diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 8c5a13a4c92..af914c73ef0 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -25,6 +25,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" @@ -200,10 +201,10 @@ TEST(TooManyPings, TestLotsOfServerCancelledRpcsDoesntGiveTooManyPings) { std::map statuses_and_counts; const int kNumTotalRpcs = 100; // perform an RPC - gpr_log(GPR_INFO, - "Performing %d total RPCs and expecting them all to receive status " - "PERMISSION_DENIED (%d)", - kNumTotalRpcs, GRPC_STATUS_PERMISSION_DENIED); + LOG(INFO) << "Performing " << kNumTotalRpcs + << " total RPCs and expecting them all to receive status " + "PERMISSION_DENIED (" + << GRPC_STATUS_PERMISSION_DENIED << ")"; for (int i = 0; i < kNumTotalRpcs; i++) { grpc_status_code status = PerformCall(channel, server, cq); statuses_and_counts[status] += 1; @@ -214,14 +215,13 @@ TEST(TooManyPings, TestLotsOfServerCancelledRpcsDoesntGiveTooManyPings) { if (itr->first != GRPC_STATUS_PERMISSION_DENIED) { num_not_cancelled += itr->second; } - gpr_log(GPR_INFO, "%d / %d RPCs received status code: %d", itr->second, - kNumTotalRpcs, itr->first); + LOG(INFO) << itr->second << " / " << kNumTotalRpcs + << " RPCs received status code: " << itr->first; } if (num_not_cancelled > 0) { - gpr_log(GPR_ERROR, - "Expected all RPCs to receive status PERMISSION_DENIED (%d) but %d " - "received other status codes", - GRPC_STATUS_PERMISSION_DENIED, num_not_cancelled); + LOG(ERROR) << "Expected all RPCs to receive status PERMISSION_DENIED (" + << GRPC_STATUS_PERMISSION_DENIED << ") but " << num_not_cancelled + << " received other status codes"; FAIL(); } // shutdown and destroy the client and server @@ -405,20 +405,17 @@ TEST_F(KeepaliveThrottlingTest, KeepaliveThrottlingMultipleChannels) { // We need 3 GOAWAY frames to throttle the keepalive time from 1 second to 8 // seconds (> 5sec). for (int i = 0; i < 3; i++) { - gpr_log(GPR_INFO, "Expected keepalive time : %d", - expected_keepalive_time_sec); + LOG(INFO) << "Expected keepalive time : " << expected_keepalive_time_sec; EXPECT_EQ(PerformWaitingCall(channel, server, cq), GRPC_STATUS_UNAVAILABLE); expected_keepalive_time_sec *= 2; } - gpr_log( - GPR_INFO, - "Client keepalive time %d should now be in sync with the server settings", - expected_keepalive_time_sec); + LOG(INFO) << "Client keepalive time " << expected_keepalive_time_sec + << " should now be in sync with the server settings"; EXPECT_EQ(PerformWaitingCall(channel, server, cq), GRPC_STATUS_DEADLINE_EXCEEDED); // Since the subchannel is shared, the second channel should also have // keepalive settings in sync with the server. - gpr_log(GPR_INFO, "Now testing second channel sharing the same subchannel"); + LOG(INFO) << "Now testing second channel sharing the same subchannel"; EXPECT_EQ(PerformWaitingCall(channel_dup, server, cq), GRPC_STATUS_DEADLINE_EXCEEDED); // shutdown and destroy the client and server @@ -440,8 +437,7 @@ grpc_core::Resolver::Result BuildResolverResult( for (const auto& address_str : addresses) { absl::StatusOr uri = grpc_core::URI::Parse(address_str); if (!uri.ok()) { - gpr_log(GPR_ERROR, "Failed to parse uri. Error: %s", - uri.status().ToString().c_str()); + LOG(ERROR) << "Failed to parse uri. Error: " << uri.status(); CHECK_OK(uri); } grpc_resolved_address address; @@ -487,8 +483,7 @@ TEST_F(KeepaliveThrottlingTest, NewSubchannelsUseUpdatedKeepaliveTime) { // (even those from a different subchannel). int expected_keepalive_time_sec = 1; for (int i = 0; i < 3; i++) { - gpr_log(GPR_INFO, "Expected keepalive time : %d", - expected_keepalive_time_sec); + LOG(INFO) << "Expected keepalive time : " << expected_keepalive_time_sec; response_generator->SetResponseSynchronously( BuildResolverResult({absl::StrCat( "ipv4:", i % 2 == 0 ? server_address1 : server_address2)})); @@ -500,10 +495,8 @@ TEST_F(KeepaliveThrottlingTest, NewSubchannelsUseUpdatedKeepaliveTime) { GRPC_STATUS_UNAVAILABLE); expected_keepalive_time_sec *= 2; } - gpr_log( - GPR_INFO, - "Client keepalive time %d should now be in sync with the server settings", - expected_keepalive_time_sec); + LOG(INFO) << "Client keepalive time " << expected_keepalive_time_sec + << " should now be in sync with the server settings"; response_generator->SetResponseSynchronously( BuildResolverResult({absl::StrCat("ipv4:", server_address2)})); grpc_core::ExecCtx::Get()->Flush(); @@ -557,8 +550,7 @@ TEST_F(KeepaliveThrottlingTest, // (even those from a different subchannel). int expected_keepalive_time_sec = 1; for (int i = 0; i < 3; i++) { - gpr_log(GPR_ERROR, "Expected keepalive time : %d", - expected_keepalive_time_sec); + LOG(ERROR) << "Expected keepalive time : " << expected_keepalive_time_sec; grpc_server* server = ServerStart( i % 2 == 0 ? server_address1.c_str() : server_address2.c_str(), cq); VerifyChannelReady(channel, cq); @@ -567,10 +559,8 @@ TEST_F(KeepaliveThrottlingTest, VerifyChannelDisconnected(channel, cq); expected_keepalive_time_sec *= 2; } - gpr_log( - GPR_INFO, - "Client keepalive time %d should now be in sync with the server settings", - expected_keepalive_time_sec); + LOG(INFO) << "Client keepalive time " << expected_keepalive_time_sec + << " should now be in sync with the server settings"; grpc_server* server = ServerStart(server_address1.c_str(), cq); VerifyChannelReady(channel, cq); EXPECT_EQ(PerformWaitingCall(channel, server, cq), diff --git a/test/core/transport/interception_chain_test.cc b/test/core/transport/interception_chain_test.cc index f72fd59e019..f8ed661febe 100644 --- a/test/core/transport/interception_chain_test.cc +++ b/test/core/transport/interception_chain_test.cc @@ -16,11 +16,10 @@ #include +#include "absl/log/log.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include - #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/promise/poll_matcher.h" @@ -230,7 +229,7 @@ class InterceptionChainTest : public ::testing::Test { Poll trailing_md; call.initiator.SpawnInfallible( "run_call", [destination, &call, &trailing_md]() mutable { - gpr_log(GPR_INFO, "👊 start call"); + LOG(INFO) << "👊 start call"; destination->StartCall(std::move(call.handler)); return Map(call.initiator.PullServerTrailingMetadata(), [&trailing_md](ServerMetadataHandle md) { @@ -247,10 +246,9 @@ class InterceptionChainTest : public ::testing::Test { class Destination final : public UnstartedCallDestination { public: void StartCall(UnstartedCallHandler unstarted_call_handler) override { - gpr_log(GPR_INFO, "👊 started call: metadata=%s", - unstarted_call_handler.UnprocessedClientInitialMetadata() - .DebugString() - .c_str()); + LOG(INFO) << "👊 started call: metadata=" + << unstarted_call_handler.UnprocessedClientInitialMetadata() + .DebugString(); EXPECT_EQ(metadata_.get(), nullptr); metadata_ = Arena::MakePooled(); *metadata_ = From ef322d93c4aca2e55170fb57545eaa76bda7234d Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 14 May 2024 03:16:41 -0700 Subject: [PATCH 2/6] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD (#36605) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD In this CL we are just editing the build and bzl files to add dependencies. This is done to prevent merge conflict and constantly having to re-make the make files using generate_projects.sh for each set of changes. Closes #36605 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36605 from tanvi-jagtap:build_test_core_misc_02 f928eb19de1d04445cebd16bd6d377cc6a2358a2 PiperOrigin-RevId: 633516934 --- test/core/gpr/BUILD | 6 +++++- test/core/gprpp/BUILD | 11 +++++++++-- test/core/handshake/BUILD | 11 +++++++++-- test/core/http/BUILD | 7 ++++++- test/core/iomgr/BUILD | 33 ++++++++++++++++++++++++++++----- test/core/json/BUILD | 1 + test/core/load_balancing/BUILD | 16 +++++++++++++--- test/core/memory_usage/BUILD | 5 +++++ 8 files changed, 76 insertions(+), 14 deletions(-) diff --git a/test/core/gpr/BUILD b/test/core/gpr/BUILD index f6d8b4e7ded..381d592e30d 100644 --- a/test/core/gpr/BUILD +++ b/test/core/gpr/BUILD @@ -47,7 +47,10 @@ grpc_cc_test( grpc_cc_test( name = "env_test", srcs = ["env_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -62,6 +65,7 @@ grpc_cc_test( srcs = ["log_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 177c5809b0c..4e9f12a8c37 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -47,6 +47,7 @@ grpc_cc_test( external_deps = [ "absl/debugging:stacktrace", "absl/debugging:symbolize", + "absl/log:log", "gtest", ], language = "C++", @@ -193,7 +194,10 @@ grpc_cc_test( name = "mpscq_test", srcs = ["mpscq_test.cc"], exec_properties = LARGE_MACHINE, - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE uses_event_engine = False, @@ -381,7 +385,10 @@ grpc_cc_test( grpc_cc_test( name = "single_set_ptr_test", srcs = ["single_set_ptr_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "c++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD index ba12e8f2ed0..27fe79fd9d4 100644 --- a/test/core/handshake/BUILD +++ b/test/core/handshake/BUILD @@ -26,7 +26,10 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = ["no_windows"], deps = [ @@ -40,7 +43,10 @@ grpc_cc_library( name = "server_ssl_common", srcs = ["server_ssl_common.cc"], hdrs = ["server_ssl_common.h"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], tags = ["no_windows"], deps = [ "//:gpr", @@ -100,6 +106,7 @@ grpc_cc_test( # ], # external_deps = [ # "absl/log:check", +# "absl/log:log", # ], # language = "C++", # tags = ["no_mac", no_windows"], diff --git a/test/core/http/BUILD b/test/core/http/BUILD index dbcc6ad6537..f13e53fdc7e 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -66,7 +66,10 @@ grpc_cc_library( testonly = True, srcs = ["httpcli_test_util.cc"], hdrs = ["httpcli_test_util.h"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], deps = [ "//:gpr", "//:subprocess", @@ -87,6 +90,7 @@ grpc_cc_test( ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -116,6 +120,7 @@ grpc_cc_test( ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index c8cbcc08978..058eccdd2b0 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -26,7 +26,10 @@ grpc_cc_library( name = "endpoint_tests", srcs = ["endpoint_tests.cc"], hdrs = ["endpoint_tests.h"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], language = "C++", visibility = [ "//test:__subpackages__", @@ -62,6 +65,7 @@ grpc_cc_test( srcs = ["endpoint_pair_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -82,6 +86,7 @@ grpc_cc_test( name = "error_test", srcs = ["error_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], language = "C++", @@ -113,7 +118,10 @@ grpc_cc_test( grpc_cc_test( name = "fd_posix_test", srcs = ["fd_posix_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = ["no_windows"], deps = [ @@ -146,6 +154,7 @@ grpc_cc_test( external_deps = [ "absl/flags:flag", "absl/flags:parse", + "absl/log:log", "absl/strings", "gtest", ], @@ -168,6 +177,7 @@ grpc_cc_test( external_deps = [ "absl/flags:flag", "absl/flags:parse", + "absl/log:log", "absl/strings", "gtest", ], @@ -186,6 +196,7 @@ grpc_cc_test( srcs = ["resolve_address_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/strings", "gtest", ], @@ -205,6 +216,7 @@ grpc_cc_test( srcs = ["resolve_address_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/strings", "gtest", ], @@ -239,7 +251,10 @@ grpc_cc_test( grpc_cc_test( name = "tcp_client_posix_test", srcs = ["tcp_client_posix_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "endpoint_test", @@ -260,6 +275,7 @@ grpc_cc_test( srcs = ["tcp_posix_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -314,7 +330,10 @@ grpc_cc_test( grpc_cc_test( name = "tcp_server_posix_test", srcs = ["tcp_server_posix_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "event_engine_listener_test", @@ -331,7 +350,10 @@ grpc_cc_test( grpc_cc_test( name = "timer_heap_test", srcs = ["timer_heap_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -348,6 +370,7 @@ grpc_cc_test( srcs = ["timer_list_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", ], language = "C++", uses_event_engine = False, diff --git a/test/core/json/BUILD b/test/core/json/BUILD index 1d144b8d326..ceeb2c0670a 100644 --- a/test/core/json/BUILD +++ b/test/core/json/BUILD @@ -37,6 +37,7 @@ grpc_cc_test( name = "json_test", srcs = ["json_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/core/load_balancing/BUILD b/test/core/load_balancing/BUILD index 2cf14f5858e..2c98aa6dfc5 100644 --- a/test/core/load_balancing/BUILD +++ b/test/core/load_balancing/BUILD @@ -29,6 +29,7 @@ grpc_cc_library( hdrs = ["lb_policy_test_lib.h"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -104,7 +105,10 @@ grpc_cc_test( grpc_cc_test( name = "outlier_detection_test", srcs = ["outlier_detection_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "lb_unit_test", @@ -140,7 +144,10 @@ grpc_cc_test( grpc_cc_test( name = "xds_override_host_test", srcs = ["xds_override_host_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "lb_unit_test", @@ -230,7 +237,10 @@ grpc_cc_test( grpc_cc_test( name = "weighted_round_robin_test", srcs = ["weighted_round_robin_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "lb_unit_test", diff --git a/test/core/memory_usage/BUILD b/test/core/memory_usage/BUILD index c7048dc172a..202c5a99b11 100644 --- a/test/core/memory_usage/BUILD +++ b/test/core/memory_usage/BUILD @@ -46,6 +46,7 @@ grpc_cc_binary( "absl/flags:flag", "absl/flags:parse", "absl/log:check", + "absl/log:log", ], tags = [ "bazel_only", @@ -69,6 +70,7 @@ grpc_cc_binary( "absl/flags:flag", "absl/flags:parse", "absl/log:check", + "absl/log:log", ], tags = [ "bazel_only", @@ -94,6 +96,7 @@ grpc_cc_binary( "absl/flags:flag", "absl/flags:parse", "absl/log:check", + "absl/log:log", "absl/time", ], tags = [ @@ -118,6 +121,7 @@ grpc_cc_binary( srcs = ["callback_server.cc"], external_deps = [ "absl/flags:flag", + "absl/log:log", "absl/flags:parse", "absl/log:check", ], @@ -159,6 +163,7 @@ grpc_cc_test( "absl/algorithm:container", "absl/flags:flag", "absl/flags:parse", + "absl/log:log", ], language = "C++", tags = MEMORY_USAGE_TAGS, From 3531b797ba0bf1ab2e1289c3087fa34b3b0f9435 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 14 May 2024 03:18:02 -0700 Subject: [PATCH 3/6] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD (#36603) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD In this CL we are just editing the build and bzl files to add dependencies. This is done to prevent merge conflict and constantly having to re-make the make files using generate_projects.sh for each set of changes. Closes #36603 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36603 from tanvi-jagtap:build_test_core_event_engine 8b7188e4445b7cd02b2ff4b4e4b9f372463f2c9e PiperOrigin-RevId: 633517518 --- test/core/event_engine/BUILD | 2 ++ .../event_engine/fuzzing_event_engine/BUILD | 5 ++++- test/core/event_engine/posix/BUILD | 18 +++++++++++++++--- test/core/event_engine/test_suite/posix/BUILD | 5 ++++- test/core/event_engine/test_suite/tests/BUILD | 4 ++++ test/core/event_engine/test_suite/tools/BUILD | 1 + test/core/event_engine/windows/BUILD | 2 ++ 7 files changed, 32 insertions(+), 5 deletions(-) diff --git a/test/core/event_engine/BUILD b/test/core/event_engine/BUILD index 11a9c41ab14..593e912f42c 100644 --- a/test/core/event_engine/BUILD +++ b/test/core/event_engine/BUILD @@ -39,6 +39,7 @@ grpc_cc_test( name = "forkable_test", srcs = ["forkable_test.cc"], external_deps = [ + "absl/log:log", "absl/types:optional", "gtest", ], @@ -221,6 +222,7 @@ grpc_cc_library( hdrs = ["event_engine_test_utils.h"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", diff --git a/test/core/event_engine/fuzzing_event_engine/BUILD b/test/core/event_engine/fuzzing_event_engine/BUILD index c46574c292b..8182795faf7 100644 --- a/test/core/event_engine/fuzzing_event_engine/BUILD +++ b/test/core/event_engine/fuzzing_event_engine/BUILD @@ -25,7 +25,10 @@ grpc_cc_library( name = "fuzzing_event_engine", srcs = ["fuzzing_event_engine.cc"], hdrs = ["fuzzing_event_engine.h"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], deps = [ ":fuzzing_event_engine_proto", "//:event_engine_base_hdrs", diff --git a/test/core/event_engine/posix/BUILD b/test/core/event_engine/posix/BUILD index d320f428b06..21da357bbef 100644 --- a/test/core/event_engine/posix/BUILD +++ b/test/core/event_engine/posix/BUILD @@ -26,6 +26,7 @@ grpc_cc_library( testonly = True, srcs = ["posix_engine_test_utils.cc"], hdrs = ["posix_engine_test_utils.h"], + external_deps = ["absl/log:log"], tags = [ "no_windows", ], @@ -68,7 +69,10 @@ grpc_cc_test( grpc_cc_test( name = "timer_manager_test", srcs = ["timer_manager_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -83,7 +87,10 @@ grpc_cc_test( grpc_cc_test( name = "event_poller_posix_test", srcs = ["event_poller_posix_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "no_windows", @@ -184,6 +191,7 @@ grpc_cc_test( srcs = ["posix_endpoint_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -211,7 +219,10 @@ grpc_cc_test( grpc_cc_test( name = "posix_engine_listener_utils_test", srcs = ["posix_engine_listener_utils_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = [ "no_windows", @@ -232,6 +243,7 @@ grpc_cc_test( srcs = ["posix_event_engine_connect_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/core/event_engine/test_suite/posix/BUILD b/test/core/event_engine/test_suite/posix/BUILD index 7cca1028c39..dc4bbeb799d 100644 --- a/test/core/event_engine/test_suite/posix/BUILD +++ b/test/core/event_engine/test_suite/posix/BUILD @@ -23,7 +23,10 @@ grpc_cc_library( testonly = True, srcs = ["oracle_event_engine_posix.cc"], hdrs = ["oracle_event_engine_posix.h"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], tags = [ "cpu:10", "no_windows", diff --git a/test/core/event_engine/test_suite/tests/BUILD b/test/core/event_engine/test_suite/tests/BUILD index 2346402a83c..ef0b8112d20 100644 --- a/test/core/event_engine/test_suite/tests/BUILD +++ b/test/core/event_engine/test_suite/tests/BUILD @@ -42,6 +42,9 @@ grpc_cc_library( testonly = True, srcs = ["timer_test.cc"], hdrs = ["timer_test.h"], + external_deps = [ + "absl/log:log", + ], deps = [ "//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine/test_suite:event_engine_test_framework", @@ -62,6 +65,7 @@ grpc_cc_library( "//test/cpp/naming/utils:tcp_connect", ], external_deps = [ + "absl/log:log", "absl/status:statusor", "absl/strings", "absl/strings:str_format", diff --git a/test/core/event_engine/test_suite/tools/BUILD b/test/core/event_engine/test_suite/tools/BUILD index af72545a02b..c591d327e3e 100644 --- a/test/core/event_engine/test_suite/tools/BUILD +++ b/test/core/event_engine/test_suite/tools/BUILD @@ -62,6 +62,7 @@ grpc_cc_library( "absl/flags:flag", "absl/flags:parse", "absl/log:check", + "absl/log:log", ], language = "C++", deps = [ diff --git a/test/core/event_engine/windows/BUILD b/test/core/event_engine/windows/BUILD index e40bc6194fa..5dc34be99dc 100644 --- a/test/core/event_engine/windows/BUILD +++ b/test/core/event_engine/windows/BUILD @@ -21,6 +21,7 @@ grpc_cc_test( timeout = "short", srcs = ["iocp_test.cc"], external_deps = [ + "absl/log:log", "gtest", "absl/types:variant", ], @@ -92,6 +93,7 @@ grpc_cc_library( hdrs = ["create_sockpair.h"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/status", ], language = "C++", From ed5a496b724b4f74996672f3f29b8466df63d52c Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 14 May 2024 03:21:37 -0700 Subject: [PATCH 4/6] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD (#36606) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD In this CL we are just editing the build and bzl files to add dependencies. This is done to prevent merge conflict and constantly having to re-make the make files using generate_projects.sh for each set of changes. Closes #36606 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36606 from tanvi-jagtap:build_test_core_tsi_and_misc 708a724c46a8b60aee2542ab29f9090b2557883d PiperOrigin-RevId: 633518709 --- test/core/test_util/BUILD | 18 ++++++++++++-- test/core/transport/BUILD | 1 + test/core/transport/binder/end2end/BUILD | 1 + .../transport/binder/end2end/fuzzers/BUILD | 5 +++- test/core/transport/chaotic_good/BUILD | 2 ++ test/core/transport/chttp2/BUILD | 24 +++++++++++++++---- test/core/transport/test_suite/BUILD | 1 + test/core/tsi/BUILD | 6 ++++- test/core/tsi/alts/fake_handshaker/BUILD | 1 + test/core/tsi/alts/handshaker/BUILD | 2 ++ 10 files changed, 53 insertions(+), 8 deletions(-) diff --git a/test/core/test_util/BUILD b/test/core/test_util/BUILD index 2e795daf3ae..db6a89cf1b9 100644 --- a/test/core/test_util/BUILD +++ b/test/core/test_util/BUILD @@ -81,6 +81,7 @@ grpc_cc_library( ], external_deps = [ "absl/log:check", + "absl/log:log", "absl/status:statusor", "absl/strings", "absl/strings:str_format", @@ -119,6 +120,7 @@ grpc_cc_library( "absl/base:core_headers", "absl/debugging:failure_signal_handler", "absl/log:check", + "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -165,6 +167,7 @@ grpc_cc_library( external_deps = [ "absl/debugging:failure_signal_handler", "absl/log:check", + "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -202,7 +205,10 @@ grpc_cc_library( grpc_cc_test( name = "cmdline_test", srcs = ["cmdline_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -221,6 +227,7 @@ grpc_cc_library( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", "gtest", ], linkstatic = True, @@ -238,7 +245,10 @@ grpc_cc_library( grpc_cc_test( name = "histogram_test", srcs = ["histogram_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = ["nofixdeps"], uses_event_engine = False, @@ -280,6 +290,7 @@ grpc_cc_test( "stack_tracer_test.cc", ], external_deps = [ + "absl/log:log", "absl/strings", "gtest", ], @@ -302,6 +313,7 @@ grpc_cc_library( hdrs = ["test_lb_policies.h"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -341,6 +353,7 @@ grpc_cc_library( hdrs = ["fake_udp_and_tcp_server.h"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/status:statusor", "absl/strings", ], @@ -506,6 +519,7 @@ grpc_cc_library( "absl/container:flat_hash_map", "absl/functional:any_invocable", "absl/log:check", + "absl/log:log", "absl/status", "absl/strings", "absl/types:optional", diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index 38710157b9e..f9bb417b1d0 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -39,6 +39,7 @@ grpc_cc_test( name = "interception_chain_test", srcs = ["interception_chain_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/core/transport/binder/end2end/BUILD b/test/core/transport/binder/end2end/BUILD index 0785198d8c8..4e9ee2fe2d2 100644 --- a/test/core/transport/binder/end2end/BUILD +++ b/test/core/transport/binder/end2end/BUILD @@ -27,6 +27,7 @@ grpc_cc_library( srcs = ["fake_binder.cc"], hdrs = ["fake_binder.h"], external_deps = [ + "absl/log:log", "absl/memory", "absl/random", "absl/strings", diff --git a/test/core/transport/binder/end2end/fuzzers/BUILD b/test/core/transport/binder/end2end/fuzzers/BUILD index 91d4fd4ade8..a0184afd3cb 100644 --- a/test/core/transport/binder/end2end/fuzzers/BUILD +++ b/test/core/transport/binder/end2end/fuzzers/BUILD @@ -35,7 +35,10 @@ grpc_proto_library( grpc_cc_library( name = "fuzzer_utils", srcs = ["fuzzer_utils.cc"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], language = "c++", public_hdrs = ["fuzzer_utils.h"], deps = [ diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD index b1efe92a580..2b22ea94c4c 100644 --- a/test/core/transport/chaotic_good/BUILD +++ b/test/core/transport/chaotic_good/BUILD @@ -95,6 +95,7 @@ grpc_proto_fuzzer( corpus = "frame_fuzzer_corpus", external_deps = [ "absl/log:check", + "absl/log:log", "absl/random:bit_gen_ref", "absl/status:statusor", ], @@ -224,6 +225,7 @@ grpc_cc_test( srcs = ["chaotic_good_server_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/strings", "absl/time", "gtest", diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index d4be66252e8..54e1b521b77 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -141,7 +141,10 @@ grpc_cc_test( grpc_cc_test( name = "bin_decoder_test", srcs = ["bin_decoder_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -169,7 +172,10 @@ grpc_cc_test( grpc_cc_test( name = "bin_encoder_test", srcs = ["bin_encoder_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -292,7 +298,10 @@ grpc_cc_test( grpc_cc_test( name = "hpack_encoder_test", srcs = ["hpack_encoder_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = ["hpack_test"], uses_event_engine = False, @@ -373,6 +382,7 @@ grpc_cc_test( srcs = ["settings_timeout_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -391,6 +401,7 @@ grpc_cc_test( srcs = ["too_many_pings_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], flaky = True, @@ -410,7 +421,10 @@ grpc_cc_test( grpc_cc_test( name = "varint_test", srcs = ["varint_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -434,6 +448,7 @@ grpc_cc_test( exec_properties = LARGE_MACHINE, external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -454,6 +469,7 @@ grpc_cc_test( srcs = ["stream_leak_with_queued_flow_control_update_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/core/transport/test_suite/BUILD b/test/core/transport/test_suite/BUILD index 64e704304a4..5f1703fda25 100644 --- a/test/core/transport/test_suite/BUILD +++ b/test/core/transport/test_suite/BUILD @@ -71,6 +71,7 @@ grpc_cc_library( hdrs = ["test.h"], external_deps = [ "absl/functional:any_invocable", + "absl/log:log", "absl/random", "absl/random:bit_gen_ref", "absl/strings", diff --git a/test/core/tsi/BUILD b/test/core/tsi/BUILD index bf6af417106..378ac22ca4d 100644 --- a/test/core/tsi/BUILD +++ b/test/core/tsi/BUILD @@ -111,6 +111,7 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], external_deps = [ + "absl/log:log", "absl/strings", "gtest", ], @@ -167,7 +168,10 @@ grpc_cc_test( grpc_cc_test( name = "transport_security_test", srcs = ["transport_security_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", diff --git a/test/core/tsi/alts/fake_handshaker/BUILD b/test/core/tsi/alts/fake_handshaker/BUILD index 6f90dfb6343..55ee08a1163 100644 --- a/test/core/tsi/alts/fake_handshaker/BUILD +++ b/test/core/tsi/alts/fake_handshaker/BUILD @@ -59,6 +59,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], language = "C++", deps = [ diff --git a/test/core/tsi/alts/handshaker/BUILD b/test/core/tsi/alts/handshaker/BUILD index 1eb4ef6ed4c..953d03fcd9b 100644 --- a/test/core/tsi/alts/handshaker/BUILD +++ b/test/core/tsi/alts/handshaker/BUILD @@ -22,6 +22,7 @@ grpc_cc_library( name = "alts_handshaker_service_api_test_lib", srcs = ["alts_handshaker_service_api_test_lib.cc"], hdrs = ["alts_handshaker_service_api_test_lib.h"], + external_deps = ["absl/log:log"], deps = [ "//:grpc", ], @@ -83,6 +84,7 @@ grpc_cc_test( ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], flaky = True, From d8b141f9bbb3d0ef740bc551d402d6eab3f73ede Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 14 May 2024 03:24:16 -0700 Subject: [PATCH 5/6] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD (#36604) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD In this CL we are just editing the build and bzl files to add dependencies. This is done to prevent merge conflict and constantly having to re-make the make files using generate_projects.sh for each set of changes. Closes #36604 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36604 from tanvi-jagtap:build_test_core_misc_01 8995ba4914712cdf3ceb3a6d8266cad3c96befa3 PiperOrigin-RevId: 633519619 --- test/core/network_benchmarks/BUILD | 5 +++- test/core/promise/BUILD | 6 ++++- test/core/resolver/BUILD | 16 ++++++++++--- test/core/resource_quota/BUILD | 1 + test/core/security/BUILD | 37 ++++++++++++++++++++++++------ test/core/slice/BUILD | 6 ++++- test/core/surface/BUILD | 35 ++++++++++++++++++++++------ test/core/xds/BUILD | 2 ++ 8 files changed, 88 insertions(+), 20 deletions(-) diff --git a/test/core/network_benchmarks/BUILD b/test/core/network_benchmarks/BUILD index 299d3052f14..b53ea72c8c0 100644 --- a/test/core/network_benchmarks/BUILD +++ b/test/core/network_benchmarks/BUILD @@ -27,7 +27,10 @@ licenses(["notice"]) grpc_cc_binary( name = "low_level_ping_pong", srcs = ["low_level_ping_pong.cc"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], language = "C++", tags = ["no_windows"], deps = [ diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD index 2226f16211b..2b2b2cb9943 100644 --- a/test/core/promise/BUILD +++ b/test/core/promise/BUILD @@ -599,7 +599,10 @@ grpc_cc_test( grpc_cc_test( name = "sleep_test", srcs = ["sleep_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "c++", tags = ["promise_test"], uses_event_engine = False, @@ -652,6 +655,7 @@ grpc_cc_test( srcs = ["party_test.cc"], external_deps = [ "absl/base:core_headers", + "absl/log:log", "gtest", ], language = "c++", diff --git a/test/core/resolver/BUILD b/test/core/resolver/BUILD index c413ab82dfe..effbbac9dad 100644 --- a/test/core/resolver/BUILD +++ b/test/core/resolver/BUILD @@ -40,6 +40,7 @@ grpc_cc_test( name = "binder_resolver_test", srcs = ["binder_resolver_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], language = "C++", @@ -54,7 +55,10 @@ grpc_cc_test( grpc_cc_test( name = "dns_resolver_test", srcs = ["dns_resolver_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -66,7 +70,10 @@ grpc_cc_test( grpc_cc_test( name = "dns_resolver_cooldown_test", srcs = ["dns_resolver_cooldown_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -80,7 +87,10 @@ grpc_cc_test( grpc_cc_test( name = "sockaddr_resolver_test", srcs = ["sockaddr_resolver_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", diff --git a/test/core/resource_quota/BUILD b/test/core/resource_quota/BUILD index 3055925e7dc..74f08344668 100644 --- a/test/core/resource_quota/BUILD +++ b/test/core/resource_quota/BUILD @@ -117,6 +117,7 @@ grpc_cc_test( srcs = ["memory_quota_stress_test.cc"], external_deps = [ "absl/base:core_headers", + "absl/log:log", "absl/strings", "absl/types:optional", "gtest", diff --git a/test/core/security/BUILD b/test/core/security/BUILD index 8fa90c55d40..4fec75a477c 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -60,6 +60,7 @@ grpc_cc_library( name = "oauth2_utils", srcs = ["oauth2_utils.cc"], hdrs = ["oauth2_utils.h"], + external_deps = ["absl/log:log"], language = "C++", visibility = ["//test/cpp:__subpackages__"], deps = ["//:grpc"], @@ -68,7 +69,10 @@ grpc_cc_library( grpc_cc_test( name = "auth_context_test", srcs = ["auth_context_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -99,6 +103,7 @@ grpc_cc_test( srcs = ["credentials_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], language = "C++", @@ -144,7 +149,10 @@ grpc_cc_test( grpc_cc_test( name = "json_token_test", srcs = ["json_token_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", tags = ["credential_token_tests"], uses_event_engine = False, @@ -177,7 +185,10 @@ grpc_cc_test( grpc_cc_test( name = "secure_endpoint_test", srcs = ["secure_endpoint_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], flaky = True, language = "C++", deps = [ @@ -193,7 +204,10 @@ grpc_cc_test( grpc_cc_test( name = "security_connector_test", srcs = ["security_connector_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -255,7 +269,10 @@ grpc_cc_binary( grpc_cc_binary( name = "fetch_oauth2", srcs = ["fetch_oauth2.cc"], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], language = "C++", deps = [ ":oauth2_utils", @@ -322,7 +339,10 @@ grpc_cc_test( grpc_cc_test( name = "alts_security_connector_test", srcs = ["alts_security_connector_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -440,7 +460,10 @@ grpc_cc_test( grpc_cc_test( name = "grpc_tls_certificate_verifier_test", srcs = ["grpc_tls_certificate_verifier_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index 45696771c56..1d4660ae56d 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -65,6 +65,7 @@ grpc_cc_test( name = "slice_test", srcs = ["slice_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], language = "C++", @@ -81,7 +82,10 @@ grpc_cc_test( grpc_cc_test( name = "slice_string_helpers_test", srcs = ["slice_string_helpers_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/surface/BUILD b/test/core/surface/BUILD index e5025fcfca6..ea2fa27b24a 100644 --- a/test/core/surface/BUILD +++ b/test/core/surface/BUILD @@ -21,7 +21,10 @@ grpc_package(name = "test/core/surface") grpc_cc_test( name = "grpc_byte_buffer_reader_test", srcs = ["byte_buffer_reader_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -49,7 +52,10 @@ grpc_cc_test( grpc_cc_test( name = "grpc_completion_queue_test", srcs = ["completion_queue_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -61,7 +67,10 @@ grpc_cc_test( grpc_cc_test( name = "completion_queue_threading_test", srcs = ["completion_queue_threading_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -73,7 +82,10 @@ grpc_cc_test( grpc_cc_test( name = "concurrent_connectivity_test", srcs = ["concurrent_connectivity_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -120,7 +132,10 @@ grpc_cc_test( data = [ "//src/core/tsi/test_creds:ca.pem", ], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -150,7 +165,10 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", @@ -178,7 +196,10 @@ grpc_cc_test( grpc_cc_test( name = "server_test", srcs = ["server_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "//:gpr", diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD index 975cb4d819e..a4e133970e7 100644 --- a/test/core/xds/BUILD +++ b/test/core/xds/BUILD @@ -136,6 +136,7 @@ grpc_cc_library( hdrs = ["xds_transport_fake.h"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/strings", "absl/types:optional", ], @@ -182,6 +183,7 @@ grpc_proto_fuzzer( name = "xds_client_fuzzer", srcs = ["xds_client_fuzzer.cc"], corpus = "xds_client_corpora", + external_deps = ["absl/log:log"], language = "C++", proto = "xds_client_fuzzer.proto", proto_deps = [ From 15850972ddba9c1262a9d51341da03bc607bd934 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Tue, 14 May 2024 03:33:21 -0700 Subject: [PATCH 6/6] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD (#36607) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - BUILD In this CL we are just editing the build and bzl files to add dependencies. This is done to prevent merge conflict and constantly having to re-make the make files using generate_projects.sh for each set of changes. Closes #36607 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36607 from tanvi-jagtap:build_test_cpp 3e17d778d03272cd51da86baa38b67f77760735c PiperOrigin-RevId: 633523097 --- test/cpp/common/BUILD | 2 ++ test/cpp/end2end/BUILD | 27 +++++++++++++++++++ test/cpp/end2end/xds/BUILD | 9 +++++++ test/cpp/ext/filters/logging/BUILD | 1 + test/cpp/interop/BUILD | 15 +++++++++++ test/cpp/microbenchmarks/BUILD | 4 +++ .../generate_resolver_component_tests.bzl | 3 +++ test/cpp/performance/BUILD | 1 + test/cpp/qps/BUILD | 13 ++++++++- test/cpp/qps/qps_benchmark_script.bzl | 1 + test/cpp/server/BUILD | 1 + test/cpp/server/load_reporter/BUILD | 1 + test/cpp/thread_manager/BUILD | 1 + 13 files changed, 78 insertions(+), 1 deletion(-) diff --git a/test/cpp/common/BUILD b/test/cpp/common/BUILD index 7f6136fac2c..3a296c6fc0e 100644 --- a/test/cpp/common/BUILD +++ b/test/cpp/common/BUILD @@ -37,6 +37,7 @@ grpc_cc_test( srcs = ["timer_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], flaky = True, @@ -52,6 +53,7 @@ grpc_cc_test( srcs = ["time_jump_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = [ diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index 6ada7da27c1..180f631050b 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -27,6 +27,7 @@ grpc_cc_library( srcs = ["test_service_impl.cc"], hdrs = ["test_service_impl.h"], external_deps = [ + "absl/log:log", "gtest", "absl/log:check", "absl/synchronization", @@ -65,6 +66,7 @@ grpc_cc_library( hdrs = ["connection_attempt_injector.h"], external_deps = [ "absl/log:check", + "absl/log:log", ], deps = [ "//:grpc", @@ -92,6 +94,7 @@ grpc_cc_library( srcs = ["rls_server.cc"], hdrs = ["rls_server.h"], external_deps = [ + "absl/log:log", "gtest", ], deps = [ @@ -106,6 +109,7 @@ grpc_cc_test( srcs = ["async_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], shard_count = 10, @@ -187,6 +191,7 @@ grpc_cc_binary( srcs = ["client_crash_test_server.cc"], external_deps = [ "absl/flags:flag", + "absl/log:log", "gtest", ], deps = [ @@ -207,6 +212,7 @@ grpc_cc_test( name = "client_fork_test", srcs = ["client_fork_test.cc"], external_deps = [ + "absl/log:log", "absl/strings", "gtest", ], @@ -232,6 +238,7 @@ grpc_cc_test( srcs = ["client_callback_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -371,6 +378,7 @@ grpc_cc_test( grpc_cc_test( name = "end2end_test", size = "large", + external_deps = ["absl/log:log"], flaky = True, # TODO(b/151704375) shard_count = 10, tags = [ @@ -448,6 +456,7 @@ grpc_cc_test( srcs = ["hybrid_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -489,6 +498,7 @@ grpc_cc_test( name = "mock_test", srcs = ["mock_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -565,6 +575,7 @@ grpc_cc_test( srcs = ["rls_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "absl/types:optional", "gtest", ], @@ -599,6 +610,7 @@ grpc_cc_test( srcs = ["service_config_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -699,6 +711,7 @@ grpc_cc_test( ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = [ @@ -725,6 +738,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", "gtest", ], deps = [ @@ -764,6 +778,7 @@ grpc_cc_test( name = "server_load_reporting_end2end_test", srcs = ["server_load_reporting_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], tags = [ @@ -782,6 +797,7 @@ grpc_cc_test( name = "flaky_network_test", srcs = ["flaky_network_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], tags = [ @@ -809,6 +825,7 @@ grpc_cc_test( srcs = ["shutdown_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -828,6 +845,7 @@ grpc_cc_test( name = "streaming_throughput_test", srcs = ["streaming_throughput_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], tags = [ @@ -851,6 +869,7 @@ grpc_cc_test( size = "large", srcs = ["thread_stress_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], shard_count = 5, @@ -875,6 +894,7 @@ grpc_cc_test( srcs = ["cfstream_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = [ @@ -904,6 +924,7 @@ grpc_cc_test( srcs = ["message_allocator_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -925,6 +946,7 @@ grpc_cc_test( srcs = ["context_allocator_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -946,6 +968,7 @@ grpc_cc_test( srcs = ["port_sharing_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -1035,6 +1058,7 @@ grpc_cc_test( name = "orca_service_end2end_test", srcs = ["orca_service_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], tags = ["cpp_end2end_test"], @@ -1080,6 +1104,7 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], external_deps = [ + "absl/log:log", "gtest", ], tags = ["ssl_credentials_test"], @@ -1106,6 +1131,7 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], external_deps = [ + "absl/log:log", "gtest", ], tags = ["tls_credentials_test"], @@ -1134,6 +1160,7 @@ grpc_cc_test( ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["crl_provider_test"], diff --git a/test/cpp/end2end/xds/BUILD b/test/cpp/end2end/xds/BUILD index 15afd38eb26..c7b9e83a842 100644 --- a/test/cpp/end2end/xds/BUILD +++ b/test/cpp/end2end/xds/BUILD @@ -71,6 +71,7 @@ grpc_cc_library( hdrs = ["xds_end2end_test_lib.h"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], deps = [ @@ -115,6 +116,7 @@ grpc_cc_test( ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], flaky = True, # TODO(b/144705388) @@ -162,6 +164,7 @@ grpc_cc_test( size = "large", srcs = ["xds_cluster_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], flaky = True, # TODO(b/144705388) @@ -190,6 +193,7 @@ grpc_cc_test( srcs = ["xds_cluster_type_end2end_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], flaky = True, # TODO(b/144705388) @@ -217,6 +221,7 @@ grpc_cc_test( size = "large", srcs = ["xds_core_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], flaky = True, @@ -243,6 +248,7 @@ grpc_cc_test( size = "large", srcs = ["xds_csds_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], linkstatic = True, # Fixes dyld error on MacOS @@ -324,6 +330,7 @@ grpc_cc_test( size = "large", srcs = ["xds_wrr_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], linkstatic = True, # Fixes dyld error on MacOS @@ -410,6 +417,7 @@ grpc_cc_test( size = "large", srcs = ["xds_routing_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], flaky = True, # TODO(b/144705388) @@ -458,6 +466,7 @@ grpc_cc_test( size = "large", srcs = ["xds_override_host_end2end_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], linkstatic = True, # Fixes dyld error on MacOS diff --git a/test/cpp/ext/filters/logging/BUILD b/test/cpp/ext/filters/logging/BUILD index 11a90473b8f..8edbf284d94 100644 --- a/test/cpp/ext/filters/logging/BUILD +++ b/test/cpp/ext/filters/logging/BUILD @@ -26,6 +26,7 @@ grpc_cc_library( srcs = ["library.cc"], hdrs = ["library.h"], external_deps = [ + "absl/log:log", "gtest", ], language = "C++", diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD index 21d86d04971..9b9708fe5cb 100644 --- a/test/cpp/interop/BUILD +++ b/test/cpp/interop/BUILD @@ -69,6 +69,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], language = "C++", deps = [ @@ -131,6 +132,7 @@ grpc_cc_library( ], external_deps = [ "absl/flags:flag", + "absl/log:log", ], language = "C++", deps = [ @@ -171,6 +173,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], deps = [ ":client_helper_lib", @@ -187,6 +190,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], language = "C++", deps = [ @@ -206,6 +210,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], deps = [ ":client_helper_lib", @@ -224,6 +229,7 @@ grpc_cc_binary( ], external_deps = [ "absl/flags:flag", + "absl/log:log", ], tags = ["no_windows"], deps = [ @@ -284,6 +290,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", "otel/exporters/prometheus:prometheus_exporter", "otel/sdk/src/metrics", ], @@ -313,6 +320,7 @@ grpc_cc_library( "pre_stop_hook_server.h", "xds_interop_server_lib.h", ], + external_deps = ["absl/log:log"], deps = [ "//:grpc++", "//:grpc++_reflection", @@ -332,6 +340,7 @@ grpc_cc_binary( ], external_deps = [ "absl/flags:flag", + "absl/log:log", "otel/exporters/prometheus:prometheus_exporter", "otel/sdk/src/metrics", ], @@ -381,6 +390,7 @@ grpc_cc_library( "istio_echo_server_lib.cc", ], hdrs = ["istio_echo_server_lib.h"], + external_deps = ["absl/log:log"], deps = [ "//:grpc++", "//src/proto/grpc/testing:istio_echo_proto", @@ -394,6 +404,7 @@ grpc_cc_binary( ], external_deps = [ "absl/flags:flag", + "absl/log:log", ], deps = [ ":istio_echo_server_lib", @@ -451,6 +462,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], language = "C++", deps = [ @@ -467,6 +479,7 @@ grpc_cc_binary( ], external_deps = [ "absl/flags:flag", + "absl/log:log", ], language = "C++", tags = ["nobuilder"], @@ -485,6 +498,7 @@ grpc_cc_library( ], external_deps = [ "absl/flags:flag", + "absl/log:log", "otel/exporters/prometheus:prometheus_exporter", "otel/sdk/src/metrics", ], @@ -542,6 +556,7 @@ grpc_cc_library( ], external_deps = [ "absl/log:check", + "absl/log:log", ], language = "C++", tags = ["nobuilder"], diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD index 16ed135e3a0..f4592f3f8ff 100644 --- a/test/cpp/microbenchmarks/BUILD +++ b/test/cpp/microbenchmarks/BUILD @@ -253,6 +253,7 @@ grpc_cc_test( args = grpc_benchmark_args(), external_deps = [ "absl/log:check", + "absl/log:log", ], tags = [ "no_mac", @@ -368,6 +369,7 @@ grpc_cc_test( args = grpc_benchmark_args(), external_deps = [ "absl/log:check", + "absl/log:log", ], tags = [ "no_mac", @@ -400,6 +402,7 @@ grpc_cc_library( hdrs = ["callback_test_service.h"], external_deps = [ "absl/log:check", + "absl/log:log", "benchmark", ], deps = [ @@ -448,6 +451,7 @@ grpc_cc_library( ], external_deps = [ "absl/log:check", + "absl/log:log", ], deps = [ ":bm_callback_test_service_impl", diff --git a/test/cpp/naming/generate_resolver_component_tests.bzl b/test/cpp/naming/generate_resolver_component_tests.bzl index 83f11db1943..bd029947fa3 100755 --- a/test/cpp/naming/generate_resolver_component_tests.bzl +++ b/test/cpp/naming/generate_resolver_component_tests.bzl @@ -33,6 +33,7 @@ def generate_resolver_component_tests(): ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], deps = [ @@ -55,6 +56,7 @@ def generate_resolver_component_tests(): ], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], deps = [ @@ -78,6 +80,7 @@ def generate_resolver_component_tests(): external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", "absl/strings", ], deps = [ diff --git a/test/cpp/performance/BUILD b/test/cpp/performance/BUILD index 06909a1585e..8b476e58ec5 100644 --- a/test/cpp/performance/BUILD +++ b/test/cpp/performance/BUILD @@ -23,6 +23,7 @@ grpc_cc_test( srcs = ["writes_per_rpc_test.cc"], external_deps = [ "absl/log:check", + "absl/log:log", "gtest", ], tags = ["no_windows"], diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 554f29fea62..0a9e77c17d1 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -26,6 +26,7 @@ grpc_cc_library( hdrs = ["parse_json.h"], external_deps = [ "absl/log:check", + "absl/log:log", "protobuf", ], deps = ["//:grpc++"], @@ -49,7 +50,10 @@ grpc_cc_library( "qps_worker.h", "server.h", ], - external_deps = ["absl/log:check"], + external_deps = [ + "absl/log:check", + "absl/log:log", + ], deps = [ ":histogram", ":interarrival", @@ -133,6 +137,7 @@ grpc_cc_binary( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", ], deps = [ ":benchmark_config", @@ -146,6 +151,7 @@ grpc_cc_binary( grpc_cc_test( name = "inproc_sync_unary_ping_pong_test", srcs = ["inproc_sync_unary_ping_pong_test.cc"], + external_deps = ["absl/log:log"], deps = [ ":benchmark_config", ":driver_impl", @@ -182,6 +188,7 @@ grpc_cc_test( name = "qps_openloop_test", srcs = ["qps_openloop_test.cc"], exec_properties = LARGE_MACHINE, + external_deps = ["absl/log:log"], tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE deps = [ ":benchmark_config", @@ -195,6 +202,7 @@ grpc_cc_test( grpc_cc_test( name = "secure_sync_unary_ping_pong_test", srcs = ["secure_sync_unary_ping_pong_test.cc"], + external_deps = ["absl/log:log"], deps = [ ":benchmark_config", ":driver_impl", @@ -208,6 +216,7 @@ grpc_cc_library( name = "usage_timer", srcs = ["usage_timer.cc"], hdrs = ["usage_timer.h"], + external_deps = ["absl/log:log"], deps = ["//:gpr"], ) @@ -216,6 +225,7 @@ grpc_cc_binary( srcs = ["worker.cc"], external_deps = [ "absl/flags:flag", + "absl/log:log", ], deps = [ ":qps_worker_impl", @@ -231,6 +241,7 @@ grpc_py_binary( testonly = True, srcs = ["scenario_runner.py"], data = ["scenario_runner_cc"], + external_deps = ["absl/log:log"], python_version = "PY3", ) diff --git a/test/cpp/qps/qps_benchmark_script.bzl b/test/cpp/qps/qps_benchmark_script.bzl index 90d543ceebe..e81ca8710e2 100644 --- a/test/cpp/qps/qps_benchmark_script.bzl +++ b/test/cpp/qps/qps_benchmark_script.bzl @@ -85,6 +85,7 @@ def json_run_localhost_batch(): ], external_deps = [ "absl/log:check", + "absl/log:log", ], deps = [ "//:gpr", diff --git a/test/cpp/server/BUILD b/test/cpp/server/BUILD index b65ec5c9e86..edd722347dd 100644 --- a/test/cpp/server/BUILD +++ b/test/cpp/server/BUILD @@ -53,6 +53,7 @@ grpc_cc_test( name = "server_request_call_test", srcs = ["server_request_call_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], tags = ["no_windows"], diff --git a/test/cpp/server/load_reporter/BUILD b/test/cpp/server/load_reporter/BUILD index 31bbfcc423e..77ee0657c24 100644 --- a/test/cpp/server/load_reporter/BUILD +++ b/test/cpp/server/load_reporter/BUILD @@ -36,6 +36,7 @@ grpc_cc_test( external_deps = [ "absl/flags:flag", "absl/log:check", + "absl/log:log", "gtest", "opencensus-stats-test", ], diff --git a/test/cpp/thread_manager/BUILD b/test/cpp/thread_manager/BUILD index b39e9cff5b5..16e94da1e8e 100644 --- a/test/cpp/thread_manager/BUILD +++ b/test/cpp/thread_manager/BUILD @@ -25,6 +25,7 @@ grpc_cc_test( name = "thread_manager_test", srcs = ["thread_manager_test.cc"], external_deps = [ + "absl/log:log", "gtest", ], deps = [