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_ASSERT

Browse Source
pull/36517/head
tanvi-jagtap 9 months ago
parent 9348cacf88
commit 04918e51a0
6 changed files with 93 additions and 108 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. 5
      test/cpp/util/BUILD
  2. 44
      test/cpp/util/channelz_sampler.cc
  3. 21
      test/cpp/util/channelz_sampler_test.cc
  4. 13
      test/cpp/util/cli_credentials.cc
  5. 10
      test/cpp/util/metrics_server.cc
  6. 108
      test/cpp/util/proto_reflection_descriptor_database.cc

5
test/cpp/util/BUILD
Unescape View File

@ -45,6 +45,7 @@ grpc_cc_library(
hdrs = [ hdrs = [
"proto_reflection_descriptor_database.h", "proto_reflection_descriptor_database.h",
], ],
external_deps = ["absl/log:log"],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//:grpc++_config_proto", "//:grpc++_config_proto",
@ -142,6 +143,7 @@ grpc_cc_library(
external_deps = [ external_deps = [
"absl/flags:flag", "absl/flags:flag",
"absl/log:check", "absl/log:check",
"absl/log:log",
"protobuf", "protobuf",
"protobuf_clib", "protobuf_clib",
], ],
@ -176,6 +178,7 @@ grpc_cc_library(
hdrs = [ hdrs = [
"metrics_server.h", "metrics_server.h",
], ],
external_deps = ["absl/log:log"],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:metrics_proto", "//src/proto/grpc/testing:metrics_proto",
@ -339,6 +342,7 @@ grpc_cc_binary(
external_deps = [ external_deps = [
"absl/flags:flag", "absl/flags:flag",
"absl/log:check", "absl/log:check",
"absl/log:log",
"absl/strings", "absl/strings",
], ],
language = "c++", language = "c++",
@ -365,6 +369,7 @@ grpc_cc_test(
], ],
external_deps = [ external_deps = [
"absl/log:check", "absl/log:check",
"absl/log:log",
"gtest", "gtest",
], ],
flaky = True, flaky = True,

44
test/cpp/util/channelz_sampler.cc
Unescape View File

@ -28,6 +28,7 @@
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/log/check.h" #include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "absl/strings/str_join.h" #include "absl/strings/str_join.h"
#include "google/protobuf/text_format.h" #include "google/protobuf/text_format.h"
@ -133,8 +134,8 @@ class ChannelzSampler final {
Status status = channelz_stub_->GetChannel( Status status = channelz_stub_->GetChannel(
&get_channel_context, get_channel_request, &get_channel_response); &get_channel_context, get_channel_request, &get_channel_response);
if (!status.ok()) { if (!status.ok()) {
gpr_log(GPR_ERROR, "GetChannelRPC failed: %s", LOG(ERROR) << "GetChannelRPC failed: "
get_channel_context.debug_error_string().c_str()); << get_channel_context.debug_error_string();
CHECK(0); CHECK(0);
} }
return get_channel_response.channel(); return get_channel_response.channel();
@ -152,8 +153,8 @@ class ChannelzSampler final {
get_subchannel_request, get_subchannel_request,
&get_subchannel_response); &get_subchannel_response);
if (!status.ok()) { if (!status.ok()) {
gpr_log(GPR_ERROR, "GetSubchannelRPC failed: %s", LOG(ERROR) << "GetSubchannelRPC failed: "
get_subchannel_context.debug_error_string().c_str()); << get_subchannel_context.debug_error_string();
CHECK(0); CHECK(0);
} }
return get_subchannel_response.subchannel(); return get_subchannel_response.subchannel();
@ -170,8 +171,8 @@ class ChannelzSampler final {
Status status = channelz_stub_->GetSocket( Status status = channelz_stub_->GetSocket(
&get_socket_context, get_socket_request, &get_socket_response); &get_socket_context, get_socket_request, &get_socket_response);
if (!status.ok()) { if (!status.ok()) {
gpr_log(GPR_ERROR, "GetSocketRPC failed: %s", LOG(ERROR) << "GetSocketRPC failed: "
get_socket_context.debug_error_string().c_str()); << get_socket_context.debug_error_string();
CHECK(0); CHECK(0);
} }
return get_socket_response.socket(); return get_socket_response.socket();
@ -297,10 +298,9 @@ class ChannelzSampler final {
grpc::testing::GetCredentialsProvider()->GetChannelCredentials( grpc::testing::GetCredentialsProvider()->GetChannelCredentials(
custom_credentials_type, &channel_args); custom_credentials_type, &channel_args);
if (!channel_creds) { if (!channel_creds) {
gpr_log(GPR_ERROR, LOG(ERROR) << "Wrong user credential type: " << custom_credentials_type
"Wrong user credential type: %s. Allowed credential types: " << ". Allowed credential types: INSECURE_CREDENTIALS, ssl, "
"INSECURE_CREDENTIALS, ssl, alts, google_default_credentials.", "alts, google_default_credentials.";
custom_credentials_type.c_str());
CHECK(0); CHECK(0);
} }
std::shared_ptr<grpc::Channel> channel = std::shared_ptr<grpc::Channel> channel =
@ -324,15 +324,14 @@ class ChannelzSampler final {
&get_servers_context, get_servers_request, &get_servers_response); &get_servers_context, get_servers_request, &get_servers_response);
if (!status.ok()) { if (!status.ok()) {
if (status.error_code() == StatusCode::UNIMPLEMENTED) { if (status.error_code() == StatusCode::UNIMPLEMENTED) {
gpr_log(GPR_ERROR, LOG(ERROR) << "Error status UNIMPLEMENTED. Please check and make "
"Error status UNIMPLEMENTED. Please check and make sure " "sure channelz has been registered on the server being "
"channelz has been registered on the server being queried."); "queried.";
} else { } else {
gpr_log(GPR_ERROR, LOG(ERROR) << "GetServers RPC with "
"GetServers RPC with GetServersRequest.server_start_id=%d, " "GetServersRequest.server_start_id="
"failed: %s", << server_start_id << ", failed: "
static_cast<int>(server_start_id), << get_servers_context.debug_error_string();
get_servers_context.debug_error_string().c_str());
} }
CHECK(0); CHECK(0);
} }
@ -384,11 +383,10 @@ class ChannelzSampler final {
&get_top_channels_context, get_top_channels_request, &get_top_channels_context, get_top_channels_request,
&get_top_channels_response); &get_top_channels_response);
if (!status.ok()) { if (!status.ok()) {
gpr_log(GPR_ERROR, LOG(ERROR) << "GetTopChannels RPC with "
"GetTopChannels RPC with " "GetTopChannelsRequest.channel_start_id="
"GetTopChannelsRequest.channel_start_id=%d failed: %s", << channel_start_id << " failed: "
static_cast<int>(channel_start_id), << get_top_channels_context.debug_error_string();
get_top_channels_context.debug_error_string().c_str());
CHECK(0); CHECK(0);
} }
for (const auto& _topchannel : get_top_channels_response.channel()) { for (const auto& _topchannel : get_top_channels_response.channel()) {

21
test/cpp/util/channelz_sampler_test.cc
Unescape View File

@ -25,6 +25,7 @@
#include <thread> #include <thread>
#include "absl/log/check.h" #include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
@ -85,7 +86,7 @@ void RunClient(const std::string& client_id, gpr_event* done_ev) {
std::unique_ptr<grpc::testing::TestService::Stub> stub = std::unique_ptr<grpc::testing::TestService::Stub> stub =
grpc::testing::TestService::NewStub( grpc::testing::TestService::NewStub(
grpc::CreateChannel(server_address, channel_creds)); grpc::CreateChannel(server_address, channel_creds));
gpr_log(GPR_INFO, "Client %s is echoing!", client_id.c_str()); LOG(INFO) << "Client " << client_id << " is echoing!";
while (true) { while (true) {
if (gpr_event_wait(done_ev, grpc_timeout_seconds_to_deadline(1)) != if (gpr_event_wait(done_ev, grpc_timeout_seconds_to_deadline(1)) !=
nullptr) { nullptr) {
@ -96,7 +97,7 @@ void RunClient(const std::string& client_id, gpr_event* done_ev) {
ClientContext context; ClientContext context;
Status status = stub->EmptyCall(&context, request, &response); Status status = stub->EmptyCall(&context, request, &response);
if (!status.ok()) { if (!status.ok()) {
gpr_log(GPR_ERROR, "Client echo failed."); LOG(ERROR) << "Client echo failed.";
CHECK(0); CHECK(0);
} }
} }
@ -125,7 +126,7 @@ TEST(ChannelzSamplerTest, SimpleTest) {
builder.AddListeningPort(server_address, server_creds); builder.AddListeningPort(server_address, server_creds);
builder.RegisterService(&service); builder.RegisterService(&service);
std::unique_ptr<Server> server(builder.BuildAndStart()); std::unique_ptr<Server> server(builder.BuildAndStart());
gpr_log(GPR_INFO, "Server listening on %s", server_address.c_str()); LOG(INFO) << "Server listening on " << server_address;
const int kWaitForServerSeconds = 10; const int kWaitForServerSeconds = 10;
ASSERT_TRUE(WaitForConnection(kWaitForServerSeconds)); ASSERT_TRUE(WaitForConnection(kWaitForServerSeconds));
// client threads // client threads
@ -144,19 +145,17 @@ TEST(ChannelzSamplerTest, SimpleTest) {
int status = test_driver->Join(); int status = test_driver->Join();
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
if (WEXITSTATUS(status)) { if (WEXITSTATUS(status)) {
gpr_log(GPR_ERROR, LOG(ERROR) << "Channelz sampler test test-runner exited with code "
"Channelz sampler test test-runner exited with code %d", << WEXITSTATUS(status);
WEXITSTATUS(status));
CHECK(0); // log the line number of the assertion failure CHECK(0); // log the line number of the assertion failure
} }
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
gpr_log(GPR_ERROR, "Channelz sampler test test-runner ended from signal %d", LOG(ERROR) << "Channelz sampler test test-runner ended from signal "
WTERMSIG(status)); << WTERMSIG(status);
CHECK(0); CHECK(0);
} else { } else {
gpr_log(GPR_ERROR, LOG(ERROR) << "Channelz sampler test test-runner ended with unknown status "
"Channelz sampler test test-runner ended with unknown status %d", << status;
status);
CHECK(0); CHECK(0);
} }
delete test_driver; delete test_driver;

13
test/cpp/util/cli_credentials.cc
Unescape View File

@ -19,6 +19,7 @@
#include "test/cpp/util/cli_credentials.h" #include "test/cpp/util/cli_credentials.h"
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/log/log.h"
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
@ -97,9 +98,9 @@ CliCredentials::GetChannelCredentials() const {
auto cert = grpc_core::LoadFile(absl::GetFlag(FLAGS_ssl_client_cert), auto cert = grpc_core::LoadFile(absl::GetFlag(FLAGS_ssl_client_cert),
/*add_null_terminator=*/false); /*add_null_terminator=*/false);
if (!cert.ok()) { if (!cert.ok()) {
gpr_log(GPR_ERROR, "error loading file %s: %s", LOG(ERROR) << "error loading file "
absl::GetFlag(FLAGS_ssl_client_cert).c_str(), << absl::GetFlag(FLAGS_ssl_client_cert) << ": "
cert.status().ToString().c_str()); << cert.status();
} else { } else {
ssl_creds_options.pem_cert_chain = std::string(cert->as_string_view()); ssl_creds_options.pem_cert_chain = std::string(cert->as_string_view());
} }
@ -108,9 +109,9 @@ CliCredentials::GetChannelCredentials() const {
auto key = grpc_core::LoadFile(absl::GetFlag(FLAGS_ssl_client_key), auto key = grpc_core::LoadFile(absl::GetFlag(FLAGS_ssl_client_key),
/*add_null_terminator=*/false); /*add_null_terminator=*/false);
if (!key.ok()) { if (!key.ok()) {
gpr_log(GPR_ERROR, "error loading file %s: %s", LOG(ERROR) << "error loading file "
absl::GetFlag(FLAGS_ssl_client_key).c_str(), << absl::GetFlag(FLAGS_ssl_client_key) << ": "
key.status().ToString().c_str()); << key.status();
} else { } else {
ssl_creds_options.pem_private_key = std::string(key->as_string_view()); ssl_creds_options.pem_private_key = std::string(key->as_string_view());
} }

10
test/cpp/util/metrics_server.cc
Unescape View File

@ -18,6 +18,8 @@
#include "test/cpp/util/metrics_server.h" #include "test/cpp/util/metrics_server.h"
#include "absl/log/log.h"
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpcpp/server.h> #include <grpcpp/server.h>
#include <grpcpp/server_builder.h> #include <grpcpp/server_builder.h>
@ -54,7 +56,7 @@ long QpsGauge::Get() {
grpc::Status MetricsServiceImpl::GetAllGauges( grpc::Status MetricsServiceImpl::GetAllGauges(
ServerContext* /*context*/, const EmptyMessage* /*request*/, ServerContext* /*context*/, const EmptyMessage* /*request*/,
ServerWriter<GaugeResponse>* writer) { ServerWriter<GaugeResponse>* writer) {
gpr_log(GPR_DEBUG, "GetAllGauges called"); VLOG(2) << "GetAllGauges called";
std::lock_guard<std::mutex> lock(mu_); std::lock_guard<std::mutex> lock(mu_);
for (auto it = qps_gauges_.begin(); it != qps_gauges_.end(); it++) { for (auto it = qps_gauges_.begin(); it != qps_gauges_.end(); it++) {
@ -99,7 +101,7 @@ std::shared_ptr<QpsGauge> MetricsServiceImpl::CreateQpsGauge(
// Starts the metrics server and returns the grpc::Server instance. Call Wait() // Starts the metrics server and returns the grpc::Server instance. Call Wait()
// on the returned server instance. // on the returned server instance.
std::unique_ptr<grpc::Server> MetricsServiceImpl::StartServer(int port) { std::unique_ptr<grpc::Server> MetricsServiceImpl::StartServer(int port) {
gpr_log(GPR_INFO, "Building metrics server.."); LOG(INFO) << "Building metrics server..";
const std::string address = "0.0.0.0:" + std::to_string(port); const std::string address = "0.0.0.0:" + std::to_string(port);
@ -108,8 +110,8 @@ std::unique_ptr<grpc::Server> MetricsServiceImpl::StartServer(int port) {
builder.RegisterService(this); builder.RegisterService(this);
std::unique_ptr<grpc::Server> server(builder.BuildAndStart()); std::unique_ptr<grpc::Server> server(builder.BuildAndStart());
gpr_log(GPR_INFO, "Metrics server %s started. Ready to receive requests..", LOG(INFO) << "Metrics server " << address
address.c_str()); << " started. Ready to receive requests..";
return server; return server;
} }

108
test/cpp/util/proto_reflection_descriptor_database.cc
Unescape View File

@ -20,9 +20,7 @@
#include <vector> #include <vector>
#include <grpc/support/log.h> #include "absl/log/log.h"
#include "src/core/lib/gprpp/crash.h"
using grpc::reflection::v1alpha::ErrorResponse; using grpc::reflection::v1alpha::ErrorResponse;
using grpc::reflection::v1alpha::ListServiceResponse; using grpc::reflection::v1alpha::ListServiceResponse;
@ -86,23 +84,19 @@ bool ProtoReflectionDescriptorDatabase::FindFileByName(
ServerReflectionResponse::MessageResponseCase::kErrorResponse) { ServerReflectionResponse::MessageResponseCase::kErrorResponse) {
const ErrorResponse& error = response.error_response(); const ErrorResponse& error = response.error_response();
if (error.error_code() == StatusCode::NOT_FOUND) { if (error.error_code() == StatusCode::NOT_FOUND) {
gpr_log(GPR_INFO, "NOT_FOUND from server for FindFileByName(%s)", LOG(INFO) << "NOT_FOUND from server for FindFileByName(" << filename
filename.c_str()); << ")";
} else { } else {
gpr_log(GPR_INFO, LOG(INFO) << "Error on FindFileByName(" << filename
"Error on FindFileByName(%s)\n\tError code: %d\n" << ")\n\tError code: " << error.error_code()
"\tError Message: %s", << "\n\tError Message: " << error.error_message();
filename.c_str(), error.error_code(),
error.error_message().c_str());
} }
} else { } else {
gpr_log( LOG(INFO) << "Error on FindFileByName(" << filename
GPR_INFO, << ") response type\n\tExpecting: "
"Error on FindFileByName(%s) response type\n" << ServerReflectionResponse::MessageResponseCase::
"\tExpecting: %d\n\tReceived: %d", kFileDescriptorResponse
filename.c_str(), << "\n\tReceived: " << response.message_response_case();
ServerReflectionResponse::MessageResponseCase::kFileDescriptorResponse,
response.message_response_case());
} }
return cached_db_.FindFileByName(filename, output); return cached_db_.FindFileByName(filename, output);
@ -134,24 +128,19 @@ bool ProtoReflectionDescriptorDatabase::FindFileContainingSymbol(
const ErrorResponse& error = response.error_response(); const ErrorResponse& error = response.error_response();
if (error.error_code() == StatusCode::NOT_FOUND) { if (error.error_code() == StatusCode::NOT_FOUND) {
missing_symbols_.insert(symbol_name); missing_symbols_.insert(symbol_name);
gpr_log(GPR_INFO, LOG(INFO) << "NOT_FOUND from server for FindFileContainingSymbol("
"NOT_FOUND from server for FindFileContainingSymbol(%s)", << symbol_name << ")";
symbol_name.c_str());
} else { } else {
gpr_log(GPR_INFO, LOG(INFO) << "Error on FindFileContainingSymbol(" << symbol_name
"Error on FindFileContainingSymbol(%s)\n" << ")\n\tError code: " << error.error_code()
"\tError code: %d\n\tError Message: %s", << "\n\tError Message: " << error.error_message();
symbol_name.c_str(), error.error_code(),
error.error_message().c_str());
} }
} else { } else {
gpr_log( LOG(INFO) << "Error on FindFileContainingSymbol(" << symbol_name
GPR_INFO, << ") response type\n\tExpecting: "
"Error on FindFileContainingSymbol(%s) response type\n" << ServerReflectionResponse::MessageResponseCase::
"\tExpecting: %d\n\tReceived: %d", kFileDescriptorResponse
symbol_name.c_str(), << "\n\tReceived: " << response.message_response_case();
ServerReflectionResponse::MessageResponseCase::kFileDescriptorResponse,
response.message_response_case());
} }
return cached_db_.FindFileContainingSymbol(symbol_name, output); return cached_db_.FindFileContainingSymbol(symbol_name, output);
} }
@ -167,7 +156,7 @@ bool ProtoReflectionDescriptorDatabase::FindFileContainingExtension(
if (missing_extensions_.find(containing_type) != missing_extensions_.end() && if (missing_extensions_.find(containing_type) != missing_extensions_.end() &&
missing_extensions_[containing_type].find(field_number) != missing_extensions_[containing_type].find(field_number) !=
missing_extensions_[containing_type].end()) { missing_extensions_[containing_type].end()) {
gpr_log(GPR_INFO, "nested map."); LOG(INFO) << "nested map.";
return false; return false;
} }
@ -194,24 +183,20 @@ bool ProtoReflectionDescriptorDatabase::FindFileContainingExtension(
missing_extensions_[containing_type] = {}; missing_extensions_[containing_type] = {};
} }
missing_extensions_[containing_type].insert(field_number); missing_extensions_[containing_type].insert(field_number);
gpr_log(GPR_INFO, LOG(INFO) << "NOT_FOUND from server for FindFileContainingExtension("
"NOT_FOUND from server for FindFileContainingExtension(%s, %d)", << containing_type << ", " << field_number << ")";
containing_type.c_str(), field_number);
} else { } else {
gpr_log(GPR_INFO, LOG(INFO) << "Error on FindFileContainingExtension(" << containing_type
"Error on FindFileContainingExtension(%s, %d)\n" << ", " << field_number
"\tError code: %d\n\tError Message: %s", << ")\n\tError code: " << error.error_code()
containing_type.c_str(), field_number, error.error_code(), << "\n\tError Message: " << error.error_message();
error.error_message().c_str());
} }
} else { } else {
gpr_log( LOG(INFO) << "Error on FindFileContainingExtension(" << containing_type
GPR_INFO, << ", " << field_number << ") response type\n\tExpecting: "
"Error on FindFileContainingExtension(%s, %d) response type\n" << ServerReflectionResponse::MessageResponseCase::
"\tExpecting: %d\n\tReceived: %d", kFileDescriptorResponse
containing_type.c_str(), field_number, << "\n\tReceived: " << response.message_response_case();
ServerReflectionResponse::MessageResponseCase::kFileDescriptorResponse,
response.message_response_case());
} }
return cached_db_.FindFileContainingExtension(containing_type, field_number, return cached_db_.FindFileContainingExtension(containing_type, field_number,
@ -245,14 +230,12 @@ bool ProtoReflectionDescriptorDatabase::FindAllExtensionNumbers(
ServerReflectionResponse::MessageResponseCase::kErrorResponse) { ServerReflectionResponse::MessageResponseCase::kErrorResponse) {
const ErrorResponse& error = response.error_response(); const ErrorResponse& error = response.error_response();
if (error.error_code() == StatusCode::NOT_FOUND) { if (error.error_code() == StatusCode::NOT_FOUND) {
gpr_log(GPR_INFO, "NOT_FOUND from server for FindAllExtensionNumbers(%s)", LOG(INFO) << "NOT_FOUND from server for FindAllExtensionNumbers("
extendee_type.c_str()); << extendee_type << ")";
} else { } else {
gpr_log(GPR_INFO, LOG(INFO) << "Error on FindAllExtensionNumbersExtension(" << extendee_type
"Error on FindAllExtensionNumbersExtension(%s)\n" << ")\n\tError code: " << error.error_code()
"\tError code: %d\n\tError Message: %s", << "\n\tError Message: " << error.error_message();
extendee_type.c_str(), error.error_code(),
error.error_message().c_str());
} }
} }
return false; return false;
@ -278,16 +261,13 @@ bool ProtoReflectionDescriptorDatabase::GetServices(
} else if (response.message_response_case() == } else if (response.message_response_case() ==
ServerReflectionResponse::MessageResponseCase::kErrorResponse) { ServerReflectionResponse::MessageResponseCase::kErrorResponse) {
const ErrorResponse& error = response.error_response(); const ErrorResponse& error = response.error_response();
gpr_log(GPR_INFO, LOG(INFO) << "Error on GetServices()\n\tError code: " << error.error_code()
"Error on GetServices()\n\tError code: %d\n" << "\n\tError Message: " << error.error_message();
"\tError Message: %s",
error.error_code(), error.error_message().c_str());
} else { } else {
gpr_log( LOG(INFO)
GPR_INFO, << "Error on GetServices() response type\n\tExpecting: "
"Error on GetServices() response type\n\tExpecting: %d\n\tReceived: %d", << ServerReflectionResponse::MessageResponseCase::kListServicesResponse
ServerReflectionResponse::MessageResponseCase::kListServicesResponse, << "\n\tReceived: " << response.message_response_case();
response.message_response_case());
} }
return false; return false;
} }

Write Preview
Loading…
Cancel
Save