grpc 1.50.0.pre1 → 1.52.0.pre2

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

@@ -45,10 +45,9 @@
 #include "upb/upb.h"
 #include "upb/upb.hpp"
 
-#include <grpc/grpc.h>
-#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/time.h>
 
 #include "src/core/ext/xds/upb_utils.h"
 #include "src/core/ext/xds/xds_client.h"
@@ -58,40 +57,15 @@
 
 namespace grpc_core {
 
-// If gRPC is built with -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="...", that string
-// will be appended to the user agent name reported to the xDS server.
-#ifdef GRPC_XDS_USER_AGENT_NAME_SUFFIX
-#define GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING \
-  " " GRPC_XDS_USER_AGENT_NAME_SUFFIX
-#else
-#define GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING ""
-#endif
-
-// If gRPC is built with -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="...", that string
-// will be appended to the user agent version reported to the xDS server.
-#ifdef GRPC_XDS_USER_AGENT_VERSION_SUFFIX
-#define GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING \
-  " " GRPC_XDS_USER_AGENT_VERSION_SUFFIX
-#else
-#define GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING ""
-#endif
-
 XdsApi::XdsApi(XdsClient* client, TraceFlag* tracer,
-               const XdsBootstrap::Node* node, upb::SymbolTable* symtab)
+               const XdsBootstrap::Node* node, upb::SymbolTable* symtab,
+               std::string user_agent_name, std::string user_agent_version)
     : client_(client),
       tracer_(tracer),
       node_(node),
       symtab_(symtab),
-      build_version_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING, " ",
-                                  grpc_version_string(),
-                                  GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING,
-                                  GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING)),
-      user_agent_name_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING,
-                                    GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING)),
-      user_agent_version_(
-          absl::StrCat("C-core ", grpc_version_string(),
-                       GRPC_XDS_USER_AGENT_NAME_SUFFIX_STRING,
-                       GRPC_XDS_USER_AGENT_VERSION_SUFFIX_STRING)) {}
+      user_agent_name_(std::move(user_agent_name)),
+      user_agent_version_(std::move(user_agent_version)) {}
 
 namespace {
 
@@ -100,7 +74,6 @@ struct XdsApiContext {
   TraceFlag* tracer;
   upb_DefPool* symtab;
   upb_Arena* arena;
-  bool use_v3;
 };
 
 void PopulateMetadataValue(const XdsApiContext& context,
@@ -162,41 +135,7 @@ void PopulateMetadataValue(const XdsApiContext& context,
   }
 }
 
-// Helper functions to manually do protobuf string encoding, so that we
-// can populate the node build_version field that was removed in v3.
-std::string EncodeVarint(uint64_t val) {
-  std::string data;
-  do {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val) byte |= 0x80U;
-    data += byte;
-  } while (val);
-  return data;
-}
-std::string EncodeTag(uint32_t field_number, uint8_t wire_type) {
-  return EncodeVarint((field_number << 3) | wire_type);
-}
-std::string EncodeStringField(uint32_t field_number, const std::string& str) {
-  static const uint8_t kDelimitedWireType = 2;
-  return EncodeTag(field_number, kDelimitedWireType) +
-         EncodeVarint(str.size()) + str;
-}
-
-void PopulateBuildVersion(const XdsApiContext& context,
-                          envoy_config_core_v3_Node* node_msg,
-                          const std::string& build_version) {
-  std::string encoded_build_version = EncodeStringField(5, build_version);
-  // TODO(roth): This should use upb_Message_AddUnknown(), but that API is
-  // broken in the current version of upb, so we're using the internal
-  // API for now.  Change this once we upgrade to a version of upb that
-  // fixes this bug.
-  _upb_Message_AddUnknown(node_msg, encoded_build_version.data(),
-                          encoded_build_version.size(), context.arena);
-}
-
 void PopulateNode(const XdsApiContext& context, const XdsBootstrap::Node* node,
-                  const std::string& build_version,
                   const std::string& user_agent_name,
                   const std::string& user_agent_version,
                   envoy_config_core_v3_Node* node_msg) {
@@ -232,9 +171,6 @@ void PopulateNode(const XdsApiContext& context, const XdsBootstrap::Node* node,
       }
     }
   }
-  if (!context.use_v3) {
-    PopulateBuildVersion(context, node_msg, build_version);
-  }
   envoy_config_core_v3_Node_set_user_agent_name(
       node_msg, StdStringToUpbString(user_agent_name));
   envoy_config_core_v3_Node_set_user_agent_version(
@@ -271,13 +207,11 @@ std::string SerializeDiscoveryRequest(
 }  // namespace
 
 std::string XdsApi::CreateAdsRequest(
-    const XdsBootstrap::XdsServer& server, absl::string_view type_url,
-    absl::string_view version, absl::string_view nonce,
-    const std::vector<std::string>& resource_names, absl::Status status,
-    bool populate_node) {
+    absl::string_view type_url, absl::string_view version,
+    absl::string_view nonce, const std::vector<std::string>& resource_names,
+    absl::Status status, bool populate_node) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr(),
-                                 server.ShouldUseV3()};
+  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
   // Create a request.
   envoy_service_discovery_v3_DiscoveryRequest* request =
       envoy_service_discovery_v3_DiscoveryRequest_new(arena.ptr());
@@ -317,8 +251,8 @@ std::string XdsApi::CreateAdsRequest(
     envoy_config_core_v3_Node* node_msg =
         envoy_service_discovery_v3_DiscoveryRequest_mutable_node(request,
                                                                  arena.ptr());
-    PopulateNode(context, node_, build_version_, user_agent_name_,
-                 user_agent_version_, node_msg);
+    PopulateNode(context, node_, user_agent_name_, user_agent_version_,
+                 node_msg);
     envoy_config_core_v3_Node_add_client_features(
         node_msg, upb_StringView_FromString("xds.config.resource-in-sotw"),
         context.arena);
@@ -350,12 +284,10 @@ void MaybeLogDiscoveryResponse(
 
 }  // namespace
 
-absl::Status XdsApi::ParseAdsResponse(const XdsBootstrap::XdsServer& server,
-                                      absl::string_view encoded_response,
+absl::Status XdsApi::ParseAdsResponse(absl::string_view encoded_response,
                                       AdsResponseParserInterface* parser) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr(),
-                                 server.ShouldUseV3()};
+  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
   // Decode the response.
   const envoy_service_discovery_v3_DiscoveryResponse* response =
       envoy_service_discovery_v3_DiscoveryResponse_parse(
@@ -391,8 +323,7 @@ absl::Status XdsApi::ParseAdsResponse(const XdsBootstrap::XdsServer& server,
         UpbStringToAbsl(google_protobuf_Any_value(resources[i]));
     // Unwrap Resource messages, if so wrapped.
     absl::string_view resource_name;
-    if (type_url == "envoy.api.v2.Resource" ||
-        type_url == "envoy.service.discovery.v3.Resource") {
+    if (type_url == "envoy.service.discovery.v3.Resource") {
       const auto* resource_wrapper = envoy_service_discovery_v3_Resource_parse(
           serialized_resource.data(), serialized_resource.size(), arena.ptr());
       if (resource_wrapper == nullptr) {
@@ -442,11 +373,9 @@ std::string SerializeLrsRequest(
 
 }  // namespace
 
-std::string XdsApi::CreateLrsInitialRequest(
-    const XdsBootstrap::XdsServer& server) {
+std::string XdsApi::CreateLrsInitialRequest() {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr(),
-                                 server.ShouldUseV3()};
+  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
   // Create a request.
   envoy_service_load_stats_v3_LoadStatsRequest* request =
       envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr());
@@ -454,8 +383,7 @@ std::string XdsApi::CreateLrsInitialRequest(
   envoy_config_core_v3_Node* node_msg =
       envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(request,
                                                                 arena.ptr());
-  PopulateNode(context, node_, build_version_, user_agent_name_,
-               user_agent_version_, node_msg);
+  PopulateNode(context, node_, user_agent_name_, user_agent_version_, node_msg);
   envoy_config_core_v3_Node_add_client_features(
       node_msg,
       upb_StringView_FromString("envoy.lrs.supports_send_all_clusters"),
@@ -517,8 +445,7 @@ void LocalityStatsPopulate(
 std::string XdsApi::CreateLrsRequest(
     ClusterLoadReportMap cluster_load_report_map) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr(),
-                                 /*use_v3=*/false};
+  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
   // Create a request.
   envoy_service_load_stats_v3_LoadStatsRequest* request =
       envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr());
@@ -636,10 +563,8 @@ std::string XdsApi::AssembleClientConfig(
   // Fill-in the node information
   auto* node = envoy_service_status_v3_ClientConfig_mutable_node(client_config,
                                                                  arena.ptr());
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr(),
-                                 /*use_v3=*/true};
-  PopulateNode(context, node_, build_version_, user_agent_name_,
-               user_agent_version_, node);
+  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  PopulateNode(context, node_, user_agent_name_, user_agent_version_, node);
   // Dump each resource.
   std::vector<std::string> type_url_storage;
   for (const auto& p : resource_type_metadata_map) {

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

@@ -147,12 +147,11 @@ class XdsApi {
                 "");
 
   XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node,
-         upb::SymbolTable* symtab);
+         upb::SymbolTable* symtab, std::string user_agent_name,
+         std::string user_agent_version);
 
   // Creates an ADS request.
-  // Takes ownership of \a error.
-  std::string CreateAdsRequest(const XdsBootstrap::XdsServer& server,
-                               absl::string_view type_url,
+  std::string CreateAdsRequest(absl::string_view type_url,
                                absl::string_view version,
                                absl::string_view nonce,
                                const std::vector<std::string>& resource_names,
@@ -160,12 +159,11 @@ class XdsApi {
 
   // Returns non-OK when failing to deserialize response message.
   // Otherwise, all events are reported to the parser.
-  absl::Status ParseAdsResponse(const XdsBootstrap::XdsServer& server,
-                                absl::string_view encoded_response,
+  absl::Status ParseAdsResponse(absl::string_view encoded_response,
                                 AdsResponseParserInterface* parser);
 
   // Creates an initial LRS request.
-  std::string CreateLrsInitialRequest(const XdsBootstrap::XdsServer& server);
+  std::string CreateLrsInitialRequest();
 
   // Creates an LRS request sending a client-side load report.
   std::string CreateLrsRequest(ClusterLoadReportMap cluster_load_report_map);
@@ -186,7 +184,6 @@ class XdsApi {
   TraceFlag* tracer_;
   const XdsBootstrap::Node* node_;  // Do not own.
   upb::SymbolTable* symtab_;        // Do not own.
-  const std::string build_version_;
   const std::string user_agent_name_;
   const std::string user_agent_version_;
 };

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

@@ -46,7 +46,6 @@ class XdsBootstrap {
     virtual ~XdsServer() = default;
 
     virtual const std::string& server_uri() const = 0;
-    virtual bool ShouldUseV3() const = 0;
     virtual bool IgnoreResourceDeletion() const = 0;
 
     virtual bool Equals(const XdsServer& other) const = 0;

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

@@ -25,7 +25,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
@@ -39,7 +38,6 @@
 #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/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 
 namespace grpc_core {
@@ -95,17 +93,11 @@ GrpcXdsBootstrap::GrpcXdsServer::ChannelCreds::JsonLoader(const JsonArgs&) {
 
 namespace {
 
-constexpr absl::string_view kServerFeatureXdsV3 = "xds_v3";
 constexpr absl::string_view kServerFeatureIgnoreResourceDeletion =
     "ignore_resource_deletion";
 
 }  // namespace
 
-bool GrpcXdsBootstrap::GrpcXdsServer::ShouldUseV3() const {
-  return server_features_.find(std::string(kServerFeatureXdsV3)) !=
-         server_features_.end();
-}
-
 bool GrpcXdsBootstrap::GrpcXdsServer::IgnoreResourceDeletion() const {
   return server_features_.find(std::string(
              kServerFeatureIgnoreResourceDeletion)) != server_features_.end();
@@ -168,9 +160,8 @@ void GrpcXdsBootstrap::GrpcXdsServer::JsonPostLoad(const Json& json,
         const Json::Array& array = it->second.array_value();
         for (const Json& feature_json : array) {
           if (feature_json.type() == Json::Type::STRING &&
-              (feature_json.string_value() == kServerFeatureXdsV3 ||
-               feature_json.string_value() ==
-                   kServerFeatureIgnoreResourceDeletion)) {
+              (feature_json.string_value() ==
+               kServerFeatureIgnoreResourceDeletion)) {
             server_features_.insert(feature_json.string_value());
           }
         }
@@ -235,7 +226,7 @@ absl::StatusOr<std::unique_ptr<GrpcXdsBootstrap>> GrpcXdsBootstrap::Create(
   };
   auto bootstrap = LoadFromJson<GrpcXdsBootstrap>(*json, XdsJsonArgs());
   if (!bootstrap.ok()) return bootstrap.status();
-  return absl::make_unique<GrpcXdsBootstrap>(std::move(*bootstrap));
+  return std::make_unique<GrpcXdsBootstrap>(std::move(*bootstrap));
 }
 
 const JsonLoaderInterface* GrpcXdsBootstrap::JsonLoader(const JsonArgs&) {

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

@@ -31,6 +31,9 @@
 
 #include "src/core/ext/xds/certificate_provider_store.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
+#include "src/core/ext/xds/xds_http_filters.h"
+#include "src/core/ext/xds/xds_lb_policy_registry.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_args.h"
@@ -74,7 +77,6 @@ class GrpcXdsBootstrap : public XdsBootstrap {
    public:
     const std::string& server_uri() const override { return server_uri_; }
 
-    bool ShouldUseV3() const override;
     bool IgnoreResourceDeletion() const override;
 
     bool Equals(const XdsServer& other) const override;
@@ -149,6 +151,16 @@ class GrpcXdsBootstrap : public XdsBootstrap {
       const {
     return certificate_providers_;
   }
+  const XdsHttpFilterRegistry& http_filter_registry() const {
+    return http_filter_registry_;
+  }
+  const XdsClusterSpecifierPluginRegistry& cluster_specifier_plugin_registry()
+      const {
+    return cluster_specifier_plugin_registry_;
+  }
+  const XdsLbPolicyRegistry& lb_policy_registry() const {
+    return lb_policy_registry_;
+  }
 
   // Exposed for testing purposes only.
   const std::map<std::string, GrpcAuthority>& authorities() const {
@@ -162,6 +174,9 @@ class GrpcXdsBootstrap : public XdsBootstrap {
   std::string server_listener_resource_name_template_;
   std::map<std::string, GrpcAuthority> authorities_;
   CertificateProviderStore::PluginDefinitionMap certificate_providers_;
+  XdsHttpFilterRegistry http_filter_registry_;
+  XdsClusterSpecifierPluginRegistry cluster_specifier_plugin_registry_;
+  XdsLbPolicyRegistry lb_policy_registry_;
 };
 
 }  // namespace grpc_core

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

@@ -23,7 +23,6 @@
 #include <utility>
 
 #include "absl/functional/bind_front.h"
-#include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 
 #include <grpc/support/log.h>
@@ -59,12 +58,11 @@ class RootCertificatesWatcher
   }
 
   void OnError(grpc_error_handle root_cert_error,
-               grpc_error_handle identity_cert_error) override {
-    if (!GRPC_ERROR_IS_NONE(root_cert_error)) {
+               grpc_error_handle /*identity_cert_error*/) override {
+    if (!root_cert_error.ok()) {
       parent_->SetErrorForCert(cert_name_, root_cert_error /* pass the ref */,
                                absl::nullopt);
     }
-    GRPC_ERROR_UNREF(identity_cert_error);
   }
 
  private:
@@ -93,13 +91,12 @@ class IdentityCertificatesWatcher
     }
   }
 
-  void OnError(grpc_error_handle root_cert_error,
+  void OnError(grpc_error_handle /*root_cert_error*/,
                grpc_error_handle identity_cert_error) override {
-    if (!GRPC_ERROR_IS_NONE(identity_cert_error)) {
+    if (!identity_cert_error.ok()) {
       parent_->SetErrorForCert(cert_name_, absl::nullopt,
                                identity_cert_error /* pass the ref */);
     }
-    GRPC_ERROR_UNREF(root_cert_error);
   }
 
  private:
@@ -149,7 +146,7 @@ void XdsCertificateProvider::ClusterCertificateState::
       root_cert_watcher_ = nullptr;
       xds_certificate_provider_->distributor_->SetErrorForCert(
           "",
-          GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          GRPC_ERROR_CREATE(
               "No certificate provider available for root certificates"),
           absl::nullopt);
     }
@@ -180,7 +177,7 @@ void XdsCertificateProvider::ClusterCertificateState::
       identity_cert_watcher_ = nullptr;
       xds_certificate_provider_->distributor_->SetErrorForCert(
           "", absl::nullopt,
-          GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          GRPC_ERROR_CREATE(
               "No certificate provider available for identity certificates"));
     }
   }
@@ -191,7 +188,7 @@ void XdsCertificateProvider::ClusterCertificateState::
 void XdsCertificateProvider::ClusterCertificateState::UpdateRootCertWatcher(
     const std::string& cert_name,
     grpc_tls_certificate_distributor* root_cert_distributor) {
-  auto watcher = absl::make_unique<RootCertificatesWatcher>(
+  auto watcher = std::make_unique<RootCertificatesWatcher>(
       xds_certificate_provider_->distributor_, cert_name);
   root_cert_watcher_ = watcher.get();
   root_cert_distributor->WatchTlsCertificates(std::move(watcher),
@@ -201,7 +198,7 @@ void XdsCertificateProvider::ClusterCertificateState::UpdateRootCertWatcher(
 void XdsCertificateProvider::ClusterCertificateState::UpdateIdentityCertWatcher(
     const std::string& cert_name,
     grpc_tls_certificate_distributor* identity_cert_distributor) {
-  auto watcher = absl::make_unique<IdentityCertificatesWatcher>(
+  auto watcher = std::make_unique<IdentityCertificatesWatcher>(
       xds_certificate_provider_->distributor_, cert_name);
   identity_cert_watcher_ = watcher.get();
   identity_cert_distributor->WatchTlsCertificates(
@@ -222,7 +219,7 @@ void XdsCertificateProvider::ClusterCertificateState::WatchStatusCallback(
     if (root_cert_distributor_ == nullptr) {
       xds_certificate_provider_->distributor_->SetErrorForCert(
           cert_name,
-          GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          GRPC_ERROR_CREATE(
               "No certificate provider available for root certificates"),
           absl::nullopt);
     } else {
@@ -242,7 +239,7 @@ void XdsCertificateProvider::ClusterCertificateState::WatchStatusCallback(
     if (identity_cert_distributor_ == nullptr) {
       xds_certificate_provider_->distributor_->SetErrorForCert(
           cert_name, absl::nullopt,
-          GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+          GRPC_ERROR_CREATE(
               "No certificate provider available for identity certificates"));
     } else {
       UpdateIdentityCertWatcher(cert_name, identity_cert_distributor_.get());
@@ -290,10 +287,10 @@ void XdsCertificateProvider::UpdateRootCertNameAndDistributor(
   MutexLock lock(&mu_);
   auto it = certificate_state_map_.find(cert_name);
   if (it == certificate_state_map_.end()) {
-    it = certificate_state_map_
-             .emplace(cert_name,
-                      absl::make_unique<ClusterCertificateState>(this))
-             .first;
+    it =
+        certificate_state_map_
+            .emplace(cert_name, std::make_unique<ClusterCertificateState>(this))
+            .first;
   }
   it->second->UpdateRootCertNameAndDistributor(cert_name, root_cert_name,
                                                root_cert_distributor);
@@ -315,10 +312,10 @@ void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor(
   MutexLock lock(&mu_);
   auto it = certificate_state_map_.find(cert_name);
   if (it == certificate_state_map_.end()) {
-    it = certificate_state_map_
-             .emplace(cert_name,
-                      absl::make_unique<ClusterCertificateState>(this))
-             .first;
+    it =
+        certificate_state_map_
+            .emplace(cert_name, std::make_unique<ClusterCertificateState>(this))
+            .first;
   }
   it->second->UpdateIdentityCertNameAndDistributor(
       cert_name, identity_cert_name, identity_cert_distributor);
@@ -366,10 +363,10 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
   MutexLock lock(&mu_);
   auto it = certificate_state_map_.find(cert_name);
   if (it == certificate_state_map_.end()) {
-    it = certificate_state_map_
-             .emplace(cert_name,
-                      absl::make_unique<ClusterCertificateState>(this))
-             .first;
+    it =
+        certificate_state_map_
+            .emplace(cert_name, std::make_unique<ClusterCertificateState>(this))
+            .first;
   }
   it->second->WatchStatusCallback(cert_name, root_being_watched,
                                   identity_being_watched);

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

@@ -29,8 +29,8 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

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

@@ -29,4 +29,4 @@
 #define GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS \
   "grpc.xds_resource_does_not_exist_timeout_ms"
 
-#endif /* GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H */
+#endif  // GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H

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

@@ -29,7 +29,6 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 
 namespace grpc_core {

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

@@ -26,7 +26,7 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
@@ -62,4 +62,4 @@ class XdsChannelStackModifier : public RefCounted<XdsChannelStackModifier> {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H */
+#endif  // GRPC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H