From 03e91b6811e2f426570be6c94cc563523000fd06 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Mon, 10 Jun 2024 17:49:58 -0700 Subject: [PATCH] [Gpr_To_Absl_Logging] Move function to test header form log.h (#36860) [Gpr_To_Absl_Logging] Move function to test header form log.h This is not really needed in log.h Closes #36860 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36860 from tanvi-jagtap:move_function_to_test_header e6494bd06f2e4a08c91eb41f420607f9568b22ac PiperOrigin-RevId: 642080756 --- grpc.def | 1 - include/grpc/support/log.h | 2 -- src/core/util/log.cc | 5 ----- src/ruby/ext/grpc/rb_grpc_imports.generated.c | 2 -- src/ruby/ext/grpc/rb_grpc_imports.generated.h | 3 --- test/core/call/yodel/fuzzer_main.cc | 3 ++- test/core/end2end/end2end_test_fuzzer.cc | 3 ++- test/core/end2end/fuzzers/api_fuzzer.cc | 3 ++- test/core/end2end/fuzzers/client_fuzzer.cc | 3 ++- test/core/end2end/fuzzers/server_fuzzer.cc | 3 ++- .../event_engine_client_channel_resolver/resolver_fuzzer.cc | 3 ++- test/core/nanopb/fuzzer_response.cc | 4 +++- test/core/nanopb/fuzzer_serverlist.cc | 4 +++- test/core/resource_quota/BUILD | 1 + test/core/resource_quota/memory_quota_fuzzer.cc | 3 ++- test/core/security/alts_credentials_fuzzer.cc | 3 ++- test/core/security/ssl_server_fuzzer.cc | 3 ++- test/core/test_util/BUILD | 1 + test/core/test_util/test_config.cc | 6 ++++++ test/core/test_util/test_config.h | 3 +++ test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc | 3 ++- test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc | 3 ++- test/core/transport/chttp2/hpack_parser_fuzzer_test.cc | 3 ++- test/core/transport/chttp2/hpack_sync_fuzzer.cc | 3 ++- test/cpp/interop/BUILD | 1 + test/cpp/interop/metrics_client.cc | 3 ++- 26 files changed, 46 insertions(+), 29 deletions(-) diff --git a/grpc.def b/grpc.def index acee3331a74..154e8eee94d 100644 --- a/grpc.def +++ b/grpc.def @@ -236,7 +236,6 @@ EXPORTS gpr_log_message gpr_set_log_verbosity gpr_log_verbosity_init - gpr_disable_all_logs gpr_set_log_function gpr_assertion_failed gpr_format_message diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h index 1d51ffd9b85..57560029624 100644 --- a/include/grpc/support/log.h +++ b/include/grpc/support/log.h @@ -69,8 +69,6 @@ GPRAPI void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print); GPRAPI void gpr_log_verbosity_init(void); -GPRAPI void gpr_disable_all_logs(void); - /** Log overrides: applications can use this API to intercept logging calls and use their own implementations */ diff --git a/src/core/util/log.cc b/src/core/util/log.cc index c89609cbd2f..77326f716ae 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -197,8 +197,3 @@ void gpr_set_log_function(gpr_log_func f) { "functionality. gRFC: https://github.com/grpc/proposal/pull/425 "; gpr_atm_no_barrier_store(&g_log_func, (gpr_atm)(f ? f : gpr_default_log)); } - -void gpr_disable_all_logs() { - absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfinity); - absl::SetVLogLevel("*grpc*/*", -1); -} diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c index 664a8f01482..e4607ce6d00 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c @@ -259,7 +259,6 @@ gpr_should_log_type gpr_should_log_import; gpr_log_message_type gpr_log_message_import; gpr_set_log_verbosity_type gpr_set_log_verbosity_import; gpr_log_verbosity_init_type gpr_log_verbosity_init_import; -gpr_disable_all_logs_type gpr_disable_all_logs_import; gpr_set_log_function_type gpr_set_log_function_import; gpr_assertion_failed_type gpr_assertion_failed_import; gpr_format_message_type gpr_format_message_import; @@ -550,7 +549,6 @@ void grpc_rb_load_imports(HMODULE library) { gpr_log_message_import = (gpr_log_message_type) GetProcAddress(library, "gpr_log_message"); gpr_set_log_verbosity_import = (gpr_set_log_verbosity_type) GetProcAddress(library, "gpr_set_log_verbosity"); gpr_log_verbosity_init_import = (gpr_log_verbosity_init_type) GetProcAddress(library, "gpr_log_verbosity_init"); - gpr_disable_all_logs_import = (gpr_disable_all_logs_type) GetProcAddress(library, "gpr_disable_all_logs"); gpr_set_log_function_import = (gpr_set_log_function_type) GetProcAddress(library, "gpr_set_log_function"); gpr_assertion_failed_import = (gpr_assertion_failed_type) GetProcAddress(library, "gpr_assertion_failed"); gpr_format_message_import = (gpr_format_message_type) GetProcAddress(library, "gpr_format_message"); diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index 3b3b401a257..42fb67dface 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -753,9 +753,6 @@ extern gpr_set_log_verbosity_type gpr_set_log_verbosity_import; typedef void(*gpr_log_verbosity_init_type)(void); extern gpr_log_verbosity_init_type gpr_log_verbosity_init_import; #define gpr_log_verbosity_init gpr_log_verbosity_init_import -typedef void(*gpr_disable_all_logs_type)(void); -extern gpr_disable_all_logs_type gpr_disable_all_logs_import; -#define gpr_disable_all_logs gpr_disable_all_logs_import typedef void(*gpr_set_log_function_type)(gpr_log_func func); extern gpr_set_log_function_type gpr_set_log_function_import; #define gpr_set_log_function gpr_set_log_function_import diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index 3cd0340c227..f88cda36333 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -31,6 +31,7 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" +#include "test/core/test_util/test_config.h" bool squelch = true; @@ -43,7 +44,7 @@ DEFINE_PROTO_FUZZER(const transport_test_suite::Msg& msg) { const int test_id = msg.test_id() % tests->size(); if (squelch && !grpc_core::GetEnv("GRPC_TRACE_FUZZER").has_value()) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_core::ConfigVars::Overrides overrides = diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index be79482d7e2..c0f5cb3bbf9 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -43,6 +43,7 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::FuzzingEventEngine; using ::grpc_event_engine::experimental::GetDefaultEventEngine; @@ -91,7 +92,7 @@ void RunEnd2endFuzzer(const core_end2end_test_fuzzer::Msg& msg) { const int test_id = msg.test_id() % tests.size(); if (squelch && !GetEnv("GRPC_TRACE_FUZZER").has_value()) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } // TODO(ctiller): make this per fixture? diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 02f296ec19f..e86b0a25d71 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -69,6 +69,7 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/fuzzing_channel_args.h" +#include "test/core/test_util/test_config.h" // IWYU pragma: no_include @@ -504,7 +505,7 @@ using grpc_core::testing::ApiFuzzer; DEFINE_PROTO_FUZZER(const api_fuzzer::Msg& msg) { if (squelch && !grpc_core::GetEnv("GRPC_TRACE_FUZZER").has_value()) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_core::ApplyFuzzConfigVars(msg.config_vars()); grpc_core::TestOnlyReloadExperimentsFromConfigVariables(); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index eb20355a31a..3e7ca5089ba 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -43,6 +43,7 @@ #include "test/core/end2end/fuzzers/network_input.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/mock_endpoint.h" +#include "test/core/test_util/test_config.h" bool squelch = true; bool leak_check = true; @@ -99,7 +100,7 @@ class ClientFuzzer final : public BasicFuzzer { DEFINE_PROTO_FUZZER(const fuzzer_input::Msg& msg) { if (squelch && !grpc_core::GetEnv("GRPC_TRACE_FUZZER").has_value()) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } if (msg.network_input().size() != 1) return; grpc_core::ApplyFuzzConfigVars(msg.config_vars()); diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 3e310fa6cee..a161815f51a 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -31,6 +31,7 @@ #include "test/core/end2end/fuzzers/fuzzing_common.h" #include "test/core/end2end/fuzzers/network_input.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/test_config.h" bool squelch = true; bool leak_check = true; @@ -95,7 +96,7 @@ void RunServerFuzzer( absl::FunctionRef server_setup) { if (squelch && !GetEnv("GRPC_TRACE_FUZZER").has_value()) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } static const int once = []() { ForceEnableExperiment("event_engine_client", true); diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index ed7d60e3397..b305f41f776 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc +++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc @@ -48,6 +48,7 @@ #include "test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.pb.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/fuzzing_channel_args.h" +#include "test/core/test_util/test_config.h" bool squelch = true; @@ -254,7 +255,7 @@ grpc_core::ResolverArgs ConstructResolverArgs( DEFINE_PROTO_FUZZER(const event_engine_client_channel_resolver::Msg& msg) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } bool done_resolving = false; grpc_core::ApplyFuzzConfigVars(msg.config_vars()); diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc index 93537339e3a..9dd8ebbce7a 100644 --- a/test/core/nanopb/fuzzer_response.cc +++ b/test/core/nanopb/fuzzer_response.cc @@ -22,6 +22,8 @@ #include #include +#include "test/core/test_util/test_config.h" + bool squelch = true; bool leak_check = true; @@ -29,7 +31,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* /*data*/, size_t /*size*/) { grpc_init(); if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } // TODO(veblush): Convert this to upb. diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc index 8f83c0a32a1..4e22041dfe5 100644 --- a/test/core/nanopb/fuzzer_serverlist.cc +++ b/test/core/nanopb/fuzzer_serverlist.cc @@ -22,6 +22,8 @@ #include #include +#include "test/core/test_util/test_config.h" + bool squelch = true; bool leak_check = true; @@ -29,7 +31,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* /*data*/, size_t /*size*/) { grpc_init(); if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } // TODO(veblush): Convert this to upb. diff --git a/test/core/resource_quota/BUILD b/test/core/resource_quota/BUILD index 74f08344668..d1029eb8b22 100644 --- a/test/core/resource_quota/BUILD +++ b/test/core/resource_quota/BUILD @@ -169,5 +169,6 @@ grpc_proto_fuzzer( "//src/core:memory_quota", "//src/core:useful", "//test/core/test_util:fuzz_config_vars", + "//test/core/test_util:grpc_test_util", ], ) diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 6c3a1f4badb..2fb432cbe28 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -41,6 +41,7 @@ #include "test/core/resource_quota/call_checker.h" #include "test/core/resource_quota/memory_quota_fuzzer.pb.h" #include "test/core/test_util/fuzz_config_vars.h" +#include "test/core/test_util/test_config.h" bool squelch = true; bool leak_check = true; @@ -189,7 +190,7 @@ class Fuzzer { DEFINE_PROTO_FUZZER(const memory_quota_fuzzer::Msg& msg) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_core::ApplyFuzzConfigVars(msg.config_vars()); grpc_core::TestOnlyReloadExperimentsFromConfigVariables(); diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index 2d01d66012c..224a5ea9859 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -33,6 +33,7 @@ #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include "test/core/test_util/fuzzer_util.h" +#include "test/core/test_util/test_config.h" using grpc_core::testing::grpc_fuzzer_get_next_byte; using grpc_core::testing::grpc_fuzzer_get_next_string; @@ -63,7 +64,7 @@ static void read_target_service_accounts( extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch && !grpc_core::GetEnv("GRPC_TRACE_FUZZER").has_value()) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } input_stream inp = {data, data + size}; grpc_init(); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index a7498f6d7cd..62a9de9d69e 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -29,6 +29,7 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "test/core/test_util/mock_endpoint.h" +#include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem" @@ -59,7 +60,7 @@ static void on_handshake_done(void* arg, grpc_error_handle error) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_init(); { diff --git a/test/core/test_util/BUILD b/test/core/test_util/BUILD index db6a89cf1b9..d2e935f75f4 100644 --- a/test/core/test_util/BUILD +++ b/test/core/test_util/BUILD @@ -120,6 +120,7 @@ grpc_cc_library( "absl/base:core_headers", "absl/debugging:failure_signal_handler", "absl/log:check", + "absl/log:globals", "absl/log:log", "absl/status", "absl/status:statusor", diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc index b816f5f1b10..2bc8a1861a9 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -22,6 +22,7 @@ #include #include "absl/debugging/failure_signal_handler.h" +#include "absl/log/globals.h" #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" @@ -150,6 +151,11 @@ bool grpc_wait_until_shutdown(int64_t time_s) { return true; } +void grpc_disable_all_absl_logs() { + absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfinity); + absl::SetVLogLevel("*grpc*/*", -1); +} + namespace grpc { namespace testing { diff --git a/test/core/test_util/test_config.h b/test/core/test_util/test_config.h index 9fe1f84c324..04876b7cf54 100644 --- a/test/core/test_util/test_config.h +++ b/test/core/test_util/test_config.h @@ -42,6 +42,9 @@ gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms); // Prefer TestEnvironment below. void grpc_test_init(int* argc, char** argv); +// Disable all absl logs via SetMinLogLevel and SetVLogLevel +void grpc_disable_all_absl_logs(void); + // Wait until gRPC is fully shut down. // Returns if grpc is shutdown bool grpc_wait_until_shutdown(int64_t time_s); diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc index a5fa9905d81..e62c056c8b7 100644 --- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc @@ -27,6 +27,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/libfuzzer/libfuzzer_macro.h" +#include "test/core/test_util/test_config.h" #include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h" #include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h" @@ -37,7 +38,7 @@ static void* tag(intptr_t t) { return reinterpret_cast(t); } DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_init(); { diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc index 38bc3add000..bc8f0400b00 100644 --- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc @@ -22,6 +22,7 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/server/server.h" #include "src/libfuzzer/libfuzzer_macro.h" +#include "test/core/test_util/test_config.h" #include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h" #include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h" @@ -32,7 +33,7 @@ static void* tag(intptr_t t) { return reinterpret_cast(t); } DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_init(); { diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 61dfc6a43ad..a6296636b8e 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -43,6 +43,7 @@ #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" +#include "test/core/test_util/test_config.h" #include "test/core/transport/chttp2/hpack_parser_fuzzer.pb.h" // IWYU pragma: no_include @@ -52,7 +53,7 @@ bool leak_check = true; DEFINE_PROTO_FUZZER(const hpack_parser_fuzzer::Msg& msg) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_core::ProtoBitGen proto_bit_src(msg.random_numbers()); grpc_core::ApplyFuzzConfigVars(msg.config_vars()); diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index b79953a7805..13aa0f2bb4a 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -47,6 +47,7 @@ #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" +#include "test/core/test_util/test_config.h" #include "test/core/transport/chttp2/hpack_sync_fuzzer.pb.h" bool squelch = true; @@ -169,7 +170,7 @@ void FuzzOneInput(const hpack_sync_fuzzer::Msg& msg) { DEFINE_PROTO_FUZZER(const hpack_sync_fuzzer::Msg& msg) { if (squelch) { - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); } grpc_core::ApplyFuzzConfigVars(msg.config_vars()); grpc_core::TestOnlyReloadExperimentsFromConfigVariables(); diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD index 28624783556..768b355f754 100644 --- a/test/cpp/interop/BUILD +++ b/test/cpp/interop/BUILD @@ -158,6 +158,7 @@ grpc_cc_binary( language = "C++", deps = [ "//:grpc++", + "//test/core/test_util:grpc_test_util", "//test/cpp/util:metrics_server_lib", "//test/cpp/util:test_config", ], diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc index 739764db17e..f15466edcc4 100644 --- a/test/cpp/interop/metrics_client.cc +++ b/test/cpp/interop/metrics_client.cc @@ -27,6 +27,7 @@ #include "src/core/lib/gprpp/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" +#include "test/core/test_util/test_config.h" #include "test/cpp/util/metrics_server.h" #include "test/cpp/util/test_config.h" @@ -90,7 +91,7 @@ int main(int argc, char** argv) { // The output of metrics client is in some cases programmatically parsed (for // example by the stress test framework). So, we do not want any of the log // from the grpc library appearing on stdout. - gpr_disable_all_logs(); + grpc_disable_all_absl_logs(); std::shared_ptr channel( grpc::CreateChannel(absl::GetFlag(FLAGS_metrics_server_address),