Update src/.clang-format

8 months ago · f1f21c7ba2
parent 3eb3e63eb3
commit f1f21c7ba2
59 changed files with 72 additions and 115 deletions
--- a/src/.clang-format
+++ b/src/.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
--- a/src/cpp/client/call_credentials.cc
+++ b/src/cpp/client/call_credentials.cc
@ -11,10 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/str_cat.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/security/credentials.h>

 #include "src/core/lib/security/credentials/credentials.h"
--- a/src/cpp/client/channel_credentials.cc
+++ b/src/cpp/client/channel_credentials.cc
@ -11,14 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>
 #include <vector>

 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>

--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@ -15,8 +15,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <atomic>
 #include <functional>
 #include <memory>
@ -27,6 +25,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 #include <grpcpp/alarm.h>
--- a/src/cpp/ext/csm/csm_observability.cc
+++ b/src/cpp/ext/csm/csm_observability.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/csm/csm_observability.h"

 #include <memory>
@ -33,6 +31,7 @@
 #include "opentelemetry/sdk/resource/resource_detector.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/csm_observability.h>

 #include "src/core/ext/xds/xds_enabled_server.h"
--- a/src/cpp/ext/csm/csm_observability.h
+++ b/src/cpp/ext/csm/csm_observability.h
@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H
 #define GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"

 namespace grpc {
--- a/src/cpp/ext/csm/metadata_exchange.cc
+++ b/src/cpp/ext/csm/metadata_exchange.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/csm/metadata_exchange.h"

 #include <stddef.h>
@ -38,6 +36,7 @@
 #include "upb/base/string_view.h"

 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/gprpp/env.h"
--- a/src/cpp/ext/csm/metadata_exchange.h
+++ b/src/cpp/ext/csm/metadata_exchange.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H
 #define GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H

-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>
 #include <utility>
@ -31,6 +29,8 @@
 #include "opentelemetry/sdk/common/attribute_utils.h"
 #include "upb/mem/arena.hpp"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
--- a/src/cpp/ext/filters/census/client_filter.cc
+++ b/src/cpp/ext/filters/census/client_filter.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/filters/census/client_filter.h"

 #include <stddef.h>
@ -46,6 +44,7 @@

 #include <grpc/slice.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/opencensus.h>
--- a/src/cpp/ext/filters/census/client_filter.h
+++ b/src/cpp/ext/filters/census/client_filter.h
@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/interceptor.h>

--- a/src/cpp/ext/filters/census/context.cc
+++ b/src/cpp/ext/filters/census/context.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/filters/census/context.h"

 #include <new>
@ -27,6 +25,8 @@
 #include "opencensus/trace/context_util.h"
 #include "opencensus/trace/propagation/grpc_trace_bin.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/transport/transport.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/rpc_encoding.h"
--- a/src/cpp/ext/filters/census/context.h
+++ b/src/cpp/ext/filters/census/context.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>

@ -32,6 +30,7 @@
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>

 #include "src/core/lib/channel/channel_stack.h"
--- a/src/cpp/ext/filters/census/grpc_plugin.cc
+++ b/src/cpp/ext/filters/census/grpc_plugin.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/filters/census/grpc_plugin.h"

 #include <atomic>
@ -27,6 +25,7 @@
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/trace/span.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>
 #include <grpcpp/server_context.h>

--- a/src/cpp/ext/filters/census/grpc_plugin.h
+++ b/src/cpp/ext/filters/census/grpc_plugin.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H

-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <map>
 #include <string>
@ -32,6 +30,7 @@
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/tags/tag_map.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>

 namespace grpc {
--- a/src/cpp/ext/filters/census/measures.cc
+++ b/src/cpp/ext/filters/census/measures.cc
@ -16,12 +16,11 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/filters/census/measures.h"

 #include "opencensus/stats/stats.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>

 #include "src/cpp/ext/filters/census/grpc_plugin.h"
--- a/src/cpp/ext/filters/census/measures.h
+++ b/src/cpp/ext/filters/census/measures.h
@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H

-#include <grpc/support/port_platform.h>
-
 #include "opencensus/stats/stats.h"

+#include <grpc/support/port_platform.h>
+
 namespace grpc {

 ::opencensus::stats::MeasureInt64 RpcClientSentMessagesPerRpc();
--- a/src/cpp/ext/filters/census/open_census_call_tracer.h
+++ b/src/cpp/ext/filters/census/open_census_call_tracer.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <memory>
@ -35,6 +33,7 @@
 #include "opencensus/trace/span_id.h"
 #include "opencensus/trace/trace_id.h"

+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/opencensus.h>

--- a/src/cpp/ext/filters/census/rpc_encoding.cc
+++ b/src/cpp/ext/filters/census/rpc_encoding.cc
@ -16,10 +16,10 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/filters/census/rpc_encoding.h"

+#include <grpc/support/port_platform.h>
+
 namespace grpc {
 namespace internal {

--- a/src/cpp/ext/filters/census/rpc_encoding.h
+++ b/src/cpp/ext/filters/census/rpc_encoding.h
@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <string.h>

 #include "absl/base/internal/endian.h"
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 namespace grpc {
 namespace internal {

--- a/src/cpp/ext/filters/census/server_call_tracer.cc
+++ b/src/cpp/ext/filters/census/server_call_tracer.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/filters/census/server_call_tracer.h"

 #include <stdint.h>
@ -42,6 +40,7 @@
 #include "opencensus/trace/span_id.h"
 #include "opencensus/trace/trace_id.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>

 #include "src/core/lib/channel/call_tracer.h"
--- a/src/cpp/ext/filters/census/views.cc
+++ b/src/cpp/ext/filters/census/views.cc
@ -16,13 +16,12 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <vector>

 #include "absl/time/time.h"
 #include "opencensus/stats/stats.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>

 #include "src/cpp/ext/filters/census/grpc_plugin.h"
--- a/src/cpp/ext/gcp/environment_autodetect.cc
+++ b/src/cpp/ext/gcp/environment_autodetect.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/gcp/environment_autodetect.h"

 #include <memory>
@ -30,6 +28,7 @@

 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 #include <grpcpp/impl/grpc_library.h>

--- a/src/cpp/ext/gcp/environment_autodetect.h
+++ b/src/cpp/ext/gcp/environment_autodetect.h
@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H
 #define GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H

-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <string>
@ -29,6 +27,7 @@
 #include "absl/status/status.h"

 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/gprpp/sync.h"

--- a/src/cpp/ext/gcp/observability.cc
+++ b/src/cpp/ext/gcp/observability.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <algorithm>
@ -41,6 +39,7 @@
 #include "opencensus/trace/trace_config.h"

 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/ext/gcp_observability.h>
 #include <grpcpp/opencensus.h>
--- a/src/cpp/ext/gcp/observability_config.cc
+++ b/src/cpp/ext/gcp/observability_config.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/gcp/observability_config.h"

 #include <stddef.h>
@ -32,6 +30,7 @@

 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/load_file.h"
--- a/src/cpp/ext/gcp/observability_config.h
+++ b/src/cpp/ext/gcp/observability_config.h
@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H
 #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <map>
@ -29,6 +27,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_args.h"
--- a/src/cpp/ext/gcp/observability_logging_sink.cc
+++ b/src/cpp/ext/gcp/observability_logging_sink.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/gcp/observability_logging_sink.h"

 #include <algorithm>
@ -37,6 +35,7 @@

 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/security/credentials.h>
--- a/src/cpp/ext/gcp/observability_logging_sink.h
+++ b/src/cpp/ext/gcp/observability_logging_sink.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H
 #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <map>
@ -34,6 +32,7 @@
 #include "google/logging/v2/logging.grpc.pb.h"

 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/lib/gprpp/sync.h"
--- a/src/cpp/ext/otel/key_value_iterable.h
+++ b/src/cpp/ext/otel/key_value_iterable.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H
 #define GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>

 #include <utility>
@ -33,6 +31,8 @@
 #include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/cpp/ext/otel/otel_plugin.h"

 namespace grpc {
--- a/src/cpp/ext/otel/otel_client_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_client_call_tracer.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/otel/otel_client_call_tracer.h"

 #include <stdint.h>
@ -42,6 +40,7 @@

 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>

 #include "src/core/client_channel/client_channel_filter.h"
--- a/src/cpp/ext/otel/otel_client_call_tracer.h
+++ b/src/cpp/ext/otel/otel_client_call_tracer.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <memory>
@ -31,6 +29,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"

+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>

 #include "src/core/lib/channel/call_tracer.h"
--- a/src/cpp/ext/otel/otel_plugin.cc
+++ b/src/cpp/ext/otel/otel_plugin.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/otel/otel_plugin.h"

 #include <memory>
@ -32,6 +30,7 @@
 #include "opentelemetry/nostd/variant.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/otel_plugin.h>
 #include <grpcpp/version_info.h>

--- a/src/cpp/ext/otel/otel_plugin.h
+++ b/src/cpp/ext/otel/otel_plugin.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>

@ -40,6 +38,7 @@
 #include "opentelemetry/metrics/sync_instruments.h"
 #include "opentelemetry/nostd/shared_ptr.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/otel_plugin.h>

 #include "src/core/lib/channel/channel_args.h"
--- a/src/cpp/ext/otel/otel_server_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_server_call_tracer.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/otel/otel_server_call_tracer.h"

 #include <array>
@ -35,6 +33,8 @@
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/sync_instruments.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/channel/tcp_tracer.h"
--- a/src/cpp/ext/otel/otel_server_call_tracer.h
+++ b/src/cpp/ext/otel/otel_server_call_tracer.h
@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/strip.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
--- a/src/cpp/server/admin/admin_services.cc
+++ b/src/cpp/server/admin/admin_services.cc
@ -17,7 +17,6 @@
 //

 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/ext/admin_services.h>
 #include <grpcpp/server_builder.h>

--- a/src/cpp/server/channelz/channelz_service.cc
+++ b/src/cpp/server/channelz/channelz_service.cc
@ -16,13 +16,12 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/channelz/channelz_service.h"

 #include <memory>

 #include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>

 // IWYU pragma: no_include "google/protobuf/json/json.h"
--- a/src/cpp/server/channelz/channelz_service.h
+++ b/src/cpp/server/channelz/channelz_service.h
@ -20,7 +20,6 @@
 #define GRPC_SRC_CPP_SERVER_CHANNELZ_CHANNELZ_SERVICE_H

 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/status.h>

--- a/src/cpp/server/channelz/channelz_service_plugin.cc
+++ b/src/cpp/server/channelz/channelz_service_plugin.cc
@ -16,11 +16,10 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>

+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/channelz_service_plugin.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
--- a/src/cpp/server/csds/csds.cc
+++ b/src/cpp/server/csds/csds.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/csds/csds.h"

 #include <string>
@ -27,6 +25,7 @@
 #include "absl/status/statusor.h"

 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/slice.h>

--- a/src/cpp/server/csds/csds.h
+++ b/src/cpp/server/csds/csds.h
@ -20,7 +20,6 @@
 #define GRPC_SRC_CPP_SERVER_CSDS_CSDS_H

 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/sync_stream.h>
--- a/src/cpp/server/load_reporter/constants.h
+++ b/src/cpp/server/load_reporter/constants.h
@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>

+#include <grpc/support/port_platform.h>
+
 namespace grpc {
 namespace load_reporter {

--- a/src/cpp/server/load_reporter/get_cpu_stats.h
+++ b/src/cpp/server/load_reporter/get_cpu_stats.h
@ -19,12 +19,12 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <utility>

+#include <grpc/support/port_platform.h>
+
 namespace grpc {
 namespace load_reporter {

--- a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
+++ b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
@ -16,10 +16,10 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <utility>

+#include <grpc/support/port_platform.h>
+
 #ifdef GPR_LINUX

 #include <inttypes.h>
--- a/src/cpp/server/load_reporter/load_data_store.cc
+++ b/src/cpp/server/load_reporter/load_data_store.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/load_reporter/load_data_store.h"

 #include <stdint.h>
@ -29,6 +27,7 @@
 #include <unordered_map>

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/iomgr/socket_utils.h"
 #include "src/cpp/server/load_reporter/constants.h"
--- a/src/cpp/server/load_reporter/load_data_store.h
+++ b/src/cpp/server/load_reporter/load_data_store.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>

@ -30,6 +28,7 @@
 #include <unordered_map>
 #include <utility>

+#include <grpc/support/port_platform.h>
 #include <grpcpp/support/config.h>

 namespace grpc {
--- a/src/cpp/server/load_reporter/load_reporter.cc
+++ b/src/cpp/server/load_reporter/load_reporter.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/load_reporter/load_reporter.h"

 #include <inttypes.h>
@ -32,6 +30,7 @@
 #include "opencensus/tags/tag_key.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/cpp/server/load_reporter/constants.h"
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
--- a/src/cpp/server/load_reporter/load_reporter.h
+++ b/src/cpp/server/load_reporter/load_reporter.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>

 #include <atomic>
@ -38,6 +36,8 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/sync.h"
 #include "src/cpp/server/load_reporter/load_data_store.h"
 #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
@ -16,14 +16,13 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h"

 #include <inttypes.h>

 #include <google/protobuf/repeated_ptr_field.h>

+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/support/status.h>

--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <atomic>
@ -30,6 +28,7 @@
 #include <utility>

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/alarm.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/async_stream.h>
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
@ -16,13 +16,12 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <memory>
 #include <vector>

 #include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
@ -16,12 +16,11 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"

 #include <utility>

+#include <grpc/support/port_platform.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>

--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H

-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>

+#include <grpc/support/port_platform.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/server_builder.h>
--- a/src/cpp/server/load_reporter/util.cc
+++ b/src/cpp/server/load_reporter/util.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <string.h>

 #include <cmath>
@ -25,6 +23,7 @@

 #include <grpc/load_reporting.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/server_context.h>

--- a/src/cpp/server/server_credentials.cc
+++ b/src/cpp/server/server_credentials.cc
@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/security/server_credentials.h>

 #include "src/core/lib/gprpp/crash.h"
--- a/src/python/grpcio_observability/grpc_observability/rpc_encoding.cc
+++ b/src/python/grpcio_observability/grpc_observability/rpc_encoding.cc
@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/support/port_platform.h>
-
 #include "rpc_encoding.h"

+#include <grpc/support/port_platform.h>
+
 // TODO(xuanwn): Reuse c++ rpc_encoding file.
 namespace grpc_observability {

--- a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
+++ b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
@ -15,14 +15,14 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H
 #define GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <string.h>

 #include "absl/base/internal/endian.h"
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 namespace grpc_observability {

 // TODO(xuanwn): Reuse c++ rpc_encoding file.
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/support/port_platform.h>
-
 #include "server_call_tracer.h"

 #include <stdint.h>
@ -35,6 +33,8 @@
 #include "observability_util.h"
 #include "python_census_context.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/iomgr/error.h"
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
@ -15,11 +15,11 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H
 #define GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"