Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log

Browse Source
pull/36577/head
tanvi-jagtap 7 months ago
parent bc4766381a
commit cdcb1d2874
8 changed files with 39 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      test/core/address_utils/parse_address_test.cc
  2. 13
      test/core/address_utils/parse_address_with_named_scope_id_test.cc
  3. 13
      test/core/bad_client/bad_client.cc
  4. 13
      test/core/bad_connection/close_fd_test.cc
  5. 2
      test/core/bad_ssl/server_common.cc
  6. 4
      test/core/channel/channel_args_test.cc
  7. 12
      test/core/channel/metrics_test.cc
  8. 9
      test/core/compression/compression_test.cc

14
test/core/address_utils/parse_address_test.cc
Unescape View File

@ -34,12 +34,12 @@
#include <string> #include <string>
#include "absl/log/log.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h>
#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/port.h"
@ -53,7 +53,7 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) {
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;
@ -70,7 +70,7 @@ static void test_grpc_parse_unix_abstract(const char* uri_text,
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;
@ -98,7 +98,7 @@ static void test_grpc_parse_vsock(const char* uri_text, uint32_t cid,
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;
@ -122,7 +122,7 @@ static void test_grpc_parse_ipv4(const char* uri_text, const char* host,
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;
@ -142,7 +142,7 @@ static void test_grpc_parse_ipv6(const char* uri_text, const char* host,
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;
@ -162,7 +162,7 @@ static void test_grpc_parse_ipv6_invalid(const char* uri_text) {
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text); absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_text);
if (!uri.ok()) { if (!uri.ok()) {
gpr_log(GPR_ERROR, "%s", uri.status().ToString().c_str()); LOG(ERROR) << uri.status();
ASSERT_TRUE(uri.ok()); ASSERT_TRUE(uri.ok());
} }
grpc_resolved_address addr; grpc_resolved_address addr;

13
test/core/address_utils/parse_address_with_named_scope_id_test.cc
Unescape View File

@ -28,13 +28,13 @@
#include <string> #include <string>
#include "absl/log/log.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h>
#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/crash.h"
@ -114,10 +114,8 @@ TEST(ParseAddressWithNamedScopeIdTest, MainTest) {
// system recognizes, and then use that for the test. // system recognizes, and then use that for the test.
for (size_t i = 1; i < 65536; i++) { for (size_t i = 1; i < 65536; i++) {
if (if_indextoname(i, arbitrary_interface_name) != nullptr) { if (if_indextoname(i, arbitrary_interface_name) != nullptr) {
gpr_log(GPR_DEBUG, VLOG(2) << "Found interface at index " << i << " named "
"Found interface at index %" PRIuPTR << arbitrary_interface_name << ". Will use this for the test";
" named %s. Will use this for the test",
i, arbitrary_interface_name);
break; break;
} }
} }
@ -127,9 +125,8 @@ TEST(ParseAddressWithNamedScopeIdTest, MainTest) {
struct sockaddr_in6 result_from_getaddrinfo = struct sockaddr_in6 result_from_getaddrinfo =
resolve_with_gettaddrinfo(target.c_str()); resolve_with_gettaddrinfo(target.c_str());
// Run the test // Run the test
gpr_log(GPR_DEBUG, VLOG(2) << "Run test_grpc_parse_ipv6_parity_with_getaddrinfo with target: "
"Run test_grpc_parse_ipv6_parity_with_getaddrinfo with target: %s", << target;
target.c_str());
test_grpc_parse_ipv6_parity_with_getaddrinfo(target.c_str(), test_grpc_parse_ipv6_parity_with_getaddrinfo(target.c_str(),
result_from_getaddrinfo); result_from_getaddrinfo);
// Cleanup // Cleanup

13
test/core/bad_client/bad_client.cc
Unescape View File

@ -111,11 +111,11 @@ void grpc_run_client_side_validator(grpc_bad_client_arg* arg, uint32_t flags,
hex = gpr_dump(arg->client_payload, arg->client_payload_length, hex = gpr_dump(arg->client_payload, arg->client_payload_length,
GPR_DUMP_HEX | GPR_DUMP_ASCII); GPR_DUMP_HEX | GPR_DUMP_ASCII);
// Add a debug log // Add a debug log
gpr_log(GPR_INFO, "TEST: %s", hex); LOG(INFO) << "TEST: " << hex;
gpr_free(hex); gpr_free(hex);
} else { } else {
gpr_log(GPR_INFO, "TEST: (%" PRIdPTR " byte long string)", LOG(INFO) << "TEST: (" << arg->client_payload_length
arg->client_payload_length); << " byte long string)";
} }
grpc_slice slice = grpc_slice_from_copied_buffer(arg->client_payload, grpc_slice slice = grpc_slice_from_copied_buffer(arg->client_payload,
@ -171,9 +171,8 @@ void grpc_run_client_side_validator(grpc_bad_client_arg* arg, uint32_t flags,
.type == GRPC_QUEUE_TIMEOUT); .type == GRPC_QUEUE_TIMEOUT);
} while (!gpr_event_get(&read_done_event)); } while (!gpr_event_get(&read_done_event));
if (arg->client_validator(&incoming, arg->client_validator_arg)) break; if (arg->client_validator(&incoming, arg->client_validator_arg)) break;
gpr_log(GPR_INFO, LOG(INFO) << "client validator failed; trying additional read "
"client validator failed; trying additional read " "in case we didn't get all the data";
"in case we didn't get all the data");
} }
grpc_slice_buffer_destroy(&incoming); grpc_slice_buffer_destroy(&incoming);
} }
@ -317,7 +316,7 @@ bool rst_stream_client_validator(grpc_slice_buffer* incoming, void* /*arg*/) {
*p++ == 0 || *p++ == 0 || *p++ == 0 || *p == 0 || *p == 11; *p++ == 0 || *p++ == 0 || *p++ == 0 || *p == 0 || *p == 11;
if (!success) { if (!success) {
gpr_log(GPR_INFO, "client expected RST_STREAM frame, not found"); LOG(INFO) << "client expected RST_STREAM frame, not found";
} }
grpc_slice_buffer_destroy(&last_frame_buffer); grpc_slice_buffer_destroy(&last_frame_buffer);

13
test/core/bad_connection/close_fd_test.cc
Unescape View File

@ -24,6 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include "absl/log/check.h" #include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
@ -225,8 +226,8 @@ static void _test_close_before_server_recv(fd_type fdtype) {
grpc_raw_byte_buffer_create(&request_payload_slice, 1); grpc_raw_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer* response_payload = grpc_byte_buffer* response_payload =
grpc_raw_byte_buffer_create(&response_payload_slice, 1); grpc_raw_byte_buffer_create(&response_payload_slice, 1);
gpr_log(GPR_INFO, "Running test: test_close_%s_before_server_recv", LOG(INFO) << "Running test: test_close_" << fd_type_str(fdtype)
fd_type_str(fdtype)); << "_before_server_recv";
test_init(); test_init();
grpc_op ops[6]; grpc_op ops[6];
@ -399,8 +400,8 @@ static void _test_close_before_server_send(fd_type fdtype) {
grpc_raw_byte_buffer_create(&request_payload_slice, 1); grpc_raw_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer* response_payload = grpc_byte_buffer* response_payload =
grpc_raw_byte_buffer_create(&response_payload_slice, 1); grpc_raw_byte_buffer_create(&response_payload_slice, 1);
gpr_log(GPR_INFO, "Running test: test_close_%s_before_server_send", LOG(INFO) << "Running test: test_close_" << fd_type_str(fdtype)
fd_type_str(fdtype)); << "_before_server_send";
test_init(); test_init();
grpc_op ops[6]; grpc_op ops[6];
@ -596,8 +597,8 @@ static void _test_close_before_client_send(fd_type fdtype) {
grpc_raw_byte_buffer_create(&request_payload_slice, 1); grpc_raw_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer* response_payload = grpc_byte_buffer* response_payload =
grpc_raw_byte_buffer_create(&response_payload_slice, 1); grpc_raw_byte_buffer_create(&response_payload_slice, 1);
gpr_log(GPR_INFO, "Running test: test_close_%s_before_client_send", LOG(INFO) << "Running test: test_close_" << fd_type_str(fdtype)
fd_type_str(fdtype)); << "_before_client_send";
test_init(); test_init();
grpc_op ops[6]; grpc_op ops[6];

2
test/core/bad_ssl/server_common.cc
Unescape View File

@ -74,7 +74,7 @@ void bad_ssl_run(grpc_server* server) {
signal(SIGINT, sigint_handler); signal(SIGINT, sigint_handler);
while (!shutdown_finished) { while (!shutdown_finished) {
if (got_sigint && !shutdown_started) { 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); shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
grpc_server_shutdown_and_notify(server, shutdown_cq, nullptr); grpc_server_shutdown_and_notify(server, shutdown_cq, nullptr);
CHECK(grpc_completion_queue_pluck(shutdown_cq, nullptr, CHECK(grpc_completion_queue_pluck(shutdown_cq, nullptr,

4
test/core/channel/channel_args_test.cc
Unescape View File

@ -272,7 +272,7 @@ struct fake_class {
}; };
static void* fake_pointer_arg_copy(void* arg) { static void* fake_pointer_arg_copy(void* arg) {
gpr_log(GPR_DEBUG, "fake_pointer_arg_copy"); VLOG(2) << "fake_pointer_arg_copy";
fake_class* fc = static_cast<fake_class*>(arg); fake_class* fc = static_cast<fake_class*>(arg);
fake_class* new_fc = static_cast<fake_class*>(gpr_malloc(sizeof(fake_class))); fake_class* new_fc = static_cast<fake_class*>(gpr_malloc(sizeof(fake_class)));
new_fc->foo = fc->foo; new_fc->foo = fc->foo;
@ -280,7 +280,7 @@ static void* fake_pointer_arg_copy(void* arg) {
} }
static void fake_pointer_arg_destroy(void* arg) { static void fake_pointer_arg_destroy(void* arg) {
gpr_log(GPR_DEBUG, "fake_pointer_arg_destroy"); VLOG(2) << "fake_pointer_arg_destroy";
fake_class* fc = static_cast<fake_class*>(arg); fake_class* fc = static_cast<fake_class*>(arg);
gpr_free(fc); gpr_free(fc);
} }

12
test/core/channel/metrics_test.cc
Unescape View File

@ -217,7 +217,7 @@ TEST_F(MetricsTest, Int64CallbackGauge) {
auto plugin3 = MakeStatsPluginForTarget(kDomain1To4); auto plugin3 = MakeStatsPluginForTarget(kDomain1To4);
// Register two callbacks that set the same metric but with different // Register two callbacks that set the same metric but with different
// label values. The callbacks get used only by plugin1. // label values. The callbacks get used only by plugin1.
gpr_log(GPR_INFO, "testing callbacks for: plugin1"); LOG(INFO) << "testing callbacks for: plugin1";
auto group1 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel( auto group1 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
StatsPluginChannelScope(kDomain3To4, "")); StatsPluginChannelScope(kDomain3To4, ""));
auto callback1 = group1.RegisterCallback( auto callback1 = group1.RegisterCallback(
@ -278,7 +278,7 @@ TEST_F(MetricsTest, Int64CallbackGauge) {
callback1.reset(); callback1.reset();
callback2.reset(); callback2.reset();
// Now register callbacks that hit both plugin1 and plugin2. // Now register callbacks that hit both plugin1 and plugin2.
gpr_log(GPR_INFO, "testing callbacks for: plugin1, plugin2"); LOG(INFO) << "testing callbacks for: plugin1, plugin2";
auto group2 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel( auto group2 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
StatsPluginChannelScope(kDomain2To4, "")); StatsPluginChannelScope(kDomain2To4, ""));
callback1 = group2.RegisterCallback( callback1 = group2.RegisterCallback(
@ -339,7 +339,7 @@ TEST_F(MetricsTest, Int64CallbackGauge) {
callback1.reset(); callback1.reset();
callback2.reset(); callback2.reset();
// Now register callbacks that hit all three plugins. // Now register callbacks that hit all three plugins.
gpr_log(GPR_INFO, "testing callbacks for: plugin1, plugin2, plugin3"); LOG(INFO) << "testing callbacks for: plugin1, plugin2, plugin3";
auto group3 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel( auto group3 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
StatsPluginChannelScope(kDomain1To4, "")); StatsPluginChannelScope(kDomain1To4, ""));
callback1 = group3.RegisterCallback( callback1 = group3.RegisterCallback(
@ -422,7 +422,7 @@ TEST_F(MetricsTest, DoubleCallbackGauge) {
auto plugin3 = MakeStatsPluginForTarget(kDomain1To4); auto plugin3 = MakeStatsPluginForTarget(kDomain1To4);
// Register two callbacks that set the same metric but with different // Register two callbacks that set the same metric but with different
// label values. The callbacks get used only by plugin1. // label values. The callbacks get used only by plugin1.
gpr_log(GPR_INFO, "testing callbacks for: plugin1"); LOG(INFO) << "testing callbacks for: plugin1";
auto group1 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel( auto group1 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
StatsPluginChannelScope(kDomain3To4, "")); StatsPluginChannelScope(kDomain3To4, ""));
auto callback1 = group1.RegisterCallback( auto callback1 = group1.RegisterCallback(
@ -483,7 +483,7 @@ TEST_F(MetricsTest, DoubleCallbackGauge) {
callback1.reset(); callback1.reset();
callback2.reset(); callback2.reset();
// Now register callbacks that hit both plugin1 and plugin2. // Now register callbacks that hit both plugin1 and plugin2.
gpr_log(GPR_INFO, "testing callbacks for: plugin1, plugin2"); LOG(INFO) << "testing callbacks for: plugin1, plugin2";
auto group2 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel( auto group2 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
StatsPluginChannelScope(kDomain2To4, "")); StatsPluginChannelScope(kDomain2To4, ""));
callback1 = group2.RegisterCallback( callback1 = group2.RegisterCallback(
@ -544,7 +544,7 @@ TEST_F(MetricsTest, DoubleCallbackGauge) {
callback1.reset(); callback1.reset();
callback2.reset(); callback2.reset();
// Now register callbacks that hit all three plugins. // Now register callbacks that hit all three plugins.
gpr_log(GPR_INFO, "testing callbacks for: plugin1, plugin2, plugin3"); LOG(INFO) << "testing callbacks for: plugin1, plugin2, plugin3";
auto group3 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel( auto group3 = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
StatsPluginChannelScope(kDomain1To4, "")); StatsPluginChannelScope(kDomain1To4, ""));
callback1 = group3.RegisterCallback( callback1 = group3.RegisterCallback(

9
test/core/compression/compression_test.cc
Unescape View File

@ -21,6 +21,7 @@
#include <memory> #include <memory>
#include "absl/log/log.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <grpc/compression.h> #include <grpc/compression.h>
@ -40,7 +41,7 @@ TEST(CompressionTest, CompressionAlgorithmParse) {
}; };
const char* invalid_names[] = {"gzip2", "foo", "", "2gzip"}; const char* invalid_names[] = {"gzip2", "foo", "", "2gzip"};
gpr_log(GPR_DEBUG, "test_compression_algorithm_parse"); VLOG(2) << "test_compression_algorithm_parse";
for (i = 0; i < GPR_ARRAY_SIZE(valid_names); i++) { for (i = 0; i < GPR_ARRAY_SIZE(valid_names); i++) {
const char* valid_name = valid_names[i]; const char* valid_name = valid_names[i];
@ -73,7 +74,7 @@ TEST(CompressionTest, CompressionAlgorithmName) {
GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_DEFLATE,
}; };
gpr_log(GPR_DEBUG, "test_compression_algorithm_name"); VLOG(2) << "test_compression_algorithm_name";
for (i = 0; i < GPR_ARRAY_SIZE(valid_algorithms); i++) { for (i = 0; i < GPR_ARRAY_SIZE(valid_algorithms); i++) {
success = grpc_compression_algorithm_name(valid_algorithms[i], &name); success = grpc_compression_algorithm_name(valid_algorithms[i], &name);
@ -88,7 +89,7 @@ TEST(CompressionTest, CompressionAlgorithmName) {
} }
TEST(CompressionTest, CompressionAlgorithmForLevel) { TEST(CompressionTest, CompressionAlgorithmForLevel) {
gpr_log(GPR_DEBUG, "test_compression_algorithm_for_level"); VLOG(2) << "test_compression_algorithm_for_level";
{ {
// accept only identity (aka none) // accept only identity (aka none)
@ -211,7 +212,7 @@ TEST(CompressionTest, CompressionEnableDisableAlgorithm) {
grpc_compression_options options; grpc_compression_options options;
grpc_compression_algorithm algorithm; grpc_compression_algorithm algorithm;
gpr_log(GPR_DEBUG, "test_compression_enable_disable_algorithm"); VLOG(2) << "test_compression_enable_disable_algorithm";
grpc_compression_options_init(&options); grpc_compression_options_init(&options);
for (algorithm = GRPC_COMPRESS_NONE; for (algorithm = GRPC_COMPRESS_NONE;

Write Preview
Loading…
Cancel
Save