grpc 1.67.0 → 1.68.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc98ea5365812555b7eb2a266321a83be9add70035e4e64ff1fd08433e93e90
-  data.tar.gz: fb300e7533add83675db5a9aaeb41b40c1c5b94784b3008ac8a1c4d4f75c6713
+  metadata.gz: 867f151b7b83a0b02875a01a653d747f86ae991b57cb7d85b7096d82f5c2d174
+  data.tar.gz: 0e7becd56aaa04706ede02f37b9fe214a660c8ce4e3f4127365d75a40029de16
 SHA512:
-  metadata.gz: 31987414ea1ce3cf0b7fa9b3789e82d933a7f5a3a38207b958303a143a47fbd03e282c07906a0c1dd056fb34de2254dd01b102bfc0d737dc92d859e67af8ec64
-  data.tar.gz: ca19196e6b2ba7c5bf92ed42eaba9ffeddae3026f24bf8c09e82e33b2fc99ab283ab7d14791997a17703ad0dd9ed16b22a2bbdc0b2efa82fabd8a69d525cf8ca
+  metadata.gz: aa2330f339dcd8214746633cc7ddba637efe0a75f391aaf8074a3396773d47fe80ab1aea534c0504a83b3b8b6ac51879644a7a9fea9751b4d27a943693c87346
+  data.tar.gz: 910989b6ef3cd27f5888aa59146da916679c4673f2080f9a8d185fe6f5ca5afaa77452efafbb4a709635f1023fed6a8a8403031e91feb4455f81033213705e3e

data/Makefile

@@ -367,8 +367,8 @@ E = @echo
 Q = @
 endif
 
-CORE_VERSION = 44.0.0
-CPP_VERSION = 1.67.0
+CORE_VERSION = 44.1.1
+CPP_VERSION = 1.68.1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -711,6 +711,7 @@ LIBGRPC_SRC = \
     src/core/ext/transport/chttp2/server/chttp2_server.cc \
     src/core/ext/transport/chttp2/transport/bin_decoder.cc \
     src/core/ext/transport/chttp2/transport/bin_encoder.cc \
+    src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \
     src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
     src/core/ext/transport/chttp2/transport/decode_huff.cc \
     src/core/ext/transport/chttp2/transport/flow_control.cc \
@@ -817,6 +818,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
@@ -978,6 +980,7 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
@@ -1057,19 +1060,19 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
     src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
     src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
+    src/core/filter/blackboard.cc \
     src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
     src/core/handshaker/handshaker.cc \
     src/core/handshaker/handshaker_registry.cc \
     src/core/handshaker/http_connect/http_connect_handshaker.cc \
     src/core/handshaker/http_connect/http_proxy_mapper.cc \
+    src/core/handshaker/http_connect/xds_http_proxy_mapper.cc \
     src/core/handshaker/proxy_mapper_registry.cc \
     src/core/handshaker/security/secure_endpoint.cc \
     src/core/handshaker/security/security_handshaker.cc \
     src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \
     src/core/lib/address_utils/parse_address.cc \
     src/core/lib/address_utils/sockaddr_utils.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/backoff/random_early_detection.cc \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_args_preconditioning.cc \
     src/core/lib/channel/channel_stack.cc \
@@ -1085,7 +1088,6 @@ LIBGRPC_SRC = \
     src/core/lib/config/config_vars_non_generated.cc \
     src/core/lib/config/core_configuration.cc \
     src/core/lib/config/load_config.cc \
-    src/core/lib/debug/event_log.cc \
     src/core/lib/debug/trace.cc \
     src/core/lib/debug/trace_flags.cc \
     src/core/lib/event_engine/ares_resolver.cc \
@@ -1137,34 +1139,6 @@ LIBGRPC_SRC = \
     src/core/lib/event_engine/work_queue/basic_work_queue.cc \
     src/core/lib/experiments/config.cc \
     src/core/lib/experiments/experiments.cc \
-    src/core/lib/gprpp/crash.cc \
-    src/core/lib/gprpp/dump_args.cc \
-    src/core/lib/gprpp/examine_stack.cc \
-    src/core/lib/gprpp/fork.cc \
-    src/core/lib/gprpp/glob.cc \
-    src/core/lib/gprpp/host_port.cc \
-    src/core/lib/gprpp/linux/env.cc \
-    src/core/lib/gprpp/load_file.cc \
-    src/core/lib/gprpp/mpscq.cc \
-    src/core/lib/gprpp/per_cpu.cc \
-    src/core/lib/gprpp/posix/directory_reader.cc \
-    src/core/lib/gprpp/posix/env.cc \
-    src/core/lib/gprpp/posix/stat.cc \
-    src/core/lib/gprpp/posix/thd.cc \
-    src/core/lib/gprpp/ref_counted_string.cc \
-    src/core/lib/gprpp/status_helper.cc \
-    src/core/lib/gprpp/strerror.cc \
-    src/core/lib/gprpp/tchar.cc \
-    src/core/lib/gprpp/time.cc \
-    src/core/lib/gprpp/time_averaged_stats.cc \
-    src/core/lib/gprpp/time_util.cc \
-    src/core/lib/gprpp/uuid_v4.cc \
-    src/core/lib/gprpp/validation_errors.cc \
-    src/core/lib/gprpp/windows/directory_reader.cc \
-    src/core/lib/gprpp/windows/env.cc \
-    src/core/lib/gprpp/windows/stat.cc \
-    src/core/lib/gprpp/windows/thd.cc \
-    src/core/lib/gprpp/work_serializer.cc \
     src/core/lib/iomgr/buffer_list.cc \
     src/core/lib/iomgr/call_combiner.cc \
     src/core/lib/iomgr/cfstream_handle.cc \
@@ -1188,11 +1162,6 @@ LIBGRPC_SRC = \
     src/core/lib/iomgr/executor.cc \
     src/core/lib/iomgr/fork_posix.cc \
     src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
-    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
     src/core/lib/iomgr/internal_errqueue.cc \
     src/core/lib/iomgr/iocp_windows.cc \
     src/core/lib/iomgr/iomgr.cc \
@@ -1241,7 +1210,6 @@ LIBGRPC_SRC = \
     src/core/lib/iomgr/wakeup_fd_nospecial.cc \
     src/core/lib/iomgr/wakeup_fd_pipe.cc \
     src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/matchers/matchers.cc \
     src/core/lib/promise/activity.cc \
     src/core/lib/promise/party.cc \
     src/core/lib/promise/sleep.cc \
@@ -1361,7 +1329,6 @@ LIBGRPC_SRC = \
     src/core/lib/transport/timeout_encoding.cc \
     src/core/lib/transport/transport.cc \
     src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/uri/uri_parser.cc \
     src/core/load_balancing/address_filtering.cc \
     src/core/load_balancing/backend_metric_parser.cc \
     src/core/load_balancing/child_policy_handler.cc \
@@ -1391,7 +1358,6 @@ LIBGRPC_SRC = \
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
@@ -1456,7 +1422,21 @@ LIBGRPC_SRC = \
     src/core/tsi/transport_security_grpc.cc \
     src/core/util/alloc.cc \
     src/core/util/atm.cc \
+    src/core/util/backoff.cc \
+    src/core/util/crash.cc \
+    src/core/util/dump_args.cc \
+    src/core/util/event_log.cc \
+    src/core/util/examine_stack.cc \
+    src/core/util/fork.cc \
     src/core/util/gcp_metadata_query.cc \
+    src/core/util/gethostname_fallback.cc \
+    src/core/util/gethostname_host_name_max.cc \
+    src/core/util/gethostname_sysconf.cc \
+    src/core/util/glob.cc \
+    src/core/util/gpr_time.cc \
+    src/core/util/grpc_if_nametoindex_posix.cc \
+    src/core/util/grpc_if_nametoindex_unsupported.cc \
+    src/core/util/host_port.cc \
     src/core/util/http_client/format_request.cc \
     src/core/util/http_client/httpcli.cc \
     src/core/util/http_client/httpcli_security_connector.cc \
@@ -1468,24 +1448,48 @@ LIBGRPC_SRC = \
     src/core/util/json/json_writer.cc \
     src/core/util/latent_see.cc \
     src/core/util/linux/cpu.cc \
+    src/core/util/linux/env.cc \
+    src/core/util/load_file.cc \
     src/core/util/log.cc \
+    src/core/util/matchers.cc \
+    src/core/util/mpscq.cc \
     src/core/util/msys/tmpfile.cc \
+    src/core/util/per_cpu.cc \
     src/core/util/posix/cpu.cc \
+    src/core/util/posix/directory_reader.cc \
+    src/core/util/posix/env.cc \
+    src/core/util/posix/stat.cc \
     src/core/util/posix/string.cc \
     src/core/util/posix/sync.cc \
+    src/core/util/posix/thd.cc \
     src/core/util/posix/time.cc \
     src/core/util/posix/tmpfile.cc \
+    src/core/util/random_early_detection.cc \
+    src/core/util/ref_counted_string.cc \
+    src/core/util/status_helper.cc \
+    src/core/util/strerror.cc \
     src/core/util/string.cc \
     src/core/util/sync.cc \
     src/core/util/sync_abseil.cc \
+    src/core/util/tchar.cc \
     src/core/util/time.cc \
+    src/core/util/time_averaged_stats.cc \
     src/core/util/time_precise.cc \
+    src/core/util/time_util.cc \
+    src/core/util/uri.cc \
+    src/core/util/uuid_v4.cc \
+    src/core/util/validation_errors.cc \
     src/core/util/windows/cpu.cc \
+    src/core/util/windows/directory_reader.cc \
+    src/core/util/windows/env.cc \
+    src/core/util/windows/stat.cc \
     src/core/util/windows/string.cc \
     src/core/util/windows/string_util.cc \
     src/core/util/windows/sync.cc \
+    src/core/util/windows/thd.cc \
     src/core/util/windows/time.cc \
     src/core/util/windows/tmpfile.cc \
+    src/core/util/work_serializer.cc \
     src/core/xds/grpc/certificate_provider_store.cc \
     src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
     src/core/xds/grpc/xds_audit_logger_registry.cc \
@@ -1515,10 +1519,11 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/xds_routing.cc \
     src/core/xds/grpc/xds_server_grpc.cc \
     src/core/xds/grpc/xds_transport_grpc.cc \
+    src/core/xds/xds_client/lrs_client.cc \
     src/core/xds/xds_client/xds_api.cc \
+    src/core/xds/xds_client/xds_backend_metric_propagation.cc \
     src/core/xds/xds_client/xds_bootstrap.cc \
     src/core/xds/xds_client/xds_client.cc \
-    src/core/xds/xds_client/xds_client_stats.cc \
     third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
     third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \
     third_party/abseil-cpp/absl/base/internal/raw_logging.cc \
@@ -1542,9 +1547,12 @@ LIBGRPC_SRC = \
     third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \
     third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \
+    third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc \
     third_party/abseil-cpp/absl/debugging/internal/demangle.cc \
+    third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc \
     third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \
     third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \
+    third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc \
     third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \
     third_party/abseil-cpp/absl/debugging/stacktrace.cc \
     third_party/abseil-cpp/absl/debugging/symbolize.cc \
@@ -1700,6 +1708,7 @@ LIBGRPC_SRC = \
     third_party/upb/upb/message/internal/message.c \
     third_party/upb/upb/message/map.c \
     third_party/upb/upb/message/map_sorter.c \
+    third_party/upb/upb/message/merge.c \
     third_party/upb/upb/message/message.c \
     third_party/upb/upb/mini_descriptor/build_enum.c \
     third_party/upb/upb/mini_descriptor/decode.c \
@@ -1727,6 +1736,7 @@ LIBGRPC_SRC = \
     third_party/upb/upb/reflection/oneof_def.c \
     third_party/upb/upb/reflection/service_def.c \
     third_party/upb/upb/text/encode.c \
+    third_party/upb/upb/text/internal/encode.c \
     third_party/upb/upb/wire/decode.c \
     third_party/upb/upb/wire/encode.c \
     third_party/upb/upb/wire/eps_copy_input_stream.c \

data/include/grpc/compression.h

@@ -19,11 +19,10 @@
 #ifndef GRPC_COMPRESSION_H
 #define GRPC_COMPRESSION_H
 
-#include <stdlib.h>
-
 #include <grpc/impl/compression_types.h>  // IWYU pragma: export
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/credentials.h

@@ -19,11 +19,10 @@
 #ifndef GRPC_CREDENTIALS_H
 #define GRPC_CREDENTIALS_H
 
-#include <stdbool.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/event_engine/endpoint_config.h

@@ -14,13 +14,13 @@
 #ifndef GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H
 #define GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

data/include/grpc/event_engine/event_engine.h

@@ -14,12 +14,6 @@
 #ifndef GRPC_EVENT_ENGINE_EVENT_ENGINE_H
 #define GRPC_EVENT_ENGINE_EVENT_ENGINE_H
 
-#include <vector>
-
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/extensible.h>
 #include <grpc/event_engine/memory_allocator.h>
@@ -27,6 +21,12 @@
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+
 // TODO(vigneshbabu): Define the Endpoint::Write metrics collection system
 namespace grpc_event_engine {
 namespace experimental {

data/include/grpc/event_engine/extensible.h

@@ -15,10 +15,10 @@
 #ifndef GRPC_EVENT_ENGINE_EXTENSIBLE_H
 #define GRPC_EVENT_ENGINE_EXTENSIBLE_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 

data/include/grpc/event_engine/internal/memory_allocator_impl.h

@@ -14,15 +14,15 @@
 #ifndef GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H
 #define GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H
 
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <type_traits>
 #include <vector>
 
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

data/include/grpc/event_engine/memory_allocator.h

@@ -14,6 +14,9 @@
 #ifndef GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H
 #define GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H
 
+#include <grpc/event_engine/internal/memory_allocator_impl.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>  // for abort()
 
 #include <algorithm>
@@ -21,10 +24,6 @@
 #include <type_traits>
 #include <vector>
 
-#include <grpc/event_engine/internal/memory_allocator_impl.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

data/include/grpc/event_engine/memory_request.h

@@ -14,12 +14,11 @@
 #ifndef GRPC_EVENT_ENGINE_MEMORY_REQUEST_H
 #define GRPC_EVENT_ENGINE_MEMORY_REQUEST_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

data/include/grpc/event_engine/slice.h

@@ -15,6 +15,9 @@
 #ifndef GRPC_EVENT_ENGINE_SLICE_H
 #define GRPC_EVENT_ENGINE_SLICE_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,10 +26,6 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 // This public slice definition largely based of the internal grpc_core::Slice
 // implementation. Changes to this implementation might warrant changes to the
 // internal grpc_core::Slice type as well.

data/include/grpc/event_engine/slice_buffer.h

@@ -15,6 +15,12 @@
 #ifndef GRPC_EVENT_ENGINE_SLICE_BUFFER_H
 #define GRPC_EVENT_ENGINE_SLICE_BUFFER_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,13 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/utility/utility.h"
 
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 

data/include/grpc/grpc.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_GRPC_H
 #define GRPC_GRPC_H
 
-#include <stddef.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/connectivity_state.h>  // IWYU pragma: export
 #include <grpc/impl/grpc_types.h>          // IWYU pragma: export
@@ -29,6 +27,7 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/grpc_audit_logging.h

@@ -19,15 +19,15 @@
 #ifndef GRPC_GRPC_AUDIT_LOGGING_H
 #define GRPC_GRPC_AUDIT_LOGGING_H
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 

data/include/grpc/grpc_crl_provider.h

@@ -19,16 +19,16 @@
 #ifndef GRPC_GRPC_CRL_PROVIDER_H
 #define GRPC_GRPC_CRL_PROVIDER_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 

data/include/grpc/grpc_posix.h

@@ -19,11 +19,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 
-#include <stddef.h>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/grpc_security.h

@@ -19,12 +19,11 @@
 #ifndef GRPC_GRPC_SECURITY_H
 #define GRPC_GRPC_SECURITY_H
 
-#include <stdbool.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/impl/call.h

@@ -15,11 +15,11 @@
 #ifndef GRPC_IMPL_CALL_H
 #define GRPC_IMPL_CALL_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
+
 // Run a callback in the call's EventEngine.
 // Internal-only
 void grpc_call_run_in_event_engine(const grpc_call* call,

data/include/grpc/impl/grpc_types.h

@@ -21,14 +21,13 @@
 
 // IWYU pragma: private, include <grpc/grpc.h>
 
-#include <stddef.h>
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/impl/slice_type.h

@@ -21,9 +21,8 @@
 
 // IWYU pragma: private, include <grpc/slice.h>
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 typedef struct grpc_slice grpc_slice;
 

data/include/grpc/passive_listener.h

@@ -14,10 +14,10 @@
 #ifndef GRPC_PASSIVE_LISTENER_H
 #define GRPC_PASSIVE_LISTENER_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
+
+#include <memory>
 // #include <grpc/support/port_platform.h>
 
 namespace grpc_core {

data/include/grpc/support/alloc.h

@@ -19,9 +19,8 @@
 #ifndef GRPC_SUPPORT_ALLOC_H
 #define GRPC_SUPPORT_ALLOC_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

data/include/grpc/support/json.h

@@ -17,6 +17,7 @@
 #ifndef GRPC_SUPPORT_JSON_H
 #define GRPC_SUPPORT_JSON_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -27,8 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 

data/include/grpc/support/log.h

@@ -19,11 +19,10 @@
 #ifndef GRPC_SUPPORT_LOG_H
 #define GRPC_SUPPORT_LOG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdarg.h>
 #include <stdlib.h> /* for abort() */
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

data/include/grpc/support/metrics.h

@@ -15,16 +15,20 @@
 #ifndef GRPC_SUPPORT_METRICS_H
 #define GRPC_SUPPORT_METRICS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 namespace experimental {
 
 // Configuration (scope) for a specific client channel to be used for stats
-// plugins.
+// plugins. For some components like XdsClient where the same XdsClient instance
+// can be shared across multiple channels that share the same target name but
+// have different default authority and channel arguments, the component uses
+// the configuration from the first channel that uses this XdsClient instance to
+// determine StatsPluginChannelScope.
 class StatsPluginChannelScope {
  public:
   StatsPluginChannelScope(