grpc 1.64.3 → 1.65.0.pre1

data/src/core/resolver/xds/xds_dependency_manager.cc

@@ -27,7 +27,6 @@
 #include "src/core/lib/gprpp/match.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/fake/fake_resolver.h"
-#include "src/core/resolver/xds/xds_resolver_trace.h"
 #include "src/core/xds/grpc/xds_routing.h"
 
 namespace grpc_core {
@@ -360,7 +359,7 @@ XdsDependencyManager::XdsDependencyManager(
       listener_resource_name_(std::move(listener_resource_name)),
       args_(std::move(args)),
       interested_parties_(interested_parties) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO,
             "[XdsDependencyManager %p] starting watch for listener %s", this,
             listener_resource_name_.c_str());
@@ -372,7 +371,7 @@ XdsDependencyManager::XdsDependencyManager(
 }
 
 void XdsDependencyManager::Orphan() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] shutting down", this);
   }
   if (listener_watcher_ != nullptr) {
@@ -405,7 +404,7 @@ void XdsDependencyManager::Orphan() {
 
 void XdsDependencyManager::OnListenerUpdate(
     std::shared_ptr<const XdsListenerResource> listener) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Listener update",
             this);
   }
@@ -438,7 +437,7 @@ void XdsDependencyManager::OnListenerUpdate(
           }
           // Start watch for the new RDS resource name.
           route_config_name_ = rds_name;
-          if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+          if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
             gpr_log(
                 GPR_INFO,
                 "[XdsDependencyManager %p] starting watch for route config %s",
@@ -526,7 +525,7 @@ absl::flat_hash_set<absl::string_view> GetClustersFromVirtualHost(
 void XdsDependencyManager::OnRouteConfigUpdate(
     const std::string& name,
     std::shared_ptr<const XdsRouteConfigResource> route_config) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  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());
@@ -561,7 +560,7 @@ void XdsDependencyManager::OnRouteConfigUpdate(
 }
 
 void XdsDependencyManager::OnError(std::string context, absl::Status status) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO,
             "[XdsDependencyManager %p] received Listener or RouteConfig "
             "error: %s %s",
@@ -573,7 +572,7 @@ void XdsDependencyManager::OnError(std::string context, absl::Status status) {
 }
 
 void XdsDependencyManager::OnResourceDoesNotExist(std::string context) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] %s", this, context.c_str());
   }
   if (xds_client_ == nullptr) return;
@@ -584,7 +583,7 @@ void XdsDependencyManager::OnResourceDoesNotExist(std::string context) {
 void XdsDependencyManager::OnClusterUpdate(
     const std::string& name,
     std::shared_ptr<const XdsClusterResource> cluster) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Cluster update: %s",
             this, name.c_str());
   }
@@ -597,7 +596,7 @@ void XdsDependencyManager::OnClusterUpdate(
 
 void XdsDependencyManager::OnClusterError(const std::string& name,
                                           absl::Status status) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  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());
   }
@@ -612,7 +611,7 @@ void XdsDependencyManager::OnClusterError(const std::string& name,
 }
 
 void XdsDependencyManager::OnClusterDoesNotExist(const std::string& name) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] Cluster does not exist: %s",
             this, name.c_str());
   }
@@ -627,7 +626,7 @@ void XdsDependencyManager::OnClusterDoesNotExist(const std::string& name) {
 void XdsDependencyManager::OnEndpointUpdate(
     const std::string& name,
     std::shared_ptr<const XdsEndpointResource> endpoint) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] received Endpoint update: %s",
             this, name.c_str());
   }
@@ -659,7 +658,7 @@ void XdsDependencyManager::OnEndpointUpdate(
 
 void XdsDependencyManager::OnEndpointError(const std::string& name,
                                            absl::Status status) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  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());
@@ -675,7 +674,7 @@ void XdsDependencyManager::OnEndpointError(const std::string& name,
 }
 
 void XdsDependencyManager::OnEndpointDoesNotExist(const std::string& name) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] Endpoint does not exist: %s",
             this, name.c_str());
   }
@@ -690,7 +689,7 @@ void XdsDependencyManager::OnEndpointDoesNotExist(const std::string& name) {
 
 void XdsDependencyManager::OnDnsResult(const std::string& dns_name,
                                        Resolver::Result result) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] received DNS update: %s", this,
             dns_name.c_str());
   }
@@ -749,7 +748,7 @@ bool XdsDependencyManager::PopulateClusterConfigMap(
   // Create a new watcher if needed.
   if (state.watcher == nullptr) {
     auto watcher = MakeRefCounted<ClusterWatcher>(Ref(), name);
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
       gpr_log(GPR_INFO,
               "[XdsDependencyManager %p] starting watch for cluster %s", this,
               std::string(name).c_str());
@@ -777,7 +776,7 @@ bool XdsDependencyManager::PopulateClusterConfigMap(
         // Start EDS watch if needed.
         auto& eds_state = endpoint_watchers_[eds_resource_name];
         if (eds_state.watcher == nullptr) {
-          if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+          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());
@@ -806,7 +805,7 @@ bool XdsDependencyManager::PopulateClusterConfigMap(
         // Start DNS resolver if needed.
         auto& dns_state = dns_resolvers_[logical_dns.hostname];
         if (dns_state.resolver == nullptr) {
-          if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+          if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
             gpr_log(GPR_INFO,
                     "[XdsDependencyManager %p] starting DNS resolver for %s",
                     this, logical_dns.hostname.c_str());
@@ -974,7 +973,7 @@ void XdsDependencyManager::MaybeReportUpdate() {
       ++it;
       continue;
     }
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
       gpr_log(GPR_INFO,
               "[XdsDependencyManager %p] cancelling watch for cluster %s", this,
               cluster_name.c_str());
@@ -993,7 +992,7 @@ void XdsDependencyManager::MaybeReportUpdate() {
       ++it;
       continue;
     }
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    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());
@@ -1011,7 +1010,7 @@ void XdsDependencyManager::MaybeReportUpdate() {
       ++it;
       continue;
     }
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
       gpr_log(GPR_INFO,
               "[XdsDependencyManager %p] shutting down DNS resolver for %s",
               this, dns_name.c_str());
@@ -1020,14 +1019,14 @@ void XdsDependencyManager::MaybeReportUpdate() {
   }
   // If we have all the data we need, then send an update.
   if (!have_all_resources) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
       gpr_log(GPR_INFO,
               "[XdsDependencyManager %p] missing data -- NOT returning config",
               this);
     }
     return;
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[XdsDependencyManager %p] returning config: %s", this,
             config->ToString().c_str());
   }

data/src/core/resolver/xds/xds_resolver.cc

@@ -53,7 +53,6 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/context.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
@@ -83,7 +82,6 @@
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/resolver/xds/xds_dependency_manager.h"
 #include "src/core/resolver/xds/xds_resolver_attributes.h"
-#include "src/core/resolver/xds/xds_resolver_trace.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
@@ -112,7 +110,7 @@ class XdsResolver final : public Resolver {
         uri_(std::move(args.uri)),
         data_plane_authority_(std::move(data_plane_authority)),
         channel_id_(absl::Uniform<uint64_t>(absl::BitGen())) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
       gpr_log(
           GPR_INFO,
           "[xds_resolver %p] created for URI %s; data plane authority is %s",
@@ -121,7 +119,7 @@ class XdsResolver final : public Resolver {
   }
 
   ~XdsResolver() override {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
       gpr_log(GPR_INFO, "[xds_resolver %p] destroyed", this);
     }
   }
@@ -330,6 +328,7 @@ class XdsResolver final : public Resolver {
       static const NoInterceptor OnServerInitialMetadata;
       static const NoInterceptor OnServerTrailingMetadata;
       static const NoInterceptor OnClientToServerMessage;
+      static const NoInterceptor OnClientToServerHalfClose;
       static const NoInterceptor OnServerToClientMessage;
       static const NoInterceptor OnFinalize;
     };
@@ -383,6 +382,8 @@ const NoInterceptor
     XdsResolver::ClusterSelectionFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor
     XdsResolver::ClusterSelectionFilter::Call::OnClientToServerMessage;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor
     XdsResolver::ClusterSelectionFilter::Call::OnServerToClientMessage;
 const NoInterceptor XdsResolver::ClusterSelectionFilter::Call::OnFinalize;
@@ -531,7 +532,7 @@ XdsResolver::RouteConfigData::CreateMethodConfig(
 absl::Status XdsResolver::RouteConfigData::AddRouteEntry(
     XdsResolver* resolver, const XdsRouteConfigResource::Route& route,
     const Duration& default_max_stream_duration) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] XdsConfigSelector %p: route: %s",
             resolver, this, route.ToString().c_str());
   }
@@ -623,7 +624,7 @@ XdsResolver::XdsConfigSelector::XdsConfigSelector(
     RefCountedPtr<RouteConfigData> route_config_data)
     : resolver_(std::move(resolver)),
       route_config_data_(std::move(route_config_data)) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] creating XdsConfigSelector %p",
             resolver_.get(), this);
   }
@@ -649,7 +650,7 @@ XdsResolver::XdsConfigSelector::XdsConfigSelector(
 }
 
 XdsResolver::XdsConfigSelector::~XdsConfigSelector() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] destroying XdsConfigSelector %p",
             resolver_.get(), this);
   }
@@ -851,10 +852,7 @@ const grpc_channel_filter XdsResolver::ClusterSelectionFilter::kFilter =
 void XdsResolver::ClusterSelectionFilter::Call::OnClientInitialMetadata(
     ClientMetadata&) {
   auto* service_config_call_data =
-      static_cast<ClientChannelServiceConfigCallData*>(
-          GetContext<grpc_call_context_element>()
-              [GRPC_CONTEXT_SERVICE_CONFIG_CALL_DATA]
-                  .value);
+      GetContext<ClientChannelServiceConfigCallData>();
   CHECK_NE(service_config_call_data, nullptr);
   auto* route_state_attribute = static_cast<XdsRouteStateAttributeImpl*>(
       service_config_call_data->GetCallAttribute<XdsRouteStateAttribute>());
@@ -936,7 +934,7 @@ void XdsResolver::StartLocked() {
     lds_resource_name_ =
         absl::StrReplaceAll(name_template, {{"%s", resource_name_fragment}});
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] Started with lds_resource_name %s.",
             this, lds_resource_name_.c_str());
   }
@@ -948,7 +946,7 @@ void XdsResolver::StartLocked() {
 }
 
 void XdsResolver::ShutdownLocked() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] shutting down", this);
   }
   if (xds_client_ != nullptr) {
@@ -961,7 +959,7 @@ void XdsResolver::ShutdownLocked() {
 
 void XdsResolver::OnUpdate(
     RefCountedPtr<const XdsDependencyManager::XdsConfig> config) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] received updated xDS config", this);
   }
   if (xds_client_ == nullptr) return;
@@ -1060,7 +1058,7 @@ void XdsResolver::GenerateResult() {
   Result result;
   result.addresses.emplace();
   result.service_config = CreateServiceConfig();
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(xds_resolver)) {
     gpr_log(GPR_INFO, "[xds_resolver %p] generated service config: %s", this,
             result.service_config.ok()
                 ? std::string((*result.service_config)->json_string()).c_str()