Skip to content

Commit

Permalink
[Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log (g…
Browse files Browse the repository at this point in the history 
…rpc#37053)

[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 grpc#37053

COPYBARA_INTEGRATE_REVIEW=grpc#37053 from tanvi-jagtap:large_file_02 54224e3
PiperOrigin-RevId: 648565511
  • Loading branch information
@tanvi-jagtap @copybara-github
tanvi-jagtap authored and copybara-github committed Jul 2, 2024
1 parent 4f951aa commit f9340bc
Showing 1 changed file with 46 additions and 56 deletions.
102 changes: 46 additions & 56 deletions src/core/resolver/xds/xds_dependency_manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <set>

#include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/strings/str_join.h"

#include <grpc/support/port_platform.h>
Expand Down Expand Up @@ -360,9 +361,8 @@ XdsDependencyManager::XdsDependencyManager(
args_(std::move(args)),
interested_parties_(interested_parties) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] starting watch for listener %s", this,
listener_resource_name_.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] starting watch for listener " << listener_resource_name_;
}
auto listener_watcher = MakeRefCounted<ListenerWatcher>(Ref());
listener_watcher_ = listener_watcher.get();
Expand All @@ -372,7 +372,7 @@ XdsDependencyManager::XdsDependencyManager(

void XdsDependencyManager::Orphan() {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] shutting down", this);
LOG(INFO) << "[XdsDependencyManager " << this << "] shutting down";
}
if (listener_watcher_ != nullptr) {
XdsListenerResourceType::CancelWatch(
Expand Down Expand Up @@ -405,8 +405,8 @@ void XdsDependencyManager::Orphan() {
void XdsDependencyManager::OnListenerUpdate(
std::shared_ptr<const XdsListenerResource> listener) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Listener update",
this);
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received Listener update";
}
if (xds_client_ == nullptr) return;
const auto* hcm = absl::get_if<XdsListenerResource::HttpConnectionManager>(
Expand Down Expand Up @@ -438,10 +438,9 @@ void XdsDependencyManager::OnListenerUpdate(
// Start watch for the new RDS resource name.
route_config_name_ = rds_name;
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(
GPR_INFO,
"[XdsDependencyManager %p] starting watch for route config %s",
this, route_config_name_.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] starting watch for route config "
<< route_config_name_;
}
auto watcher =
MakeRefCounted<RouteConfigWatcher>(Ref(), route_config_name_);
Expand Down Expand Up @@ -526,9 +525,9 @@ void XdsDependencyManager::OnRouteConfigUpdate(
const std::string& name,
std::shared_ptr<const XdsRouteConfigResource> route_config) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] received RouteConfig update for %s",
this, name.empty() ? "<inline>" : name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received RouteConfig update for "
<< (name.empty() ? "<inline>" : name);
}
if (xds_client_ == nullptr) return;
// Ignore updates for stale names.
Expand Down Expand Up @@ -561,10 +560,9 @@ void XdsDependencyManager::OnRouteConfigUpdate(

void XdsDependencyManager::OnError(std::string context, absl::Status status) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] received Listener or RouteConfig "
"error: %s %s",
this, context.c_str(), status.ToString().c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received Listener or RouteConfig error: " << context << " "
<< status;
}
if (xds_client_ == nullptr) return;
if (current_virtual_host_ != nullptr) return;
Expand All @@ -573,7 +571,7 @@ void XdsDependencyManager::OnError(std::string context, absl::Status status) {

void XdsDependencyManager::OnResourceDoesNotExist(std::string context) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] %s", this, context.c_str());
LOG(INFO) << "[XdsDependencyManager " << this << "] " << context;
}
if (xds_client_ == nullptr) return;
current_virtual_host_ = nullptr;
Expand All @@ -584,8 +582,8 @@ void XdsDependencyManager::OnClusterUpdate(
const std::string& name,
std::shared_ptr<const XdsClusterResource> cluster) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Cluster update: %s",
this, name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received Cluster update: " << name;
}
if (xds_client_ == nullptr) return;
auto it = cluster_watchers_.find(name);
Expand All @@ -597,8 +595,8 @@ void XdsDependencyManager::OnClusterUpdate(
void XdsDependencyManager::OnClusterError(const std::string& name,
absl::Status status) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Cluster error: %s %s",
this, name.c_str(), status.ToString().c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received Cluster error: " << name << " " << status;
}
if (xds_client_ == nullptr) return;
auto it = cluster_watchers_.find(name);
Expand All @@ -612,8 +610,8 @@ void XdsDependencyManager::OnClusterError(const std::string& name,

void XdsDependencyManager::OnClusterDoesNotExist(const std::string& name) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] Cluster does not exist: %s",
this, name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] Cluster does not exist: " << name;
}
if (xds_client_ == nullptr) return;
auto it = cluster_watchers_.find(name);
Expand All @@ -627,8 +625,8 @@ void XdsDependencyManager::OnEndpointUpdate(
const std::string& name,
std::shared_ptr<const XdsEndpointResource> endpoint) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Endpoint update: %s",
this, name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received Endpoint update: " << name;
}
if (xds_client_ == nullptr) return;
auto it = endpoint_watchers_.find(name);
Expand Down Expand Up @@ -659,9 +657,8 @@ void XdsDependencyManager::OnEndpointUpdate(
void XdsDependencyManager::OnEndpointError(const std::string& name,
absl::Status status) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] received Endpoint error: %s %s", this,
name.c_str(), status.ToString().c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received Endpoint error: " << name << " " << status;
}
if (xds_client_ == nullptr) return;
auto it = endpoint_watchers_.find(name);
Expand All @@ -675,8 +672,8 @@ void XdsDependencyManager::OnEndpointError(const std::string& name,

void XdsDependencyManager::OnEndpointDoesNotExist(const std::string& name) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] Endpoint does not exist: %s",
this, name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] Endpoint does not exist: " << name;
}
if (xds_client_ == nullptr) return;
auto it = endpoint_watchers_.find(name);
Expand All @@ -690,8 +687,8 @@ void XdsDependencyManager::OnEndpointDoesNotExist(const std::string& name) {
void XdsDependencyManager::OnDnsResult(const std::string& dns_name,
Resolver::Result result) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] received DNS update: %s", this,
dns_name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] received DNS update: " << dns_name;
}
if (xds_client_ == nullptr) return;
auto it = dns_resolvers_.find(dns_name);
Expand Down Expand Up @@ -749,9 +746,8 @@ bool XdsDependencyManager::PopulateClusterConfigMap(
if (state.watcher == nullptr) {
auto watcher = MakeRefCounted<ClusterWatcher>(Ref(), name);
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] starting watch for cluster %s", this,
std::string(name).c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] starting watch for cluster " << name;
}
state.watcher = watcher.get();
XdsClusterResourceType::StartWatch(xds_client_.get(), name,
Expand All @@ -777,9 +773,8 @@ bool XdsDependencyManager::PopulateClusterConfigMap(
auto& eds_state = endpoint_watchers_[eds_resource_name];
if (eds_state.watcher == nullptr) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] starting watch for endpoint %s",
this, std::string(eds_resource_name).c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] starting watch for endpoint " << eds_resource_name;
}
auto watcher =
MakeRefCounted<EndpointWatcher>(Ref(), eds_resource_name);
Expand All @@ -806,9 +801,8 @@ bool XdsDependencyManager::PopulateClusterConfigMap(
auto& dns_state = dns_resolvers_[logical_dns.hostname];
if (dns_state.resolver == nullptr) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] starting DNS resolver for %s",
this, logical_dns.hostname.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] starting DNS resolver for " << logical_dns.hostname;
}
auto* fake_resolver_response_generator = args_.GetPointer<
FakeResolverResponseGenerator>(
Expand Down Expand Up @@ -974,9 +968,8 @@ void XdsDependencyManager::MaybeReportUpdate() {
continue;
}
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] cancelling watch for cluster %s", this,
cluster_name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] cancelling watch for cluster " << cluster_name;
}
XdsClusterResourceType::CancelWatch(xds_client_.get(), cluster_name,
it->second.watcher,
Expand All @@ -993,9 +986,8 @@ void XdsDependencyManager::MaybeReportUpdate() {
continue;
}
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] cancelling watch for EDS resource %s",
this, eds_resource_name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] cancelling watch for EDS resource " << eds_resource_name;
}
XdsEndpointResourceType::CancelWatch(xds_client_.get(), eds_resource_name,
it->second.watcher,
Expand All @@ -1011,24 +1003,22 @@ void XdsDependencyManager::MaybeReportUpdate() {
continue;
}
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] shutting down DNS resolver for %s",
this, dns_name.c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] shutting down DNS resolver for " << dns_name;
}
dns_resolvers_.erase(it++);
}
// If we have all the data we need, then send an update.
if (!have_all_resources) {
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO,
"[XdsDependencyManager %p] missing data -- NOT returning config",
this);
LOG(INFO) << "[XdsDependencyManager " << this
<< "] missing data -- NOT returning config";
}
return;
}
if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
gpr_log(GPR_INFO, "[XdsDependencyManager %p] returning config: %s", this,
config->ToString().c_str());
LOG(INFO) << "[XdsDependencyManager " << this
<< "] returning config: " << config->ToString();
}
watcher_->OnUpdate(std::move(config));
}
Expand Down

0 comments on commit f9340bc

Please sign in to comment.