grpc 1.63.0 → 1.64.0.pre1

data/src/core/{ext/xds → xds/grpc}/xds_listener.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LISTENER_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_LISTENER_H
 
 #include <stdint.h>
 #include <string.h>
@@ -36,15 +34,17 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_resource_type.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
-#include "src/core/ext/xds/xds_route_config.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_route_config.h"
+#include "src/core/xds/xds_client/xds_client.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
+#include "src/core/xds/xds_client/xds_resource_type_impl.h"
 
 namespace grpc_core {
 
@@ -233,4 +233,4 @@ class XdsListenerResourceType final
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_LISTENER_H

data/src/core/{ext/xds → xds/grpc}/xds_route_config.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_route_config.h"
+#include "src/core/xds/grpc/xds_route_config.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -29,6 +27,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -57,13 +56,8 @@
 
 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_resource_type.h"
-#include "src/core/ext/xds/xds_routing.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
@@ -76,6 +70,12 @@
 #include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/matchers/matchers.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_routing.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -465,7 +465,7 @@ absl::optional<StringMatcher> RoutePathMatchParse(
   } else if (envoy_config_route_v3_RouteMatch_has_safe_regex(match)) {
     const envoy_type_matcher_v3_RegexMatcher* regex_matcher =
         envoy_config_route_v3_RouteMatch_safe_regex(match);
-    GPR_ASSERT(regex_matcher != nullptr);
+    CHECK_NE(regex_matcher, nullptr);
     type = StringMatcher::Type::kSafeRegex;
     match_string = UpbStringToStdString(
         envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher));
@@ -493,7 +493,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
     ValidationErrors::ScopedField field(errors,
                                         absl::StrCat(".headers[", i, "]"));
     const envoy_config_route_v3_HeaderMatcher* header = headers[i];
-    GPR_ASSERT(header != nullptr);
+    CHECK_NE(header, nullptr);
     const std::string name =
         UpbStringToStdString(envoy_config_route_v3_HeaderMatcher_name(header));
     HeaderMatcher::Type type;
@@ -522,7 +522,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
                    header)) {
       const envoy_type_matcher_v3_RegexMatcher* regex_matcher =
           envoy_config_route_v3_HeaderMatcher_safe_regex_match(header);
-      GPR_ASSERT(regex_matcher != nullptr);
+      CHECK_NE(regex_matcher, nullptr);
       type = HeaderMatcher::Type::kSafeRegex;
       match_string = UpbStringToStdString(
           envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher));
@@ -530,7 +530,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
       type = HeaderMatcher::Type::kRange;
       const envoy_type_v3_Int64Range* range_matcher =
           envoy_config_route_v3_HeaderMatcher_range_match(header);
-      GPR_ASSERT(range_matcher != nullptr);
+      CHECK_NE(range_matcher, nullptr);
       range_start = envoy_type_v3_Int64Range_start(range_matcher);
       range_end = envoy_type_v3_Int64Range_end(range_matcher);
     } else if (envoy_config_route_v3_HeaderMatcher_has_present_match(header)) {
@@ -540,7 +540,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
       ValidationErrors::ScopedField field(errors, ".string_match");
       const auto* matcher =
           envoy_config_route_v3_HeaderMatcher_string_match(header);
-      GPR_ASSERT(matcher != nullptr);
+      CHECK_NE(matcher, nullptr);
       if (envoy_type_matcher_v3_StringMatcher_has_exact(matcher)) {
         type = HeaderMatcher::Type::kExact;
         match_string = UpbStringToStdString(
@@ -561,7 +561,7 @@ void RouteHeaderMatchersParse(const envoy_config_route_v3_RouteMatch* match,
         type = HeaderMatcher::Type::kSafeRegex;
         const auto* regex_matcher =
             envoy_type_matcher_v3_StringMatcher_safe_regex(matcher);
-        GPR_ASSERT(regex_matcher != nullptr);
+        CHECK_NE(regex_matcher, nullptr);
         match_string = UpbStringToStdString(
             envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher));
       } else {
@@ -887,7 +887,7 @@ absl::optional<XdsRouteConfigResource::Route::RouteAction> RouteActionParse(
     ValidationErrors::ScopedField field(errors, ".weighted_clusters");
     const envoy_config_route_v3_WeightedCluster* weighted_clusters_proto =
         envoy_config_route_v3_RouteAction_weighted_clusters(route_action_proto);
-    GPR_ASSERT(weighted_clusters_proto != nullptr);
+    CHECK_NE(weighted_clusters_proto, nullptr);
     std::vector<XdsRouteConfigResource::Route::RouteAction::ClusterWeight>
         action_weighted_clusters;
     uint64_t total_weight = 0;

data/src/core/{ext/xds → xds/grpc}/xds_route_config.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_H
 
 #include <stdint.h>
 
@@ -35,16 +33,18 @@
 #include "re2/re2.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client.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_resource_type.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/matchers/matchers.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/xds_client/xds_client.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
+#include "src/core/xds/xds_client/xds_resource_type_impl.h"
 
 namespace grpc_core {
 
@@ -250,4 +250,4 @@ class XdsRouteConfigResourceType final
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_H

data/src/core/{ext/xds → xds/grpc}/xds_routing.cc

@@ -16,9 +16,7 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_routing.h"
+#include "src/core/xds/grpc/xds_routing.h"
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -27,16 +25,18 @@
 #include <cctype>
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/xds_http_filters.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/matchers/matchers.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
 
 namespace grpc_core {
 
@@ -118,7 +118,7 @@ absl::optional<size_t> XdsRouting::FindVirtualHostForDomain(
       // than current match.
       const MatchType match_type = DomainPatternMatchType(domain_pattern);
       // This should be caught by RouteConfigParse().
-      GPR_ASSERT(match_type != INVALID_MATCH);
+      CHECK(match_type != INVALID_MATCH);
       if (match_type > best_match_type) continue;
       if (match_type == best_match_type &&
           domain_pattern.size() <= longest_match) {
@@ -236,7 +236,7 @@ XdsRouting::GeneratePerHTTPFilterConfigs(
     const XdsHttpFilterImpl* filter_impl =
         http_filter_registry.GetFilterForType(
             http_filter.config.config_proto_type_name);
-    GPR_ASSERT(filter_impl != nullptr);
+    CHECK_NE(filter_impl, nullptr);
     // If there is not actually any C-core filter associated with this
     // xDS filter, then it won't need any config, so skip it.
     if (filter_impl->channel_filter() == nullptr) continue;

data/src/core/{ext/xds → xds/grpc}/xds_routing.h

@@ -16,10 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
 
 #include <stddef.h>
 
@@ -31,11 +29,13 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_listener.h"
-#include "src/core/ext/xds/xds_route_config.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_listener.h"
+#include "src/core/xds/grpc/xds_route_config.h"
 
 namespace grpc_core {
 
@@ -103,4 +103,4 @@ class XdsRouting final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H

data/src/core/{ext/xds → xds/grpc}/xds_transport_grpc.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_transport_grpc.h"
+#include "src/core/xds/grpc/xds_transport_grpc.h"
 
 #include <string.h>
 
@@ -25,6 +23,7 @@
 #include <string_view>
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 
 #include <grpc/byte_buffer.h>
@@ -36,10 +35,9 @@
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/client_channel/client_channel_filter.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -61,6 +59,8 @@
 #include "src/core/lib/surface/init_internally.h"
 #include "src/core/lib/surface/lame_client.h"
 #include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
 
 namespace grpc_core {
 
@@ -79,7 +79,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
       factory_->interested_parties(), Slice::FromStaticString(method),
       /*authority=*/absl::nullopt, Timestamp::InfFuture(),
       /*registered_method=*/true);
-  GPR_ASSERT(call_ != nullptr);
+  CHECK_NE(call_, nullptr);
   // Init data associated with the call.
   grpc_metadata_array_init(&initial_metadata_recv_);
   grpc_metadata_array_init(&trailing_metadata_recv_);
@@ -109,7 +109,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
       this->Ref(DEBUG_LOCATION, "OnRecvInitialMetadata").release(), nullptr);
   call_error = grpc_call_start_batch_and_execute(
       call_, ops, static_cast<size_t>(op - ops), &on_recv_initial_metadata_);
-  GPR_ASSERT(GRPC_CALL_OK == call_error);
+  CHECK_EQ(call_error, GRPC_CALL_OK);
   // Start a batch for recv_trailing_metadata.
   memset(ops, 0, sizeof(ops));
   op = ops;
@@ -126,7 +126,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
   GRPC_CLOSURE_INIT(&on_status_received_, OnStatusReceived, this, nullptr);
   call_error = grpc_call_start_batch_and_execute(
       call_, ops, static_cast<size_t>(op - ops), &on_status_received_);
-  GPR_ASSERT(GRPC_CALL_OK == call_error);
+  CHECK_EQ(call_error, GRPC_CALL_OK);
   GRPC_CLOSURE_INIT(&on_response_received_, OnResponseReceived, this, nullptr);
 }
 
@@ -136,12 +136,12 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
   grpc_byte_buffer_destroy(send_message_payload_);
   grpc_byte_buffer_destroy(recv_message_payload_);
   CSliceUnref(status_details_);
-  GPR_ASSERT(call_ != nullptr);
+  CHECK_NE(call_, nullptr);
   grpc_call_unref(call_);
 }
 
 void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::Orphan() {
-  GPR_ASSERT(call_ != nullptr);
+  CHECK_NE(call_, nullptr);
   // If we are here because xds_client wants to cancel the call,
   // OnStatusReceived() will complete the cancellation and clean up.
   // Otherwise, we are here because xds_client has to orphan a failed call,
@@ -165,7 +165,7 @@ void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::SendMessage(
   Ref(DEBUG_LOCATION, "OnRequestSent").release();
   grpc_call_error call_error =
       grpc_call_start_batch_and_execute(call_, &op, 1, &on_request_sent_);
-  GPR_ASSERT(GRPC_CALL_OK == call_error);
+  CHECK_EQ(call_error, GRPC_CALL_OK);
 }
 
 void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
@@ -175,10 +175,10 @@ void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
   memset(&op, 0, sizeof(op));
   op.op = GRPC_OP_RECV_MESSAGE;
   op.data.recv_message.recv_message = &recv_message_payload_;
-  GPR_ASSERT(call_ != nullptr);
+  CHECK_NE(call_, nullptr);
   const grpc_call_error call_error =
       grpc_call_start_batch_and_execute(call_, &op, 1, &on_response_received_);
-  GPR_ASSERT(GRPC_CALL_OK == call_error);
+  CHECK_EQ(call_error, GRPC_CALL_OK);
 }
 
 void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
@@ -272,7 +272,7 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport(
   channel_ = CreateXdsChannel(
       factory->args_,
       static_cast<const GrpcXdsBootstrap::GrpcXdsServer&>(server));
-  GPR_ASSERT(channel_ != nullptr);
+  CHECK(channel_ != nullptr);
   if (channel_->IsLame()) {
     *status = absl::UnavailableError("xds client has a lame channel");
   } else {

data/src/core/{ext/xds → xds/grpc}/xds_transport_grpc.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
 
 #include <functional>
 #include <memory>
@@ -28,9 +26,8 @@
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -38,6 +35,8 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/surface/channel.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "src/core/xds/xds_client/xds_transport.h"
 
 namespace grpc_core {
 
@@ -136,4 +135,4 @@ class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall final
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H

data/src/core/{ext/xds → xds/xds_client}/xds_api.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_api.h"
+#include "src/core/xds/xds_client/xds_api.h"
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -46,11 +44,12 @@
 
 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/xds_client/xds_client.h"
 
 // IWYU pragma: no_include "upb/msg_internal.h"
 

data/src/core/{ext/xds → xds/xds_client}/xds_api.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_API_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_API_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
 
 #include <stddef.h>
 
@@ -34,11 +32,13 @@
 #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"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
 
 namespace grpc_core {
 
@@ -186,4 +186,4 @@ class XdsApi final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_API_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H

data/src/core/{ext/xds → xds/xds_client}/xds_bootstrap.cc

@@ -14,12 +14,12 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
 
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/env.h"
 

data/src/core/{ext/xds → xds/xds_client}/xds_bootstrap.h

@@ -14,13 +14,13 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
 
 #include <string>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/json/json.h"
 
 namespace grpc_core {
@@ -85,4 +85,4 @@ class XdsBootstrap {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H

data/src/core/{ext/xds → xds/xds_client}/xds_channel_args.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CHANNEL_ARGS_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CHANNEL_ARGS_H
 
 // Specifies channel args for the xDS client.
 // Used only when GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_BOOTSTRAP_CONFIG
@@ -29,4 +29,4 @@
 #define GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS \
   "grpc.xds_resource_does_not_exist_timeout_ms"
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CHANNEL_ARGS_H