grpc 1.54.0 → 1.55.0

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
 #define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
 
@@ -75,6 +76,6 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMa
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c

@@ -6,7 +6,7 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/matcher/v3/range.upbdefs.h"
 #include "xds/type/matcher/v3/range.upb.h"
 

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
 #define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_matcher_v3_range_proto_upbdefinit;
 
@@ -55,6 +56,6 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_RangeMat
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c

@@ -6,7 +6,7 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/matcher/v3/regex.upbdefs.h"
 #include "xds/type/matcher/v3/regex.upb.h"
 

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
 #define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit;
 
@@ -35,6 +36,6 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_GoogleRE2_getm
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c

@@ -6,7 +6,7 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/matcher/v3/string.upbdefs.h"
 #include "xds/type/matcher/v3/string.upb.h"
 

data/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
 #define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit;
 
@@ -35,6 +36,6 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ListStringMatcher_getmsgdef
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c

@@ -6,7 +6,7 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/v3/cel.upbdefs.h"
 #include "xds/type/v3/cel.upb.h"
 

data/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit;
 
@@ -35,6 +36,6 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefP
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c

@@ -6,7 +6,7 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/v3/range.upbdefs.h"
 #include "xds/type/v3/range.upb.h"
 

data/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
 
@@ -40,6 +41,6 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c

@@ -6,7 +6,7 @@
  * Do not edit -- your changes will be discarded when the file is
  * regenerated. */
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 #include "xds/type/v3/typed_struct.upbdefs.h"
 #include "xds/type/v3/typed_struct.upb.h"
 

data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h

@@ -9,15 +9,16 @@
 #ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
 #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
 
-#include "upb/def.h"
-#include "upb/port_def.inc"
+#include "upb/reflection/def.h"
+#include "upb/reflection/def_pool_internal.h"
+#include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "upb/def.h"
+#include "upb/reflection/def.h"
 
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 extern _upb_DefPool_Init xds_type_v3_typed_struct_proto_upbdefinit;
 
@@ -30,6 +31,6 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_TypedStruct_getmsgdef(upb_DefPool *
 }  /* extern "C" */
 #endif
 
-#include "upb/port_undef.inc"
+#include "upb/port/undef.inc"
 
 #endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ */

data/src/core/ext/xds/certificate_provider_store.cc

@@ -61,16 +61,16 @@ void CertificateProviderStore::PluginDefinition::JsonPostLoad(
   // Parse the config field.
   {
     ValidationErrors::ScopedField field(errors, ".config");
-    auto it = json.object_value().find("config");
+    auto it = json.object().find("config");
     // The config field is optional; if not present, we use an empty JSON
     // object.
     Json::Object config_json;
-    if (it != json.object_value().end()) {
-      if (it->second.type() != Json::Type::OBJECT) {
+    if (it != json.object().end()) {
+      if (it->second.type() != Json::Type::kObject) {
         errors->AddError("is not an object");
         return;  // No point parsing config.
       } else {
-        config_json = it->second.object_value();
+        config_json = it->second.object();
       }
     }
     if (factory == nullptr) return;

data/src/core/ext/xds/file_watcher_certificate_provider_factory.cc

@@ -75,14 +75,14 @@ RefCountedPtr<FileWatcherCertificateProviderFactory::Config>
 FileWatcherCertificateProviderFactory::Config::Parse(const Json& config_json,
                                                      grpc_error_handle* error) {
   auto config = MakeRefCounted<FileWatcherCertificateProviderFactory::Config>();
-  if (config_json.type() != Json::Type::OBJECT) {
+  if (config_json.type() != Json::Type::kObject) {
     *error = GRPC_ERROR_CREATE("error:config type should be OBJECT.");
     return nullptr;
   }
   std::vector<grpc_error_handle> error_list;
-  ParseJsonObjectField(config_json.object_value(), "certificate_file",
+  ParseJsonObjectField(config_json.object(), "certificate_file",
                        &config->identity_cert_file_, &error_list, false);
-  ParseJsonObjectField(config_json.object_value(), "private_key_file",
+  ParseJsonObjectField(config_json.object(), "private_key_file",
                        &config->private_key_file_, &error_list, false);
   if (config->identity_cert_file_.empty() !=
       config->private_key_file_.empty()) {
@@ -90,16 +90,16 @@ FileWatcherCertificateProviderFactory::Config::Parse(const Json& config_json,
         "fields \"certificate_file\" and \"private_key_file\" must be both set "
         "or both unset."));
   }
-  ParseJsonObjectField(config_json.object_value(), "ca_certificate_file",
+  ParseJsonObjectField(config_json.object(), "ca_certificate_file",
                        &config->root_cert_file_, &error_list, false);
   if (config->identity_cert_file_.empty() && config->root_cert_file_.empty()) {
     error_list.push_back(GRPC_ERROR_CREATE(
         "At least one of \"certificate_file\" and \"ca_certificate_file\" must "
         "be specified."));
   }
-  if (!ParseJsonObjectFieldAsDuration(
-          config_json.object_value(), "refresh_interval",
-          &config->refresh_interval_, &error_list, false)) {
+  if (!ParseJsonObjectFieldAsDuration(config_json.object(), "refresh_interval",
+                                      &config->refresh_interval_, &error_list,
+                                      false)) {
     config->refresh_interval_ = Duration::Minutes(10);  // 10 minutes default
   }
   if (!error_list.empty()) {

data/src/core/ext/xds/upb_utils.h

@@ -22,7 +22,7 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "upb/upb.h"
+#include "upb/base/string_view.h"
 
 namespace grpc_core {
 

data/src/core/ext/xds/xds_api.cc

@@ -40,9 +40,9 @@
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/timestamp.upb.h"
 #include "google/rpc/status.upb.h"
-#include "upb/def.h"
-#include "upb/text_encode.h"
-#include "upb/upb.h"
+#include "upb/base/string_view.h"
+#include "upb/reflection/def.h"
+#include "upb/text/encode.h"
 #include "upb/upb.hpp"
 
 #include <grpc/status.h>
@@ -103,33 +103,33 @@ void PopulateMetadata(const XdsApiContext& context,
 void PopulateMetadataValue(const XdsApiContext& context,
                            google_protobuf_Value* value_pb, const Json& value) {
   switch (value.type()) {
-    case Json::Type::JSON_NULL:
+    case Json::Type::kNull:
       google_protobuf_Value_set_null_value(value_pb, 0);
       break;
-    case Json::Type::NUMBER:
+    case Json::Type::kNumber:
       google_protobuf_Value_set_number_value(
-          value_pb, strtod(value.string_value().c_str(), nullptr));
+          value_pb, strtod(value.string().c_str(), nullptr));
       break;
-    case Json::Type::STRING:
+    case Json::Type::kString:
       google_protobuf_Value_set_string_value(
-          value_pb, StdStringToUpbString(value.string_value()));
+          value_pb, StdStringToUpbString(value.string()));
       break;
-    case Json::Type::JSON_TRUE:
+    case Json::Type::kTrue:
       google_protobuf_Value_set_bool_value(value_pb, true);
       break;
-    case Json::Type::JSON_FALSE:
+    case Json::Type::kFalse:
       google_protobuf_Value_set_bool_value(value_pb, false);
       break;
-    case Json::Type::OBJECT: {
+    case Json::Type::kObject: {
       google_protobuf_Struct* struct_value =
           google_protobuf_Value_mutable_struct_value(value_pb, context.arena);
-      PopulateMetadata(context, struct_value, value.object_value());
+      PopulateMetadata(context, struct_value, value.object());
       break;
     }
-    case Json::Type::ARRAY: {
+    case Json::Type::kArray: {
       google_protobuf_ListValue* list_value =
           google_protobuf_Value_mutable_list_value(value_pb, context.arena);
-      PopulateListValue(context, list_value, value.array_value());
+      PopulateListValue(context, list_value, value.array());
       break;
     }
   }
@@ -504,6 +504,24 @@ std::string XdsApi::CreateLrsRequest(
   return SerializeLrsRequest(context, request);
 }
 
+namespace {
+
+void MaybeLogLrsResponse(
+    const XdsApiContext& context,
+    const envoy_service_load_stats_v3_LoadStatsResponse* response) {
+  if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
+      gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
+    const upb_MessageDef* msg_type =
+        envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef(context.symtab);
+    char buf[10240];
+    upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf));
+    gpr_log(GPR_DEBUG, "[xds_client %p] received LRS response: %s",
+            context.client, buf);
+  }
+}
+
+}  // namespace
+
 absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response,
                                       bool* send_all_clusters,
                                       std::set<std::string>* cluster_names,
@@ -517,6 +535,8 @@ absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response,
   if (decoded_response == nullptr) {
     return absl::UnavailableError("Can't decode response.");
   }
+  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  MaybeLogLrsResponse(context, decoded_response);
   // Check send_all_clusters.
   if (envoy_service_load_stats_v3_LoadStatsResponse_send_all_clusters(
           decoded_response)) {

data/src/core/ext/xds/xds_api.h

@@ -30,8 +30,8 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "envoy/admin/v3/config_dump_shared.upb.h"
-#include "upb/arena.h"
-#include "upb/def.hpp"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.hpp"
 
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_client_stats.h"

data/src/core/ext/xds/xds_bootstrap.cc

@@ -25,11 +25,11 @@
 
 namespace grpc_core {
 
-// TODO(donnadionne): check to see if federation is enabled, this will be
-// removed once federation is fully integrated and enabled by default.
+// TODO(roth,apolcyn): remove this federation env var after the 1.55
+// release.
 bool XdsFederationEnabled() {
   auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_FEDERATION");
-  if (!value.has_value()) return false;
+  if (!value.has_value()) return true;
   bool parsed_value;
   bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
   return parse_succeeded && parsed_value;

data/src/core/ext/xds/xds_bootstrap_grpc.cc

@@ -39,6 +39,8 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/json/json_reader.h"
+#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 
 namespace grpc_core {
@@ -126,7 +128,7 @@ void GrpcXdsBootstrap::GrpcXdsServer::JsonPostLoad(const Json& json,
                                                    ValidationErrors* errors) {
   // Parse "channel_creds".
   auto channel_creds_list = LoadJsonObjectField<std::vector<ChannelCreds>>(
-      json.object_value(), args, "channel_creds", errors);
+      json.object(), args, "channel_creds", errors);
   if (channel_creds_list.has_value()) {
     ValidationErrors::ScopedField field(errors, ".channel_creds");
     for (size_t i = 0; i < channel_creds_list->size(); ++i) {
@@ -153,17 +155,16 @@ void GrpcXdsBootstrap::GrpcXdsServer::JsonPostLoad(const Json& json,
   // Parse "server_features".
   {
     ValidationErrors::ScopedField field(errors, ".server_features");
-    auto it = json.object_value().find("server_features");
-    if (it != json.object_value().end()) {
-      if (it->second.type() != Json::Type::ARRAY) {
+    auto it = json.object().find("server_features");
+    if (it != json.object().end()) {
+      if (it->second.type() != Json::Type::kArray) {
         errors->AddError("is not an array");
       } else {
-        const Json::Array& array = it->second.array_value();
+        const Json::Array& array = it->second.array();
         for (const Json& feature_json : array) {
-          if (feature_json.type() == Json::Type::STRING &&
-              (feature_json.string_value() ==
-               kServerFeatureIgnoreResourceDeletion)) {
-            server_features_.insert(feature_json.string_value());
+          if (feature_json.type() == Json::Type::kString &&
+              (feature_json.string() == kServerFeatureIgnoreResourceDeletion)) {
+            server_features_.insert(feature_json.string());
           }
         }
       }
@@ -212,7 +213,7 @@ const JsonLoaderInterface* GrpcXdsBootstrap::GrpcAuthority::JsonLoader(
 
 absl::StatusOr<std::unique_ptr<GrpcXdsBootstrap>> GrpcXdsBootstrap::Create(
     absl::string_view json_string) {
-  auto json = Json::Parse(json_string);
+  auto json = JsonParse(json_string);
   if (!json.ok()) {
     return absl::InvalidArgumentError(absl::StrCat(
         "Failed to parse bootstrap JSON string: ", json.status().ToString()));
@@ -291,10 +292,10 @@ std::string GrpcXdsBootstrap::ToString() const {
                         "},\n",
                         node_->id(), node_->cluster(), node_->locality_region(),
                         node_->locality_zone(), node_->locality_sub_zone(),
-                        Json{node_->metadata()}.Dump()));
+                        JsonDump(Json{node_->metadata()})));
   }
   parts.push_back(
-      absl::StrFormat("servers=[\n%s\n],\n", servers_[0].ToJson().Dump()));
+      absl::StrFormat("servers=[\n%s\n],\n", JsonDump(servers_[0].ToJson())));
   if (!client_default_listener_resource_name_template_.empty()) {
     parts.push_back(absl::StrFormat(
         "client_default_listener_resource_name_template=\"%s\",\n",
@@ -314,9 +315,8 @@ std::string GrpcXdsBootstrap::ToString() const {
     if (entry.second.server() != nullptr) {
       parts.push_back(absl::StrFormat(
           "    servers=[\n%s\n],\n",
-          static_cast<const GrpcXdsServer*>(entry.second.server())
-              ->ToJson()
-              .Dump()));
+          JsonDump(static_cast<const GrpcXdsServer*>(entry.second.server())
+                       ->ToJson())));
     }
     parts.push_back("      },\n");
   }

data/src/core/ext/xds/xds_client.cc

@@ -31,7 +31,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-#include "upb/arena.h"
+#include "upb/mem/arena.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/log.h>
@@ -445,8 +445,8 @@ XdsClient::ChannelState::ChannelState(WeakRefCountedPtr<XdsClient> xds_client,
       xds_client_(std::move(xds_client)),
       server_(server) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
-    gpr_log(GPR_INFO, "[xds_client %p] creating channel to %s",
-            xds_client_.get(), server.server_uri().c_str());
+    gpr_log(GPR_INFO, "[xds_client %p] creating channel %p for server %s",
+            xds_client_.get(), this, server.server_uri().c_str());
   }
   absl::Status status;
   transport_ = xds_client_->transport_factory_->Create(
@@ -473,6 +473,10 @@ XdsClient::ChannelState::~ChannelState() {
 // called from DualRefCounted::Unref, which cannot have a lock annotation for
 // a lock in this subclass.
 void XdsClient::ChannelState::Orphan() ABSL_NO_THREAD_SAFETY_ANALYSIS {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+    gpr_log(GPR_INFO, "[xds_client %p] orphaning xds channel %p for server %s",
+            xds_client(), this, server_.server_uri().c_str());
+  }
   shutting_down_ = true;
   transport_.reset();
   // At this time, all strong refs are removed, remove from channel map to
@@ -1208,6 +1212,11 @@ void XdsClient::ChannelState::LrsCallState::Reporter::Orphan() {
 
 void XdsClient::ChannelState::LrsCallState::Reporter::
     ScheduleNextReportLocked() {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+    gpr_log(GPR_INFO,
+            "[xds_client %p] xds server %s: scheduling load report timer",
+            xds_client(), parent_->chand()->server_.server_uri().c_str());
+  }
   timer_handle_ = xds_client()->engine()->RunAfter(report_interval_, [this]() {
     ApplicationCallbackExecCtx callback_exec_ctx;
     ExecCtx exec_ctx;
@@ -1354,6 +1363,10 @@ void XdsClient::ChannelState::LrsCallState::MaybeStartReportingLocked() {
     return;
   }
   // Start reporting.
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
+    gpr_log(GPR_INFO, "[xds_client %p] xds server %s: creating load reporter",
+            xds_client(), chand()->server_.server_uri().c_str());
+  }
   reporter_ = MakeOrphanable<Reporter>(
       Ref(DEBUG_LOCATION, "LRS+load_report+start"), load_reporting_interval_);
 }
@@ -1566,6 +1579,14 @@ void XdsClient::WatchResource(const XdsResourceType* type,
     xds_server = authority->server();
   }
   if (xds_server == nullptr) xds_server = &bootstrap_->server();
+  // Canonify the xDS server instance, so that we make sure we're using
+  // the same instance as will be used in AddClusterDropStats() and
+  // AddClusterLocalityStats().  This may yield a different result than
+  // the logic above if the same server is listed both in the authority
+  // and as the top-level server.
+  // TODO(roth): This is really ugly -- need to find a better way to
+  // index the xDS server than by address here.
+  xds_server = bootstrap_->FindXdsServer(*xds_server);
   {
     MutexLock lock(&mu_);
     MaybeRegisterResourceTypeLocked(type);

data/src/core/ext/xds/xds_client.h

@@ -30,7 +30,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "upb/def.hpp"
+#include "upb/reflection/def.hpp"
 
 #include <grpc/event_engine/event_engine.h>