grpc 1.27.0 → 1.28.0.pre2

data/src/core/ext/filters/client_channel/service_config.h

@@ -70,7 +70,7 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
     virtual ~Parser() = default;
 
     virtual std::unique_ptr<ParsedConfig> ParseGlobalParams(
-        const grpc_json* /* json */, grpc_error** error) {
+        const Json& /* json */, grpc_error** error) {
       // Avoid unused parameter warning on debug-only parameter
       (void)error;
       GPR_DEBUG_ASSERT(error != nullptr);
@@ -78,7 +78,7 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
     }
 
     virtual std::unique_ptr<ParsedConfig> ParsePerMethodParams(
-        const grpc_json* /* json */, grpc_error** error) {
+        const Json& /* json */, grpc_error** error) {
       // Avoid unused parameter warning on debug-only parameter
       (void)error;
       GPR_DEBUG_ASSERT(error != nullptr);
@@ -125,16 +125,12 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
 
   /// Creates a new service config from parsing \a json_string.
   /// Returns null on parse error.
-  static RefCountedPtr<ServiceConfig> Create(const char* json,
+  static RefCountedPtr<ServiceConfig> Create(StringView json_string,
                                              grpc_error** error);
 
-  // Takes ownership of \a json_tree.
-  ServiceConfig(grpc_core::UniquePtr<char> service_config_json,
-                grpc_core::UniquePtr<char> json_string, grpc_json* json_tree,
-                grpc_error** error);
-  ~ServiceConfig();
+  ServiceConfig(std::string json_string, Json json, grpc_error** error);
 
-  const char* service_config_json() const { return service_config_json_.get(); }
+  const std::string& json_string() const { return json_string_; }
 
   /// Retrieves the global parsed config at index \a index. The
   /// lifetime of the returned object is tied to the lifetime of the
@@ -163,24 +159,21 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
 
  private:
   // Helper functions to parse the service config
-  grpc_error* ParseGlobalParams(const grpc_json* json_tree);
-  grpc_error* ParsePerMethodParams(const grpc_json* json_tree);
-
-  // Returns the number of names specified in the method config \a json.
-  static int CountNamesInMethodConfig(grpc_json* json);
+  grpc_error* ParseGlobalParams();
+  grpc_error* ParsePerMethodParams();
 
   // Returns a path string for the JSON name object specified by \a json.
   // Returns null on error, and stores error in \a error.
-  static grpc_core::UniquePtr<char> ParseJsonMethodName(grpc_json* json,
-                                                        grpc_error** error);
+  static UniquePtr<char> ParseJsonMethodName(const Json& json,
+                                             grpc_error** error);
 
   grpc_error* ParseJsonMethodConfigToServiceConfigVectorTable(
-      const grpc_json* json,
-      SliceHashTable<const ParsedConfigVector*>::Entry* entries, size_t* idx);
+      const Json& json,
+      InlinedVector<SliceHashTable<const ParsedConfigVector*>::Entry, 10>*
+          entries);
 
-  grpc_core::UniquePtr<char> service_config_json_;
-  grpc_core::UniquePtr<char> json_string_;  // Underlying storage for json_tree.
-  grpc_json* json_tree_;
+  std::string json_string_;
+  Json json_;
 
   InlinedVector<std::unique_ptr<ParsedConfig>, kNumPreallocatedParsers>
       parsed_global_configs_;

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

@@ -19,6 +19,10 @@
 #include <grpc/support/port_platform.h>
 
 #include <algorithm>
+#include <cctype>
+#include <cstdlib>
+
+#include "absl/strings/str_cat.h"
 
 #include <grpc/impl/codegen/log.h>
 #include <grpc/support/alloc.h>
@@ -38,6 +42,11 @@
 #include "envoy/api/v2/eds.upb.h"
 #include "envoy/api/v2/endpoint/endpoint.upb.h"
 #include "envoy/api/v2/endpoint/load_report.upb.h"
+#include "envoy/api/v2/lds.upb.h"
+#include "envoy/api/v2/rds.upb.h"
+#include "envoy/api/v2/route/route.upb.h"
+#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h"
+#include "envoy/config/listener/v2/api_listener.upb.h"
 #include "envoy/service/load_stats/v2/lrs.upb.h"
 #include "envoy/type/percent.upb.h"
 #include "google/protobuf/any.upb.h"
@@ -49,8 +58,12 @@
 
 namespace grpc_core {
 
-bool XdsPriorityListUpdate::operator==(
-    const XdsPriorityListUpdate& other) const {
+//
+// XdsApi::PriorityListUpdate
+//
+
+bool XdsApi::PriorityListUpdate::operator==(
+    const XdsApi::PriorityListUpdate& other) const {
   if (priorities_.size() != other.priorities_.size()) return false;
   for (size_t i = 0; i < priorities_.size(); ++i) {
     if (priorities_[i].localities != other.priorities_[i].localities) {
@@ -60,8 +73,8 @@ bool XdsPriorityListUpdate::operator==(
   return true;
 }
 
-void XdsPriorityListUpdate::Add(
-    XdsPriorityListUpdate::LocalityMap::Locality locality) {
+void XdsApi::PriorityListUpdate::Add(
+    XdsApi::PriorityListUpdate::LocalityMap::Locality locality) {
   // Pad the missing priorities in case the localities are not ordered by
   // priority.
   if (!Contains(locality.priority)) priorities_.resize(locality.priority + 1);
@@ -69,13 +82,13 @@ void XdsPriorityListUpdate::Add(
   locality_map.localities.emplace(locality.name, std::move(locality));
 }
 
-const XdsPriorityListUpdate::LocalityMap* XdsPriorityListUpdate::Find(
+const XdsApi::PriorityListUpdate::LocalityMap* XdsApi::PriorityListUpdate::Find(
     uint32_t priority) const {
   if (!Contains(priority)) return nullptr;
   return &priorities_[priority];
 }
 
-bool XdsPriorityListUpdate::Contains(
+bool XdsApi::PriorityListUpdate::Contains(
     const RefCountedPtr<XdsLocalityName>& name) {
   for (size_t i = 0; i < priorities_.size(); ++i) {
     const LocalityMap& locality_map = priorities_[i];
@@ -84,7 +97,11 @@ bool XdsPriorityListUpdate::Contains(
   return false;
 }
 
-bool XdsDropConfig::ShouldDrop(const std::string** category_name) const {
+//
+// XdsApi::DropConfig
+//
+
+bool XdsApi::DropConfig::ShouldDrop(const std::string** category_name) const {
   for (size_t i = 0; i < drop_category_list_.size(); ++i) {
     const auto& drop_category = drop_category_list_[i];
     // Generate a random number in [0, 1000000).
@@ -97,13 +114,30 @@ bool XdsDropConfig::ShouldDrop(const std::string** category_name) const {
   return false;
 }
 
+//
+// XdsApi
+//
+
+const char* XdsApi::kLdsTypeUrl = "type.googleapis.com/envoy.api.v2.Listener";
+const char* XdsApi::kRdsTypeUrl =
+    "type.googleapis.com/envoy.api.v2.RouteConfiguration";
+const char* XdsApi::kCdsTypeUrl = "type.googleapis.com/envoy.api.v2.Cluster";
+const char* XdsApi::kEdsTypeUrl =
+    "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment";
+
+XdsApi::XdsApi(const XdsBootstrap::Node* node)
+    : node_(node),
+      build_version_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING, " ",
+                                  grpc_version_string())),
+      user_agent_name_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING)) {}
+
 namespace {
 
 void PopulateMetadataValue(upb_arena* arena, google_protobuf_Value* value_pb,
-                           const XdsBootstrap::MetadataValue& value);
+                           const Json& value);
 
 void PopulateListValue(upb_arena* arena, google_protobuf_ListValue* list_value,
-                       const std::vector<XdsBootstrap::MetadataValue>& values) {
+                       const Json::Array& values) {
   for (const auto& value : values) {
     auto* value_pb = google_protobuf_ListValue_add_values(list_value, arena);
     PopulateMetadataValue(arena, value_pb, value);
@@ -111,13 +145,12 @@ void PopulateListValue(upb_arena* arena, google_protobuf_ListValue* list_value,
 }
 
 void PopulateMetadata(upb_arena* arena, google_protobuf_Struct* metadata_pb,
-                      const std::map<const char*, XdsBootstrap::MetadataValue,
-                                     StringLess>& metadata) {
+                      const Json::Object& metadata) {
   for (const auto& p : metadata) {
     google_protobuf_Struct_FieldsEntry* field =
         google_protobuf_Struct_add_fields(metadata_pb, arena);
-    google_protobuf_Struct_FieldsEntry_set_key(field,
-                                               upb_strview_makez(p.first));
+    google_protobuf_Struct_FieldsEntry_set_key(
+        field, upb_strview_makez(p.first.c_str()));
     google_protobuf_Value* value =
         google_protobuf_Struct_FieldsEntry_mutable_value(field, arena);
     PopulateMetadataValue(arena, value, p.second);
@@ -125,134 +158,115 @@ void PopulateMetadata(upb_arena* arena, google_protobuf_Struct* metadata_pb,
 }
 
 void PopulateMetadataValue(upb_arena* arena, google_protobuf_Value* value_pb,
-                           const XdsBootstrap::MetadataValue& value) {
-  switch (value.type) {
-    case XdsBootstrap::MetadataValue::Type::MD_NULL:
+                           const Json& value) {
+  switch (value.type()) {
+    case Json::Type::JSON_NULL:
       google_protobuf_Value_set_null_value(value_pb, 0);
       break;
-    case XdsBootstrap::MetadataValue::Type::DOUBLE:
-      google_protobuf_Value_set_number_value(value_pb, value.double_value);
+    case Json::Type::NUMBER:
+      google_protobuf_Value_set_number_value(
+          value_pb, strtod(value.string_value().c_str(), nullptr));
       break;
-    case XdsBootstrap::MetadataValue::Type::STRING:
+    case Json::Type::STRING:
       google_protobuf_Value_set_string_value(
-          value_pb, upb_strview_makez(value.string_value));
+          value_pb, upb_strview_makez(value.string_value().c_str()));
       break;
-    case XdsBootstrap::MetadataValue::Type::BOOL:
-      google_protobuf_Value_set_bool_value(value_pb, value.bool_value);
+    case Json::Type::JSON_TRUE:
+      google_protobuf_Value_set_bool_value(value_pb, true);
       break;
-    case XdsBootstrap::MetadataValue::Type::STRUCT: {
+    case Json::Type::JSON_FALSE:
+      google_protobuf_Value_set_bool_value(value_pb, false);
+      break;
+    case Json::Type::OBJECT: {
       google_protobuf_Struct* struct_value =
           google_protobuf_Value_mutable_struct_value(value_pb, arena);
-      PopulateMetadata(arena, struct_value, value.struct_value);
+      PopulateMetadata(arena, struct_value, value.object_value());
       break;
     }
-    case XdsBootstrap::MetadataValue::Type::LIST: {
+    case Json::Type::ARRAY: {
       google_protobuf_ListValue* list_value =
           google_protobuf_Value_mutable_list_value(value_pb, arena);
-      PopulateListValue(arena, list_value, value.list_value);
+      PopulateListValue(arena, list_value, value.array_value());
       break;
     }
   }
 }
 
 void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node,
-                  const char* build_version, envoy_api_v2_core_Node* node_msg) {
+                  const std::string& build_version,
+                  const std::string& user_agent_name,
+                  const std::string& server_name,
+                  envoy_api_v2_core_Node* node_msg) {
   if (node != nullptr) {
-    if (node->id != nullptr) {
-      envoy_api_v2_core_Node_set_id(node_msg, upb_strview_makez(node->id));
+    if (!node->id.empty()) {
+      envoy_api_v2_core_Node_set_id(node_msg,
+                                    upb_strview_makez(node->id.c_str()));
+    }
+    if (!node->cluster.empty()) {
+      envoy_api_v2_core_Node_set_cluster(
+          node_msg, upb_strview_makez(node->cluster.c_str()));
     }
-    if (node->cluster != nullptr) {
-      envoy_api_v2_core_Node_set_cluster(node_msg,
-                                         upb_strview_makez(node->cluster));
+    if (!node->metadata.object_value().empty()) {
+      google_protobuf_Struct* metadata =
+          envoy_api_v2_core_Node_mutable_metadata(node_msg, arena);
+      PopulateMetadata(arena, metadata, node->metadata.object_value());
     }
-    if (!node->metadata.empty()) {
+    if (!server_name.empty()) {
       google_protobuf_Struct* metadata =
           envoy_api_v2_core_Node_mutable_metadata(node_msg, arena);
-      PopulateMetadata(arena, metadata, node->metadata);
+      google_protobuf_Struct_FieldsEntry* field =
+          google_protobuf_Struct_add_fields(metadata, arena);
+      google_protobuf_Struct_FieldsEntry_set_key(
+          field, upb_strview_makez("PROXYLESS_CLIENT_HOSTNAME"));
+      google_protobuf_Value* value =
+          google_protobuf_Struct_FieldsEntry_mutable_value(field, arena);
+      google_protobuf_Value_set_string_value(
+          value, upb_strview_make(server_name.data(), server_name.size()));
     }
-    if (node->locality_region != nullptr || node->locality_zone != nullptr ||
-        node->locality_subzone != nullptr) {
+    if (!node->locality_region.empty() || !node->locality_zone.empty() ||
+        !node->locality_subzone.empty()) {
       envoy_api_v2_core_Locality* locality =
           envoy_api_v2_core_Node_mutable_locality(node_msg, arena);
-      if (node->locality_region != nullptr) {
+      if (!node->locality_region.empty()) {
         envoy_api_v2_core_Locality_set_region(
-            locality, upb_strview_makez(node->locality_region));
+            locality, upb_strview_makez(node->locality_region.c_str()));
       }
-      if (node->locality_zone != nullptr) {
+      if (!node->locality_zone.empty()) {
         envoy_api_v2_core_Locality_set_zone(
-            locality, upb_strview_makez(node->locality_zone));
+            locality, upb_strview_makez(node->locality_zone.c_str()));
       }
-      if (node->locality_subzone != nullptr) {
+      if (!node->locality_subzone.empty()) {
         envoy_api_v2_core_Locality_set_sub_zone(
-            locality, upb_strview_makez(node->locality_subzone));
+            locality, upb_strview_makez(node->locality_subzone.c_str()));
       }
     }
   }
-  envoy_api_v2_core_Node_set_build_version(node_msg,
-                                           upb_strview_makez(build_version));
+  envoy_api_v2_core_Node_set_build_version(
+      node_msg, upb_strview_make(build_version.data(), build_version.size()));
+  envoy_api_v2_core_Node_set_user_agent_name(
+      node_msg,
+      upb_strview_make(user_agent_name.data(), user_agent_name.size()));
+  envoy_api_v2_core_Node_set_user_agent_version(
+      node_msg, upb_strview_makez(grpc_version_string()));
+  envoy_api_v2_core_Node_add_client_features(
+      node_msg, upb_strview_makez("envoy.lb.does_not_support_overprovisioning"),
+      arena);
 }
 
-}  // namespace
-
-grpc_slice XdsUnsupportedTypeNackRequestCreateAndEncode(
-    const std::string& type_url, const std::string& nonce, grpc_error* error) {
-  upb::Arena arena;
-  // Create a request.
-  envoy_api_v2_DiscoveryRequest* request =
-      envoy_api_v2_DiscoveryRequest_new(arena.ptr());
-  // Set type_url.
-  envoy_api_v2_DiscoveryRequest_set_type_url(
-      request, upb_strview_makez(type_url.c_str()));
-  // Set nonce.
-  envoy_api_v2_DiscoveryRequest_set_response_nonce(
-      request, upb_strview_makez(nonce.c_str()));
-  // Set error_detail.
-  grpc_slice error_description_slice;
-  GPR_ASSERT(grpc_error_get_str(error, GRPC_ERROR_STR_DESCRIPTION,
-                                &error_description_slice));
-  upb_strview error_description_strview =
-      upb_strview_make(reinterpret_cast<const char*>(
-                           GPR_SLICE_START_PTR(error_description_slice)),
-                       GPR_SLICE_LENGTH(error_description_slice));
-  google_rpc_Status* error_detail =
-      envoy_api_v2_DiscoveryRequest_mutable_error_detail(request, arena.ptr());
-  google_rpc_Status_set_message(error_detail, error_description_strview);
-  GRPC_ERROR_UNREF(error);
-  // Encode the request.
-  size_t output_length;
-  char* output = envoy_api_v2_DiscoveryRequest_serialize(request, arena.ptr(),
-                                                         &output_length);
-  return grpc_slice_from_copied_buffer(output, output_length);
-}
-
-grpc_slice XdsCdsRequestCreateAndEncode(
-    const std::set<StringView>& cluster_names, const XdsBootstrap::Node* node,
-    const char* build_version, const std::string& version,
+envoy_api_v2_DiscoveryRequest* CreateDiscoveryRequest(
+    upb_arena* arena, const char* type_url, const std::string& version,
     const std::string& nonce, grpc_error* error) {
-  upb::Arena arena;
   // Create a request.
   envoy_api_v2_DiscoveryRequest* request =
-      envoy_api_v2_DiscoveryRequest_new(arena.ptr());
+      envoy_api_v2_DiscoveryRequest_new(arena);
+  // Set type_url.
+  envoy_api_v2_DiscoveryRequest_set_type_url(request,
+                                             upb_strview_makez(type_url));
   // Set version_info.
   if (!version.empty()) {
     envoy_api_v2_DiscoveryRequest_set_version_info(
         request, upb_strview_makez(version.c_str()));
   }
-  // Populate node.
-  if (build_version != nullptr) {
-    envoy_api_v2_core_Node* node_msg =
-        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
-    PopulateNode(arena.ptr(), node, build_version, node_msg);
-  }
-  // Add resource_names.
-  for (const auto& cluster_name : cluster_names) {
-    envoy_api_v2_DiscoveryRequest_add_resource_names(
-        request, upb_strview_make(cluster_name.data(), cluster_name.size()),
-        arena.ptr());
-  }
-  // Set type_url.
-  envoy_api_v2_DiscoveryRequest_set_type_url(request,
-                                             upb_strview_makez(kCdsTypeUrl));
   // Set nonce.
   if (!nonce.empty()) {
     envoy_api_v2_DiscoveryRequest_set_response_nonce(
@@ -268,36 +282,110 @@ grpc_slice XdsCdsRequestCreateAndEncode(
                              GPR_SLICE_START_PTR(error_description_slice)),
                          GPR_SLICE_LENGTH(error_description_slice));
     google_rpc_Status* error_detail =
-        envoy_api_v2_DiscoveryRequest_mutable_error_detail(request,
-                                                           arena.ptr());
+        envoy_api_v2_DiscoveryRequest_mutable_error_detail(request, arena);
     google_rpc_Status_set_message(error_detail, error_description_strview);
     GRPC_ERROR_UNREF(error);
   }
-  // Encode the request.
+  return request;
+}
+
+grpc_slice SerializeDiscoveryRequest(upb_arena* arena,
+                                     envoy_api_v2_DiscoveryRequest* request) {
   size_t output_length;
-  char* output = envoy_api_v2_DiscoveryRequest_serialize(request, arena.ptr(),
-                                                         &output_length);
+  char* output =
+      envoy_api_v2_DiscoveryRequest_serialize(request, arena, &output_length);
   return grpc_slice_from_copied_buffer(output, output_length);
 }
 
-grpc_slice XdsEdsRequestCreateAndEncode(
-    const std::set<StringView>& eds_service_names,
-    const XdsBootstrap::Node* node, const char* build_version,
-    const std::string& version, const std::string& nonce, grpc_error* error) {
+}  // namespace
+
+grpc_slice XdsApi::CreateUnsupportedTypeNackRequest(const std::string& type_url,
+                                                    const std::string& nonce,
+                                                    grpc_error* error) {
+  upb::Arena arena;
+  envoy_api_v2_DiscoveryRequest* request = CreateDiscoveryRequest(
+      arena.ptr(), type_url.c_str(), /*version=*/"", nonce, error);
+  return SerializeDiscoveryRequest(arena.ptr(), request);
+}
+
+grpc_slice XdsApi::CreateLdsRequest(const std::string& server_name,
+                                    const std::string& version,
+                                    const std::string& nonce, grpc_error* error,
+                                    bool populate_node) {
   upb::Arena arena;
-  // Create a request.
   envoy_api_v2_DiscoveryRequest* request =
-      envoy_api_v2_DiscoveryRequest_new(arena.ptr());
-  // Set version_info.
-  if (!version.empty()) {
-    envoy_api_v2_DiscoveryRequest_set_version_info(
-        request, upb_strview_makez(version.c_str()));
+      CreateDiscoveryRequest(arena.ptr(), kLdsTypeUrl, version, nonce, error);
+  // Populate node.
+  if (populate_node) {
+    envoy_api_v2_core_Node* node_msg =
+        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
+    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
+                 node_msg);
+  }
+  // Add resource_name.
+  envoy_api_v2_DiscoveryRequest_add_resource_names(
+      request, upb_strview_make(server_name.data(), server_name.size()),
+      arena.ptr());
+  return SerializeDiscoveryRequest(arena.ptr(), request);
+}
+
+grpc_slice XdsApi::CreateRdsRequest(const std::string& route_config_name,
+                                    const std::string& version,
+                                    const std::string& nonce, grpc_error* error,
+                                    bool populate_node) {
+  upb::Arena arena;
+  envoy_api_v2_DiscoveryRequest* request =
+      CreateDiscoveryRequest(arena.ptr(), kRdsTypeUrl, version, nonce, error);
+  // Populate node.
+  if (populate_node) {
+    envoy_api_v2_core_Node* node_msg =
+        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
+    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
+                 node_msg);
+  }
+  // Add resource_name.
+  envoy_api_v2_DiscoveryRequest_add_resource_names(
+      request,
+      upb_strview_make(route_config_name.data(), route_config_name.size()),
+      arena.ptr());
+  return SerializeDiscoveryRequest(arena.ptr(), request);
+}
+
+grpc_slice XdsApi::CreateCdsRequest(const std::set<StringView>& cluster_names,
+                                    const std::string& version,
+                                    const std::string& nonce, grpc_error* error,
+                                    bool populate_node) {
+  upb::Arena arena;
+  envoy_api_v2_DiscoveryRequest* request =
+      CreateDiscoveryRequest(arena.ptr(), kCdsTypeUrl, version, nonce, error);
+  // Populate node.
+  if (populate_node) {
+    envoy_api_v2_core_Node* node_msg =
+        envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
+    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
+                 node_msg);
   }
+  // Add resource_names.
+  for (const auto& cluster_name : cluster_names) {
+    envoy_api_v2_DiscoveryRequest_add_resource_names(
+        request, upb_strview_make(cluster_name.data(), cluster_name.size()),
+        arena.ptr());
+  }
+  return SerializeDiscoveryRequest(arena.ptr(), request);
+}
+
+grpc_slice XdsApi::CreateEdsRequest(
+    const std::set<StringView>& eds_service_names, const std::string& version,
+    const std::string& nonce, grpc_error* error, bool populate_node) {
+  upb::Arena arena;
+  envoy_api_v2_DiscoveryRequest* request =
+      CreateDiscoveryRequest(arena.ptr(), kEdsTypeUrl, version, nonce, error);
   // Populate node.
-  if (build_version != nullptr) {
+  if (populate_node) {
     envoy_api_v2_core_Node* node_msg =
         envoy_api_v2_DiscoveryRequest_mutable_node(request, arena.ptr());
-    PopulateNode(arena.ptr(), node, build_version, node_msg);
+    PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_, "",
+                 node_msg);
   }
   // Add resource_names.
   for (const auto& eds_service_name : eds_service_names) {
@@ -306,38 +394,283 @@ grpc_slice XdsEdsRequestCreateAndEncode(
         upb_strview_make(eds_service_name.data(), eds_service_name.size()),
         arena.ptr());
   }
-  // Set type_url.
-  envoy_api_v2_DiscoveryRequest_set_type_url(request,
-                                             upb_strview_makez(kEdsTypeUrl));
-  // Set nonce.
-  if (!nonce.empty()) {
-    envoy_api_v2_DiscoveryRequest_set_response_nonce(
-        request, upb_strview_makez(nonce.c_str()));
+  return SerializeDiscoveryRequest(arena.ptr(), request);
+}
+
+namespace {
+
+// Better match type has smaller value.
+enum MatchType {
+  EXACT_MATCH,
+  SUFFIX_MATCH,
+  PREFIX_MATCH,
+  UNIVERSE_MATCH,
+  INVALID_MATCH,
+};
+
+// Returns true if match succeeds.
+bool DomainMatch(MatchType match_type, std::string domain_pattern,
+                 std::string expected_host_name) {
+  // Normalize the args to lower-case. Domain matching is case-insensitive.
+  std::transform(domain_pattern.begin(), domain_pattern.end(),
+                 domain_pattern.begin(),
+                 [](unsigned char c) { return std::tolower(c); });
+  std::transform(expected_host_name.begin(), expected_host_name.end(),
+                 expected_host_name.begin(),
+                 [](unsigned char c) { return std::tolower(c); });
+  if (match_type == EXACT_MATCH) {
+    return domain_pattern == expected_host_name;
+  } else if (match_type == SUFFIX_MATCH) {
+    // Asterisk must match at least one char.
+    if (expected_host_name.size() < domain_pattern.size()) return false;
+    StringView pattern_suffix(domain_pattern.c_str() + 1);
+    StringView host_suffix(expected_host_name.c_str() +
+                           expected_host_name.size() - pattern_suffix.size());
+    return pattern_suffix == host_suffix;
+  } else if (match_type == PREFIX_MATCH) {
+    // Asterisk must match at least one char.
+    if (expected_host_name.size() < domain_pattern.size()) return false;
+    StringView pattern_prefix(domain_pattern.c_str(),
+                              domain_pattern.size() - 1);
+    StringView host_prefix(expected_host_name.c_str(), pattern_prefix.size());
+    return pattern_prefix == host_prefix;
+  } else {
+    return match_type == UNIVERSE_MATCH;
   }
-  // Set error_detail if it's a NACK.
-  if (error != GRPC_ERROR_NONE) {
-    grpc_slice error_description_slice;
-    GPR_ASSERT(grpc_error_get_str(error, GRPC_ERROR_STR_DESCRIPTION,
-                                  &error_description_slice));
-    upb_strview error_description_strview =
-        upb_strview_make(reinterpret_cast<const char*>(
-                             GPR_SLICE_START_PTR(error_description_slice)),
-                         GPR_SLICE_LENGTH(error_description_slice));
-    google_rpc_Status* error_detail =
-        envoy_api_v2_DiscoveryRequest_mutable_error_detail(request,
-                                                           arena.ptr());
-    google_rpc_Status_set_message(error_detail, error_description_strview);
-    GRPC_ERROR_UNREF(error);
+}
+
+MatchType DomainPatternMatchType(const std::string& domain_pattern) {
+  if (domain_pattern.empty()) return INVALID_MATCH;
+  if (domain_pattern.find('*') == std::string::npos) return EXACT_MATCH;
+  if (domain_pattern == "*") return UNIVERSE_MATCH;
+  if (domain_pattern[0] == '*') return SUFFIX_MATCH;
+  if (domain_pattern[domain_pattern.size() - 1] == '*') return PREFIX_MATCH;
+  return INVALID_MATCH;
+}
+
+grpc_error* RouteConfigParse(
+    const envoy_api_v2_RouteConfiguration* route_config,
+    const std::string& expected_server_name, XdsApi::RdsUpdate* rds_update) {
+  // Strip off port from server name, if any.
+  size_t pos = expected_server_name.find(':');
+  std::string expected_host_name = expected_server_name.substr(0, pos);
+  // Get the virtual hosts.
+  size_t size;
+  const envoy_api_v2_route_VirtualHost* const* virtual_hosts =
+      envoy_api_v2_RouteConfiguration_virtual_hosts(route_config, &size);
+  // Find the best matched virtual host.
+  // The search order for 4 groups of domain patterns:
+  //   1. Exact match.
+  //   2. Suffix match (e.g., "*ABC").
+  //   3. Prefix match (e.g., "ABC*").
+  //   4. Universe match (i.e., "*").
+  // Within each group, longest match wins.
+  // If the same best matched domain pattern appears in multiple virtual hosts,
+  // the first matched virtual host wins.
+  const envoy_api_v2_route_VirtualHost* target_virtual_host = nullptr;
+  MatchType best_match_type = INVALID_MATCH;
+  size_t longest_match = 0;
+  // Check each domain pattern in each virtual host to determine the best
+  // matched virtual host.
+  for (size_t i = 0; i < size; ++i) {
+    size_t domain_size;
+    upb_strview const* domains =
+        envoy_api_v2_route_VirtualHost_domains(virtual_hosts[i], &domain_size);
+    for (size_t j = 0; j < domain_size; ++j) {
+      const std::string domain_pattern(domains[j].data, domains[j].size);
+      // Check the match type first. Skip the pattern if it's not better than
+      // current match.
+      const MatchType match_type = DomainPatternMatchType(domain_pattern);
+      if (match_type == INVALID_MATCH) {
+        return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Invalid domain pattern.");
+      }
+      if (match_type > best_match_type) continue;
+      if (match_type == best_match_type &&
+          domain_pattern.size() <= longest_match) {
+        continue;
+      }
+      // Skip if match fails.
+      if (!DomainMatch(match_type, domain_pattern, expected_host_name)) {
+        continue;
+      }
+      // Choose this match.
+      target_virtual_host = virtual_hosts[i];
+      best_match_type = match_type;
+      longest_match = domain_pattern.size();
+      if (best_match_type == EXACT_MATCH) break;
+    }
+    if (best_match_type == EXACT_MATCH) break;
   }
-  // Encode the request.
-  size_t output_length;
-  char* output = envoy_api_v2_DiscoveryRequest_serialize(request, arena.ptr(),
-                                                         &output_length);
-  return grpc_slice_from_copied_buffer(output, output_length);
+  if (target_virtual_host == nullptr) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "No matched virtual host found in the route config.");
+  }
+  // Get the route list from the matched virtual host.
+  const envoy_api_v2_route_Route* const* routes =
+      envoy_api_v2_route_VirtualHost_routes(target_virtual_host, &size);
+  if (size < 1) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "No route found in the virtual host.");
+  }
+  // Only look at the last one in the route list (the default route),
+  const envoy_api_v2_route_Route* route = routes[size - 1];
+  // Validate that the match field must have a prefix field which is an empty
+  // string.
+  const envoy_api_v2_route_RouteMatch* match =
+      envoy_api_v2_route_Route_match(route);
+  if (!envoy_api_v2_route_RouteMatch_has_prefix(match)) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "No prefix field found in RouteMatch.");
+  }
+  const upb_strview prefix = envoy_api_v2_route_RouteMatch_prefix(match);
+  if (!upb_strview_eql(prefix, upb_strview_makez(""))) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Prefix is not empty string.");
+  }
+  if (!envoy_api_v2_route_Route_has_route(route)) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "No RouteAction found in route.");
+  }
+  const envoy_api_v2_route_RouteAction* route_action =
+      envoy_api_v2_route_Route_route(route);
+  // Get the cluster in the RouteAction.
+  if (!envoy_api_v2_route_RouteAction_has_cluster(route_action)) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "No cluster found in RouteAction.");
+  }
+  const upb_strview cluster =
+      envoy_api_v2_route_RouteAction_cluster(route_action);
+  rds_update->cluster_name = std::string(cluster.data, cluster.size);
+  return GRPC_ERROR_NONE;
+}
+
+grpc_error* LdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
+                             const std::string& expected_server_name,
+                             XdsApi::LdsUpdate* lds_update, upb_arena* arena) {
+  // Get the resources from the response.
+  size_t size;
+  const google_protobuf_Any* const* resources =
+      envoy_api_v2_DiscoveryResponse_resources(response, &size);
+  if (size < 1) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "LDS response contains 0 resource.");
+  }
+  for (size_t i = 0; i < size; ++i) {
+    // Check the type_url of the resource.
+    const upb_strview type_url = google_protobuf_Any_type_url(resources[i]);
+    if (!upb_strview_eql(type_url, upb_strview_makez(XdsApi::kLdsTypeUrl))) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not LDS.");
+    }
+    // Decode the listener.
+    const upb_strview encoded_listener =
+        google_protobuf_Any_value(resources[i]);
+    const envoy_api_v2_Listener* listener = envoy_api_v2_Listener_parse(
+        encoded_listener.data, encoded_listener.size, arena);
+    if (listener == nullptr) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode listener.");
+    }
+    // Check listener name. Ignore unexpected listeners.
+    const upb_strview name = envoy_api_v2_Listener_name(listener);
+    const upb_strview expected_name =
+        upb_strview_makez(expected_server_name.c_str());
+    if (!upb_strview_eql(name, expected_name)) continue;
+    // Get api_listener and decode it to http_connection_manager.
+    const envoy_config_listener_v2_ApiListener* api_listener =
+        envoy_api_v2_Listener_api_listener(listener);
+    if (api_listener == nullptr) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "Listener doesn't have ApiListener.");
+    }
+    const upb_strview encoded_api_listener = google_protobuf_Any_value(
+        envoy_config_listener_v2_ApiListener_api_listener(api_listener));
+    const envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager*
+        http_connection_manager =
+            envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_parse(
+                encoded_api_listener.data, encoded_api_listener.size, arena);
+    // Found inlined route_config. Parse it to find the cluster_name.
+    if (envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_has_route_config(
+            http_connection_manager)) {
+      const envoy_api_v2_RouteConfiguration* route_config =
+          envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_route_config(
+              http_connection_manager);
+      XdsApi::RdsUpdate rds_update;
+      grpc_error* error =
+          RouteConfigParse(route_config, expected_server_name, &rds_update);
+      if (error != GRPC_ERROR_NONE) return error;
+      lds_update->rds_update.emplace(std::move(rds_update));
+      const upb_strview route_config_name =
+          envoy_api_v2_RouteConfiguration_name(route_config);
+      lds_update->route_config_name =
+          std::string(route_config_name.data, route_config_name.size);
+      return GRPC_ERROR_NONE;
+    }
+    // Validate that RDS must be used to get the route_config dynamically.
+    if (!envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_has_rds(
+            http_connection_manager)) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          "HttpConnectionManager neither has inlined route_config nor RDS.");
+    }
+    // Get the route_config_name.
+    const envoy_config_filter_network_http_connection_manager_v2_Rds* rds =
+        envoy_config_filter_network_http_connection_manager_v2_HttpConnectionManager_rds(
+            http_connection_manager);
+    const upb_strview route_config_name =
+        envoy_config_filter_network_http_connection_manager_v2_Rds_route_config_name(
+            rds);
+    lds_update->route_config_name =
+        std::string(route_config_name.data, route_config_name.size);
+    return GRPC_ERROR_NONE;
+  }
+  return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+      "No listener found for expected server name.");
+}
+
+grpc_error* RdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
+                             const std::string& expected_server_name,
+                             const std::string& expected_route_config_name,
+                             XdsApi::RdsUpdate* rds_update, upb_arena* arena) {
+  // Get the resources from the response.
+  size_t size;
+  const google_protobuf_Any* const* resources =
+      envoy_api_v2_DiscoveryResponse_resources(response, &size);
+  if (size < 1) {
+    return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+        "RDS response contains 0 resource.");
+  }
+  for (size_t i = 0; i < size; ++i) {
+    // Check the type_url of the resource.
+    const upb_strview type_url = google_protobuf_Any_type_url(resources[i]);
+    if (!upb_strview_eql(type_url, upb_strview_makez(XdsApi::kRdsTypeUrl))) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not RDS.");
+    }
+    // Decode the route_config.
+    const upb_strview encoded_route_config =
+        google_protobuf_Any_value(resources[i]);
+    const envoy_api_v2_RouteConfiguration* route_config =
+        envoy_api_v2_RouteConfiguration_parse(encoded_route_config.data,
+                                              encoded_route_config.size, arena);
+    if (route_config == nullptr) {
+      return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode route_config.");
+    }
+    // Check route_config_name. Ignore unexpected route_config.
+    const upb_strview name = envoy_api_v2_RouteConfiguration_name(route_config);
+    const upb_strview expected_name =
+        upb_strview_makez(expected_route_config_name.c_str());
+    if (!upb_strview_eql(name, expected_name)) continue;
+    // Parse the route_config.
+    XdsApi::RdsUpdate local_rds_update;
+    grpc_error* error =
+        RouteConfigParse(route_config, expected_server_name, &local_rds_update);
+    if (error != GRPC_ERROR_NONE) return error;
+    *rds_update = std::move(local_rds_update);
+    return GRPC_ERROR_NONE;
+  }
+  return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+      "No route config found for expected name.");
 }
 
 grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
-                             CdsUpdateMap* cds_update_map, upb_arena* arena) {
+                             XdsApi::CdsUpdateMap* cds_update_map,
+                             upb_arena* arena) {
   // Get the resources from the response.
   size_t size;
   const google_protobuf_Any* const* resources =
@@ -348,10 +681,10 @@ grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
   }
   // Parse all the resources in the CDS response.
   for (size_t i = 0; i < size; ++i) {
-    CdsUpdate cds_update;
+    XdsApi::CdsUpdate cds_update;
     // Check the type_url of the resource.
     const upb_strview type_url = google_protobuf_Any_type_url(resources[i]);
-    if (!upb_strview_eql(type_url, upb_strview_makez(kCdsTypeUrl))) {
+    if (!upb_strview_eql(type_url, upb_strview_makez(XdsApi::kCdsTypeUrl))) {
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not CDS.");
     }
     // Decode the cluster.
@@ -397,7 +730,7 @@ grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
         return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
             "ConfigSource is not self.");
       }
-      cds_update.lrs_load_reporting_server_name.set("");
+      cds_update.lrs_load_reporting_server_name.emplace("");
     }
     upb_strview cluster_name = envoy_api_v2_Cluster_name(cluster);
     cds_update_map->emplace(std::string(cluster_name.data, cluster_name.size),
@@ -406,8 +739,6 @@ grpc_error* CdsResponseParse(const envoy_api_v2_DiscoveryResponse* response,
   return GRPC_ERROR_NONE;
 }
 
-namespace {
-
 grpc_error* ServerAddressParseAndAppend(
     const envoy_api_v2_endpoint_LbEndpoint* lb_endpoint,
     ServerAddressList* list) {
@@ -445,7 +776,7 @@ grpc_error* ServerAddressParseAndAppend(
 
 grpc_error* LocalityParse(
     const envoy_api_v2_endpoint_LocalityLbEndpoints* locality_lb_endpoints,
-    XdsPriorityListUpdate::LocalityMap::Locality* output_locality) {
+    XdsApi::PriorityListUpdate::LocalityMap::Locality* output_locality) {
   // Parse LB weight.
   const google_protobuf_UInt32Value* lb_weight =
       envoy_api_v2_endpoint_LocalityLbEndpoints_load_balancing_weight(
@@ -483,7 +814,7 @@ grpc_error* LocalityParse(
 
 grpc_error* DropParseAndAppend(
     const envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload* drop_overload,
-    XdsDropConfig* drop_config, bool* drop_all) {
+    XdsApi::DropConfig* drop_config, bool* drop_all) {
   // Get the category.
   upb_strview category =
       envoy_api_v2_ClusterLoadAssignment_Policy_DropOverload_category(
@@ -523,7 +854,7 @@ grpc_error* DropParseAndAppend(
 grpc_error* EdsResponsedParse(
     const envoy_api_v2_DiscoveryResponse* response,
     const std::set<StringView>& expected_eds_service_names,
-    EdsUpdateMap* eds_update_map, upb_arena* arena) {
+    XdsApi::EdsUpdateMap* eds_update_map, upb_arena* arena) {
   // Get the resources from the response.
   size_t size;
   const google_protobuf_Any* const* resources =
@@ -533,10 +864,10 @@ grpc_error* EdsResponsedParse(
         "EDS response contains 0 resource.");
   }
   for (size_t i = 0; i < size; ++i) {
-    EdsUpdate eds_update;
+    XdsApi::EdsUpdate eds_update;
     // Check the type_url of the resource.
     upb_strview type_url = google_protobuf_Any_type_url(resources[i]);
-    if (!upb_strview_eql(type_url, upb_strview_makez(kEdsTypeUrl))) {
+    if (!upb_strview_eql(type_url, upb_strview_makez(XdsApi::kEdsTypeUrl))) {
       return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not EDS.");
     }
     // Get the cluster_load_assignment.
@@ -565,7 +896,7 @@ grpc_error* EdsResponsedParse(
         envoy_api_v2_ClusterLoadAssignment_endpoints(cluster_load_assignment,
                                                      &locality_size);
     for (size_t j = 0; j < locality_size; ++j) {
-      XdsPriorityListUpdate::LocalityMap::Locality locality;
+      XdsApi::PriorityListUpdate::LocalityMap::Locality locality;
       grpc_error* error = LocalityParse(endpoints[j], &locality);
       if (error != GRPC_ERROR_NONE) return error;
       // Filter out locality with weight 0.
@@ -573,7 +904,7 @@ grpc_error* EdsResponsedParse(
       eds_update.priority_list_update.Add(locality);
     }
     // Get the drop config.
-    eds_update.drop_config = MakeRefCounted<XdsDropConfig>();
+    eds_update.drop_config = MakeRefCounted<XdsApi::DropConfig>();
     const envoy_api_v2_ClusterLoadAssignment_Policy* policy =
         envoy_api_v2_ClusterLoadAssignment_policy(cluster_load_assignment);
     if (policy != nullptr) {
@@ -603,11 +934,13 @@ grpc_error* EdsResponsedParse(
 
 }  // namespace
 
-grpc_error* XdsAdsResponseDecodeAndParse(
-    const grpc_slice& encoded_response,
+grpc_error* XdsApi::ParseAdsResponse(
+    const grpc_slice& encoded_response, const std::string& expected_server_name,
+    const std::string& expected_route_config_name,
     const std::set<StringView>& expected_eds_service_names,
-    CdsUpdateMap* cds_update_map, EdsUpdateMap* eds_update_map,
-    std::string* version, std::string* nonce, std::string* type_url) {
+    LdsUpdate* lds_update, RdsUpdate* rds_update, CdsUpdateMap* cds_update_map,
+    EdsUpdateMap* eds_update_map, std::string* version, std::string* nonce,
+    std::string* type_url) {
   upb::Arena arena;
   // Decode the response.
   const envoy_api_v2_DiscoveryResponse* response =
@@ -630,7 +963,14 @@ grpc_error* XdsAdsResponseDecodeAndParse(
   upb_strview nonce_strview = envoy_api_v2_DiscoveryResponse_nonce(response);
   *nonce = std::string(nonce_strview.data, nonce_strview.size);
   // Parse the response according to the resource type.
-  if (*type_url == kCdsTypeUrl) {
+  if (*type_url == kLdsTypeUrl) {
+    return LdsResponseParse(response, expected_server_name, lds_update,
+                            arena.ptr());
+  } else if (*type_url == kRdsTypeUrl) {
+    return RdsResponseParse(response, expected_server_name,
+                            expected_route_config_name, rds_update,
+                            arena.ptr());
+  } else if (*type_url == kCdsTypeUrl) {
     return CdsResponseParse(response, cds_update_map, arena.ptr());
   } else if (*type_url == kEdsTypeUrl) {
     return EdsResponsedParse(response, expected_eds_service_names,
@@ -643,7 +983,7 @@ grpc_error* XdsAdsResponseDecodeAndParse(
 
 namespace {
 
-grpc_slice LrsRequestEncode(
+grpc_slice SerializeLrsRequest(
     const envoy_service_load_stats_v2_LoadStatsRequest* request,
     upb_arena* arena) {
   size_t output_length;
@@ -654,9 +994,7 @@ grpc_slice LrsRequestEncode(
 
 }  // namespace
 
-grpc_slice XdsLrsRequestCreateAndEncode(const std::string& server_name,
-                                        const XdsBootstrap::Node* node,
-                                        const char* build_version) {
+grpc_slice XdsApi::CreateLrsInitialRequest(const std::string& server_name) {
   upb::Arena arena;
   // Create a request.
   envoy_service_load_stats_v2_LoadStatsRequest* request =
@@ -665,33 +1003,34 @@ grpc_slice XdsLrsRequestCreateAndEncode(const std::string& server_name,
   envoy_api_v2_core_Node* node_msg =
       envoy_service_load_stats_v2_LoadStatsRequest_mutable_node(request,
                                                                 arena.ptr());
-  PopulateNode(arena.ptr(), node, build_version, node_msg);
-  // Add cluster stats. There is only one because we only use one server name in
-  // one channel.
-  envoy_api_v2_endpoint_ClusterStats* cluster_stats =
-      envoy_service_load_stats_v2_LoadStatsRequest_add_cluster_stats(
-          request, arena.ptr());
-  // Set the cluster name.
-  envoy_api_v2_endpoint_ClusterStats_set_cluster_name(
-      cluster_stats, upb_strview_makez(server_name.c_str()));
-  return LrsRequestEncode(request, arena.ptr());
+  PopulateNode(arena.ptr(), node_, build_version_, user_agent_name_,
+               server_name, node_msg);
+  return SerializeLrsRequest(request, arena.ptr());
 }
 
 namespace {
 
-void LocalityStatsPopulate(
-    envoy_api_v2_endpoint_UpstreamLocalityStats* output,
-    const std::pair<const RefCountedPtr<XdsLocalityName>,
-                    XdsClientStats::LocalityStats::Snapshot>& input,
-    upb_arena* arena) {
-  // Set sub_zone.
+void LocalityStatsPopulate(envoy_api_v2_endpoint_UpstreamLocalityStats* output,
+                           const XdsLocalityName& locality_name,
+                           const XdsClusterLocalityStats::Snapshot& snapshot,
+                           upb_arena* arena) {
+  // Set locality.
   envoy_api_v2_core_Locality* locality =
       envoy_api_v2_endpoint_UpstreamLocalityStats_mutable_locality(output,
                                                                    arena);
-  envoy_api_v2_core_Locality_set_sub_zone(
-      locality, upb_strview_makez(input.first->sub_zone().c_str()));
+  if (!locality_name.region().empty()) {
+    envoy_api_v2_core_Locality_set_region(
+        locality, upb_strview_makez(locality_name.region().c_str()));
+  }
+  if (!locality_name.zone().empty()) {
+    envoy_api_v2_core_Locality_set_zone(
+        locality, upb_strview_makez(locality_name.zone().c_str()));
+  }
+  if (!locality_name.sub_zone().empty()) {
+    envoy_api_v2_core_Locality_set_sub_zone(
+        locality, upb_strview_makez(locality_name.sub_zone().c_str()));
+  }
   // Set total counts.
-  const XdsClientStats::LocalityStats::Snapshot& snapshot = input.second;
   envoy_api_v2_endpoint_UpstreamLocalityStats_set_total_successful_requests(
       output, snapshot.total_successful_requests);
   envoy_api_v2_endpoint_UpstreamLocalityStats_set_total_requests_in_progress(
@@ -700,16 +1039,15 @@ void LocalityStatsPopulate(
       output, snapshot.total_error_requests);
   envoy_api_v2_endpoint_UpstreamLocalityStats_set_total_issued_requests(
       output, snapshot.total_issued_requests);
-  // Add load metric stats.
-  for (auto& p : snapshot.load_metric_stats) {
-    const char* metric_name = p.first.c_str();
-    const XdsClientStats::LocalityStats::LoadMetric::Snapshot& metric_value =
-        p.second;
+  // Add backend metrics.
+  for (const auto& p : snapshot.backend_metrics) {
+    const std::string& metric_name = p.first;
+    const XdsClusterLocalityStats::BackendMetric& metric_value = p.second;
     envoy_api_v2_endpoint_EndpointLoadMetricStats* load_metric =
         envoy_api_v2_endpoint_UpstreamLocalityStats_add_load_metric_stats(
             output, arena);
     envoy_api_v2_endpoint_EndpointLoadMetricStats_set_metric_name(
-        load_metric, upb_strview_makez(metric_name));
+        load_metric, upb_strview_make(metric_name.data(), metric_name.size()));
     envoy_api_v2_endpoint_EndpointLoadMetricStats_set_num_requests_finished_with_metric(
         load_metric, metric_value.num_requests_finished_with_metric);
     envoy_api_v2_endpoint_EndpointLoadMetricStats_set_total_metric_value(
@@ -719,80 +1057,72 @@ void LocalityStatsPopulate(
 
 }  // namespace
 
-grpc_slice XdsLrsRequestCreateAndEncode(
-    std::map<StringView, std::set<XdsClientStats*>> client_stats_map) {
+grpc_slice XdsApi::CreateLrsRequest(
+    ClusterLoadReportMap cluster_load_report_map) {
   upb::Arena arena;
-  // Get the snapshots.
-  std::map<StringView, grpc_core::InlinedVector<XdsClientStats::Snapshot, 1>>
-      snapshot_map;
-  for (auto& p : client_stats_map) {
-    const StringView& cluster_name = p.first;
-    for (auto* client_stats : p.second) {
-      XdsClientStats::Snapshot snapshot = client_stats->GetSnapshotAndReset();
-      // Prune unused locality stats.
-      client_stats->PruneLocalityStats();
-      if (snapshot.IsAllZero()) continue;
-      snapshot_map[cluster_name].emplace_back(std::move(snapshot));
-    }
-  }
-  // When all the counts are zero, return empty slice.
-  if (snapshot_map.empty()) return grpc_empty_slice();
   // Create a request.
   envoy_service_load_stats_v2_LoadStatsRequest* request =
       envoy_service_load_stats_v2_LoadStatsRequest_new(arena.ptr());
-  for (auto& p : snapshot_map) {
-    const StringView& cluster_name = p.first;
-    const auto& snapshot_list = p.second;
-    for (size_t i = 0; i < snapshot_list.size(); ++i) {
-      const auto& snapshot = snapshot_list[i];
-      // Add cluster stats.
-      envoy_api_v2_endpoint_ClusterStats* cluster_stats =
-          envoy_service_load_stats_v2_LoadStatsRequest_add_cluster_stats(
-              request, arena.ptr());
-      // Set the cluster name.
-      envoy_api_v2_endpoint_ClusterStats_set_cluster_name(
+  for (auto& p : cluster_load_report_map) {
+    const std::string& cluster_name = p.first.first;
+    const std::string& eds_service_name = p.first.second;
+    const ClusterLoadReport& load_report = p.second;
+    // Add cluster stats.
+    envoy_api_v2_endpoint_ClusterStats* cluster_stats =
+        envoy_service_load_stats_v2_LoadStatsRequest_add_cluster_stats(
+            request, arena.ptr());
+    // Set the cluster name.
+    envoy_api_v2_endpoint_ClusterStats_set_cluster_name(
+        cluster_stats,
+        upb_strview_make(cluster_name.data(), cluster_name.size()));
+    // Set EDS service name, if non-empty.
+    if (!eds_service_name.empty()) {
+      envoy_api_v2_endpoint_ClusterStats_set_cluster_service_name(
           cluster_stats,
-          upb_strview_make(cluster_name.data(), cluster_name.size()));
-      // Add locality stats.
-      for (auto& p : snapshot.upstream_locality_stats) {
-        envoy_api_v2_endpoint_UpstreamLocalityStats* locality_stats =
-            envoy_api_v2_endpoint_ClusterStats_add_upstream_locality_stats(
-                cluster_stats, arena.ptr());
-        LocalityStatsPopulate(locality_stats, p, arena.ptr());
-      }
-      // Add dropped requests.
-      for (auto& p : snapshot.dropped_requests) {
-        const char* category = p.first.c_str();
-        const uint64_t count = p.second;
-        envoy_api_v2_endpoint_ClusterStats_DroppedRequests* dropped_requests =
-            envoy_api_v2_endpoint_ClusterStats_add_dropped_requests(
-                cluster_stats, arena.ptr());
-        envoy_api_v2_endpoint_ClusterStats_DroppedRequests_set_category(
-            dropped_requests, upb_strview_makez(category));
-        envoy_api_v2_endpoint_ClusterStats_DroppedRequests_set_dropped_count(
-            dropped_requests, count);
-      }
-      // Set total dropped requests.
-      envoy_api_v2_endpoint_ClusterStats_set_total_dropped_requests(
-          cluster_stats, snapshot.total_dropped_requests);
-      // Set real load report interval.
-      gpr_timespec timespec =
-          grpc_millis_to_timespec(snapshot.load_report_interval, GPR_TIMESPAN);
-      google_protobuf_Duration* load_report_interval =
-          envoy_api_v2_endpoint_ClusterStats_mutable_load_report_interval(
+          upb_strview_make(eds_service_name.data(), eds_service_name.size()));
+    }
+    // Add locality stats.
+    for (const auto& p : load_report.locality_stats) {
+      const XdsLocalityName& locality_name = *p.first;
+      const auto& snapshot = p.second;
+      envoy_api_v2_endpoint_UpstreamLocalityStats* locality_stats =
+          envoy_api_v2_endpoint_ClusterStats_add_upstream_locality_stats(
               cluster_stats, arena.ptr());
-      google_protobuf_Duration_set_seconds(load_report_interval,
-                                           timespec.tv_sec);
-      google_protobuf_Duration_set_nanos(load_report_interval,
-                                         timespec.tv_nsec);
+      LocalityStatsPopulate(locality_stats, locality_name, snapshot,
+                            arena.ptr());
+    }
+    // Add dropped requests.
+    uint64_t total_dropped_requests = 0;
+    for (const auto& p : load_report.dropped_requests) {
+      const char* category = p.first.c_str();
+      const uint64_t count = p.second;
+      envoy_api_v2_endpoint_ClusterStats_DroppedRequests* dropped_requests =
+          envoy_api_v2_endpoint_ClusterStats_add_dropped_requests(cluster_stats,
+                                                                  arena.ptr());
+      envoy_api_v2_endpoint_ClusterStats_DroppedRequests_set_category(
+          dropped_requests, upb_strview_makez(category));
+      envoy_api_v2_endpoint_ClusterStats_DroppedRequests_set_dropped_count(
+          dropped_requests, count);
+      total_dropped_requests += count;
     }
+    // Set total dropped requests.
+    envoy_api_v2_endpoint_ClusterStats_set_total_dropped_requests(
+        cluster_stats, total_dropped_requests);
+    // Set real load report interval.
+    gpr_timespec timespec =
+        grpc_millis_to_timespec(load_report.load_report_interval, GPR_TIMESPAN);
+    google_protobuf_Duration* load_report_interval =
+        envoy_api_v2_endpoint_ClusterStats_mutable_load_report_interval(
+            cluster_stats, arena.ptr());
+    google_protobuf_Duration_set_seconds(load_report_interval, timespec.tv_sec);
+    google_protobuf_Duration_set_nanos(load_report_interval, timespec.tv_nsec);
   }
-  return LrsRequestEncode(request, arena.ptr());
+  return SerializeLrsRequest(request, arena.ptr());
 }
 
-grpc_error* XdsLrsResponseDecodeAndParse(const grpc_slice& encoded_response,
-                                         std::set<std::string>* cluster_names,
-                                         grpc_millis* load_reporting_interval) {
+grpc_error* XdsApi::ParseLrsResponse(const grpc_slice& encoded_response,
+                                     std::set<std::string>* cluster_names,
+                                     grpc_millis* load_reporting_interval) {
   upb::Arena arena;
   // Decode the response.
   const envoy_service_load_stats_v2_LoadStatsResponse* decoded_response =