Update src/core/ext/.clang-format

src/core/ext/.clang-format

@@ -5,9 +5,6 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 IncludeBlocks: Regroup
 IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
   # ruby.h is even more first if it's included
   - Regex: '^<ruby/ruby.h>'
     Priority: -200

src/core/ext/gcp/metadata_query.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/gcp/metadata_query.h"
 
 #include <string.h>
@@ -33,6 +31,7 @@
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/core/ext/gcp/metadata_query.h

@@ -17,13 +17,13 @@
 #ifndef GRPC_SRC_CORE_EXT_GCP_METADATA_QUERY_H
 #define GRPC_SRC_CORE_EXT_GCP_METADATA_QUERY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/http/httpcli.h"

src/core/ext/xds/certificate_provider_store.cc

@@ -16,14 +16,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/certificate_provider_store.h"
 
 #include "absl/strings/str_cat.h"
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"

src/core/ext/xds/certificate_provider_store.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
 #define GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <string>
 #include <utility>
@@ -29,6 +27,7 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/orphanable.h"

src/core/ext/xds/file_watcher_certificate_provider_factory.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h"
 
 #include <algorithm>
@@ -29,6 +27,7 @@
 #include "absl/strings/str_join.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/config/core_configuration.h"

src/core/ext/xds/file_watcher_certificate_provider_factory.h

@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 #define GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"

src/core/ext/xds/upb_utils.h

@@ -17,13 +17,13 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
 #define GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "upb/base/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // Works for both std::string and absl::string_view.

src/core/ext/xds/xds_api.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_api.h"
 
 #include <stdint.h>
@@ -46,6 +44,7 @@
 
 #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"

src/core/ext/xds/xds_api.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_API_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_API_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <map>
@@ -34,6 +32,8 @@
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.hpp"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/debug/trace.h"

src/core/ext/xds/xds_audit_logger_registry.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_audit_logger_registry.h"
 
 #include <string>
@@ -28,6 +26,8 @@
 #include "envoy/config/core/v3/extension.upb.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/lib/gprpp/match.h"
 #include "src/core/lib/gprpp/validation_errors.h"

src/core/ext/xds/xds_audit_logger_registry.h

@@ -17,14 +17,14 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_AUDIT_LOGGER_REGISTRY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"

src/core/ext/xds/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 "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/env.h"
 

src/core/ext/xds/xds_bootstrap.h

@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/json/json.h"
 
 namespace grpc_core {

src/core/ext/xds/xds_bootstrap_grpc.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
 
 #include <stdlib.h>
@@ -36,6 +34,7 @@
 #include "absl/types/optional.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/string.h"

src/core/ext/xds/xds_bootstrap_grpc.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_BOOTSTRAP_GRPC_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <set>
@@ -29,6 +27,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/certificate_provider_store.h"
 #include "src/core/ext/xds/xds_audit_logger_registry.h"
 #include "src/core/ext/xds/xds_bootstrap.h"

src/core/ext/xds/xds_certificate_provider.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_certificate_provider.h"
 
 #include <utility>
@@ -26,6 +24,7 @@
 #include "absl/types/optional.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"

src/core/ext/xds/xds_certificate_provider.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CERTIFICATE_PROVIDER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <string>
@@ -31,6 +29,7 @@
 
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/core/ext/xds/xds_channel_stack_modifier.cc

@@ -16,14 +16,14 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_channel_stack_modifier.h"
 
 #include <algorithm>
 #include <initializer_list>
 #include <string>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"

src/core/ext/xds/xds_channel_stack_modifier.h

@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CHANNEL_STACK_MODIFIER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <utility>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"

src/core/ext/xds/xds_client.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_client.h"
 
 #include <inttypes.h>
@@ -45,6 +43,7 @@
 
 #include <grpc/event_engine/event_engine.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_api.h"

src/core/ext/xds/xds_client.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <set>
@@ -33,6 +31,7 @@
 #include "upb/reflection/def.hpp"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/xds_api.h"
 #include "src/core/ext/xds/xds_bootstrap.h"

src/core/ext/xds/xds_client_grpc.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_client_grpc.h"
 
 #include <algorithm>
@@ -38,6 +36,7 @@
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/ext/xds/upb_utils.h"

src/core/ext/xds/xds_client_grpc.h

@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/certificate_provider_store.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"

src/core/ext/xds/xds_client_stats.cc

@@ -16,11 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_client_stats.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/debug/trace.h"

src/core/ext/xds/xds_client_stats.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <atomic>
 #include <cstdint>
 #include <map>
@@ -31,6 +29,8 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/gpr/useful.h"

src/core/ext/xds/xds_cluster.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_cluster.h"
 
 #include <stddef.h>
@@ -55,6 +53,7 @@
 
 #include <grpc/support/json.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_client.h"

src/core/ext/xds/xds_cluster.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <set>
@@ -35,6 +33,7 @@
 #include "upb/reflection/def.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"

src/core/ext/xds/xds_cluster_specifier_plugin.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_cluster_specifier_plugin.h"
 
 #include <stddef.h>
@@ -32,6 +30,7 @@
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_reader.h"

src/core/ext/xds/xds_cluster_specifier_plugin.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <utility>
@@ -27,6 +25,8 @@
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"

src/core/ext/xds/xds_common_types.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_common_types.h"
 
 #include <stddef.h>
@@ -44,6 +42,7 @@
 #include "xds/type/v3/typed_struct.upb.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/upb_utils.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"

src/core/ext/xds/xds_common_types.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
 
-#include <grpc/support/port_platform.h>
-
 #include <string>
 #include <vector>
 
@@ -29,6 +27,8 @@
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"

src/core/ext/xds/xds_endpoint.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_endpoint.h"
 
 #include <stdlib.h>
@@ -42,6 +40,7 @@
 #include "upb/text/encode.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_health_status.h"

src/core/ext/xds/xds_endpoint.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <algorithm>
@@ -33,6 +31,8 @@
 #include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/ext/xds/xds_resource_type.h"

src/core/ext/xds/xds_health_status.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_health_status.h"
 
 #include <string>
@@ -24,6 +22,8 @@
 #include "absl/strings/str_join.h"
 #include "envoy/config/core/v3/health_check.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 absl::optional<XdsHealthStatus> XdsHealthStatus::FromUpb(uint32_t status) {

src/core/ext/xds/xds_health_status.h

@@ -17,14 +17,14 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/resolver/endpoint_addresses.h"
 
 // Channel arg key for xDS health status.

src/core/ext/xds/xds_http_fault_filter.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_http_fault_filter.h"
 
 #include <stdint.h>
@@ -35,6 +33,7 @@
 
 #include <grpc/status.h>
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"

src/core/ext/xds/xds_http_fault_filter.h

@@ -17,13 +17,13 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.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"

src/core/ext/xds/xds_http_filters.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_http_filters.h"
 
 #include <map>
@@ -27,6 +25,7 @@
 #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/xds_http_fault_filter.h"
 #include "src/core/ext/xds/xds_http_rbac_filter.h"

src/core/ext/xds/xds_http_filters.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <string>
@@ -32,6 +30,8 @@
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/channel/channel_args.h"

src/core/ext/xds/xds_http_rbac_filter.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_http_rbac_filter.h"
 
 #include <stddef.h>
@@ -43,6 +41,7 @@
 #include "upb/message/map.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/rbac/rbac_filter.h"
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"

src/core/ext/xds/xds_http_rbac_filter.h

@@ -17,13 +17,13 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.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"

src/core/ext/xds/xds_http_stateful_session_filter.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_http_stateful_session_filter.h"
 
 #include <string>
@@ -32,6 +30,7 @@
 #include "envoy/type/http/v3/cookie.upb.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"

src/core/ext/xds/xds_http_stateful_session_filter.h

@@ -17,13 +17,13 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.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"

src/core/ext/xds/xds_lb_policy_registry.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_lb_policy_registry.h"
 
 #include <stddef.h>
@@ -35,6 +33,7 @@
 #include "google/protobuf/wrappers.upb.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/lib/config/core_configuration.h"

src/core/ext/xds/xds_lb_policy_registry.h

@@ -17,14 +17,14 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/cluster/v3/cluster.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"

src/core/ext/xds/xds_listener.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_listener.h"
 
 #include <stdint.h>
@@ -46,6 +44,7 @@
 #include "upb/text/encode.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_common_types.h"

src/core/ext/xds/xds_listener.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <string.h>
 
@@ -36,6 +34,8 @@
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.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"

src/core/ext/xds/xds_metrics.h

@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // An interface for XdsClient to report metrics.

src/core/ext/xds/xds_resource_type.h

@@ -16,8 +16,6 @@
 
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>
 
@@ -27,6 +25,8 @@
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/lib/debug/trace.h"
 

src/core/ext/xds/xds_resource_type_impl.h

@@ -16,13 +16,13 @@
 
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/core/ext/xds/xds_route_config.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_route_config.h"
 
 #include <stddef.h>
@@ -57,6 +55,7 @@
 
 #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"

src/core/ext/xds/xds_route_config.h

@@ -17,8 +17,6 @@
 #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>
-
 #include <stdint.h>
 
 #include <algorithm>
@@ -35,6 +33,8 @@
 #include "re2/re2.h"
 #include "upb/reflection/def.h"
 
+#include <grpc/support/port_platform.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"

src/core/ext/xds/xds_routing.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_routing.h"
 
 #include <stdint.h>
@@ -33,6 +31,7 @@
 #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"

src/core/ext/xds/xds_routing.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <map>
@@ -31,6 +29,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.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"

src/core/ext/xds/xds_server_config_fetcher.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <string.h>
 
 #include <algorithm>
@@ -45,6 +43,7 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/server_config_selector/server_config_selector.h"
 #include "src/core/ext/filters/server_config_selector/server_config_selector_filter.h"

src/core/ext/xds/xds_transport.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
 
-#include <grpc/support/port_platform.h>
-
 #include <functional>
 #include <memory>
 #include <string>
@@ -26,6 +24,8 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/lib/gprpp/orphanable.h"
 

src/core/ext/xds/xds_transport_grpc.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/xds/xds_transport_grpc.h"
 
 #include <string.h>
@@ -36,6 +34,7 @@
 #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"

src/core/ext/xds/xds_transport_grpc.h

@@ -17,8 +17,6 @@
 #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>
-
 #include <functional>
 #include <memory>
 #include <string>
@@ -28,6 +26,7 @@
 #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"