Merge branch 'master' of https://github.com/grpc/grpc into remove_exp

.github/labeler.yml

@@ -51,6 +51,7 @@ lang/python:
       - all-globs-to-any-file:
           - src/python/**
           - '!src/python/grpcio/grpc_core_dependencies.py'
+          - '!src/python/grpcio_observability/observability_lib_deps.py'
 lang/ruby:
   - changed-files:
       - any-glob-to-any-file:

BUILD

@@ -287,6 +287,7 @@ GRPC_PUBLIC_HDRS = [
 GRPC_PUBLIC_EVENT_ENGINE_HDRS = [
     "include/grpc/event_engine/endpoint_config.h",
     "include/grpc/event_engine/event_engine.h",
+    "include/grpc/event_engine/extensible.h",
     "include/grpc/event_engine/port.h",
     "include/grpc/event_engine/memory_allocator.h",
     "include/grpc/event_engine/memory_request.h",
@@ -1530,8 +1531,10 @@ grpc_cc_library(
         "//src/core:arena_promise",
         "//src/core:atomic_utils",
         "//src/core:bitset",
+        "//src/core:call_factory",
         "//src/core:call_filters",
         "//src/core:call_final_info",
+        "//src/core:call_spine",
         "//src/core:cancel_callback",
         "//src/core:channel_args",
         "//src/core:channel_args_endpoint_config",
@@ -1550,7 +1553,9 @@ grpc_cc_library(
         "//src/core:error",
         "//src/core:error_utils",
         "//src/core:event_engine_common",
+        "//src/core:event_engine_extensions",
         "//src/core:event_engine_memory_allocator_factory",
+        "//src/core:event_engine_query_extensions",
         "//src/core:event_engine_shim",
         "//src/core:event_engine_tcp_socket_utils",
         "//src/core:event_engine_trace",
@@ -1580,7 +1585,7 @@ grpc_cc_library(
         "//src/core:poll",
         "//src/core:pollset_set",
         "//src/core:posix_event_engine_base_hdrs",
-        "//src/core:prioritized_race",
+        "//src/core:posix_event_engine_endpoint",
         "//src/core:promise_status",
         "//src/core:race",
         "//src/core:random_early_detection",

CMakeLists.txt

@@ -107,6 +107,7 @@ set(gRPC_ABSL_USED_TARGETS
   absl_base_internal
   absl_bind_front
   absl_bits
+  absl_charset
   absl_city
   absl_civil_time
   absl_cleanup
@@ -151,6 +152,7 @@ set(gRPC_ABSL_USED_TARGETS
   absl_flat_hash_set
   absl_function_ref
   absl_graphcycles_internal
+  absl_has_ostream_operator
   absl_hash
   absl_hash_function_defaults
   absl_hash_policy_traits
@@ -165,8 +167,10 @@ set(gRPC_ABSL_USED_TARGETS
   absl_low_level_hash
   absl_malloc_internal
   absl_memory
+  absl_no_destructor
   absl_non_temporal_arm_intrinsics
   absl_non_temporal_memcpy
+  absl_nullability
   absl_numeric_representation
   absl_optional
   absl_prefetch
@@ -2522,8 +2526,11 @@ add_library(grpc
   src/core/lib/surface/version.cc
   src/core/lib/transport/batch_builder.cc
   src/core/lib/transport/bdp_estimator.cc
+  src/core/lib/transport/call_factory.cc
   src/core/lib/transport/call_filters.cc
   src/core/lib/transport/call_final_info.cc
+  src/core/lib/transport/call_size_estimator.cc
+  src/core/lib/transport/call_spine.cc
   src/core/lib/transport/connectivity_state.cc
   src/core/lib/transport/error_utils.cc
   src/core/lib/transport/handshaker.cc
@@ -2647,6 +2654,7 @@ foreach(_hdr
   include/grpc/compression.h
   include/grpc/event_engine/endpoint_config.h
   include/grpc/event_engine/event_engine.h
+  include/grpc/event_engine/extensible.h
   include/grpc/event_engine/internal/memory_allocator_impl.h
   include/grpc/event_engine/internal/slice_cast.h
   include/grpc/event_engine/memory_allocator.h
@@ -3236,8 +3244,11 @@ add_library(grpc_unsecure
   src/core/lib/surface/version.cc
   src/core/lib/transport/batch_builder.cc
   src/core/lib/transport/bdp_estimator.cc
+  src/core/lib/transport/call_factory.cc
   src/core/lib/transport/call_filters.cc
   src/core/lib/transport/call_final_info.cc
+  src/core/lib/transport/call_size_estimator.cc
+  src/core/lib/transport/call_spine.cc
   src/core/lib/transport/connectivity_state.cc
   src/core/lib/transport/error_utils.cc
   src/core/lib/transport/handshaker.cc
@@ -3347,6 +3358,7 @@ foreach(_hdr
   include/grpc/compression.h
   include/grpc/event_engine/endpoint_config.h
   include/grpc/event_engine/event_engine.h
+  include/grpc/event_engine/extensible.h
   include/grpc/event_engine/internal/memory_allocator_impl.h
   include/grpc/event_engine/internal/slice_cast.h
   include/grpc/event_engine/memory_allocator.h
@@ -5322,8 +5334,11 @@ add_library(grpc_authorization_provider
   src/core/lib/surface/validate_metadata.cc
   src/core/lib/surface/version.cc
   src/core/lib/transport/batch_builder.cc
+  src/core/lib/transport/call_factory.cc
   src/core/lib/transport/call_filters.cc
   src/core/lib/transport/call_final_info.cc
+  src/core/lib/transport/call_size_estimator.cc
+  src/core/lib/transport/call_spine.cc
   src/core/lib/transport/connectivity_state.cc
   src/core/lib/transport/error_utils.cc
   src/core/lib/transport/handshaker.cc
@@ -5421,6 +5436,7 @@ foreach(_hdr
   include/grpc/compression.h
   include/grpc/event_engine/endpoint_config.h
   include/grpc/event_engine/event_engine.h
+  include/grpc/event_engine/extensible.h
   include/grpc/event_engine/internal/memory_allocator_impl.h
   include/grpc/event_engine/internal/slice_cast.h
   include/grpc/event_engine/memory_allocator.h

CONTRIBUTING_STEPS.md

@@ -0,0 +1,134 @@
+# Contributing to gRPC: A Step-By-Step Guide
+
+Note: This document is not meant for Google employees.
+
+## Prerequisites
+
+To contribute to the gRPC codebase, you need the following:
+
+1.  An
+    [active GitHub account](https://docs.github.com/en/get-started/quickstart/creating-an-account-on-github)
+1.  [An understanding of Git and GitHub](https://docs.github.com/en/get-started/using-git/about-git)
+1.  [Knowledge of how to fork a repository, clone a repository, merge, rebase,
+    resolve, push, pull, fetch
+    etc.](https://docs.github.com/en/get-started/using-git/about-git)
+1.  [git installed and working on your machine](https://github.com/git-guides/install-git)
+1.  Knowledge of the language being used, which can be C++, Python, Ruby,
+    Objective-C, PHP, or C#.
+
+## Steps to Contribute gRPC C++ Code
+
+The GitHub repository for the C-based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)
+is at https://github.com/grpc/grpc.
+
+### Fork and Clone the Repository
+
+If you want to contribute to the gRPC code base, you need to make a fork of the
+repository.
+
+1.    Create your
+[own fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
+from https://github.com/grpc/grpc.
+
+      ![Screenshot of creating fork using a non-google account.](doc/images/img/grpc-create-fork.png)
+
+1.   [Clone your fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo#cloning-your-forked-repository)
+on your local machine.
+
+### Prepare and Push Your Commit
+
+1.  In your cloned repository, create a new branch from `master`.
+1.  Then prepare a commit for the files that you want to contribute.
+1.  Commit to this branch.
+1.  Push the commit to your fork on GitHub.
+
+Take care that your commits are aligned with these
+[guidelines](https://github.com/grpc/grpc/blob/master/CONTRIBUTING.md#guidelines-for-pull-requests).
+
+### Prepare a Pull Request
+
+After pushing your commit, visit https://github.com/grpc/grpc . If the
+forking, branch creation, commit and push have been successful, you will see
+the following message:
+
+![Screenshot of Github UI to help to create a pull request.](doc/images/img/grpc-compare-and-pull-request.png)
+
+Take care to allow edits by maintainers. If there is a specific issue
+with your pull request, the maintainer can help if needed. This access to help will reduce
+the turnaround time for your submission.
+
+![Screenshot of Github UI to help to create a Pull Request.](doc/images/img/grpc-pull-request-details.png)
+
+Create a pull request.
+
+### Pull Request Status - Safe Review
+
+Once the pull request is ready, you must wait for a reviewer to be
+assigned to your pull request.
+
+If you see *Not Covered* in the EasyCLA screen, as shown in the following image,
+click on the mentioned link to start the authorization process.
+
+![Screenshot of waiting for safe review](doc/images/img/grpc-tests.png)
+
+You will see a series of screens:
+
+1.  Select *Authorize LF-Engineering:
+
+![Screenshot of EasyCLA Step 1](doc/images/img/grpc-easycla-authorize.png)
+
+1.  Select your contributor type:
+
+![Screenshot of EasyCLA Step 2](doc/images/img/grpc-contributor-type.png)
+
+1.  Select *SIGN CLA*:
+
+![Screenshot of EasyCLA Step 3](doc/images/img/grpc-sign-cla.png)
+
+Some time after you've digitally signed the document, the EasyCLA will appear as
+*Covered*.
+
+![Screenshot of EasyCLA Step 5](doc/images/img/grpc-easycla-covered.png)
+
+    After a few hours, you will notice a new "assignee" assigned to the pull request. 
+
+![Screenshot after an assignee is added](doc/images/img/grpc-assignee.png)
+
+After a reviewer is assigned to you, they will help with the next
+steps, which are as follows:
+
+1.  You complete the code review and address the comments.
+1.  Your reviewer may add a few labels as needed.
+
+### Pull Request Status - Green
+
+Once you have approval from the reviewer, check if the tests are running. After
+the tests are complete, look at the status of all the tests. If
+everything is green, everything is good. But usually some failures exist. If
+there are failures, select each failure. The selection will take you to a page
+that has error details. Try to fix the issue.
+
+### Pull Request Approval
+
+For pull requests that are non-trivial, there is a thorough code review process.
+You can read more about the process and requirements
+[here](https://github.com/grpc/grpc/blob/master/CONTRIBUTING.md#guidelines-for-pull-requests).
+
+After you fix the code review, you will finally get an approval. After getting
+approval, you can submit the pull request.
+
+![Pull request approved and labelled](doc/images/img/grpc-review-complete.png)
+
+### Submission
+
+You **cannot** do submission or merge of a pull request through Github.
+
+![Pull request approved and labelled](doc/images/img/grpc-wait-for-merge.png)
+
+After you have approval from a reviewer, a Google employee will trigger
+the submission process. When the submission happens:
+
+1.  A commit with your changes, along with a few additional formatting changes, will
+    be committed to the `grpc/master` branch.
+1.  The pull request you originally created will be closed.
+

MAINTAINERS.md

@@ -8,6 +8,7 @@ See [CONTRIBUTING.md](https://github.com/grpc/grpc-community/blob/master/CONTRIB
 for general contribution guidelines.
 
 ## Maintainers (in alphabetical order)
+<!-- go/keep-sorted start case=no -->
 - [a11r](https://github.com/a11r), Google LLC
 - [apolcyn](https://github.com/apolcyn), Google LLC
 - [arjunroy](https://github.com/arjunroy), Google LLC
@@ -40,6 +41,7 @@ for general contribution guidelines.
 - [wenbozhu](https://github.com/wenbozhu), Google LLC
 - [yashykt](https://github.com/yashykt), Google LLC
 - [ZhouyihaiDing](https://github.com/ZhouyihaiDing), Google LLC
+<!-- go/keep-sorted end -->
 
 ## Emeritus Maintainers (in alphabetical order)
 - [adelez](https://github.com/adelez), Google LLC

Makefile

@@ -1708,8 +1708,11 @@ LIBGRPC_SRC = \
     src/core/lib/surface/version.cc \
     src/core/lib/transport/batch_builder.cc \
     src/core/lib/transport/bdp_estimator.cc \
+    src/core/lib/transport/call_factory.cc \
     src/core/lib/transport/call_filters.cc \
     src/core/lib/transport/call_final_info.cc \
+    src/core/lib/transport/call_size_estimator.cc \
+    src/core/lib/transport/call_spine.cc \
     src/core/lib/transport/connectivity_state.cc \
     src/core/lib/transport/error_utils.cc \
     src/core/lib/transport/handshaker.cc \
@@ -1764,6 +1767,7 @@ PUBLIC_HEADERS_C += \
     include/grpc/compression.h \
     include/grpc/event_engine/endpoint_config.h \
     include/grpc/event_engine/event_engine.h \
+    include/grpc/event_engine/extensible.h \
     include/grpc/event_engine/internal/memory_allocator_impl.h \
     include/grpc/event_engine/internal/slice_cast.h \
     include/grpc/event_engine/memory_allocator.h \
@@ -2256,8 +2260,11 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/surface/version.cc \
     src/core/lib/transport/batch_builder.cc \
     src/core/lib/transport/bdp_estimator.cc \
+    src/core/lib/transport/call_factory.cc \
     src/core/lib/transport/call_filters.cc \
     src/core/lib/transport/call_final_info.cc \
+    src/core/lib/transport/call_size_estimator.cc \
+    src/core/lib/transport/call_spine.cc \
     src/core/lib/transport/connectivity_state.cc \
     src/core/lib/transport/error_utils.cc \
     src/core/lib/transport/handshaker.cc \
@@ -2299,6 +2306,7 @@ PUBLIC_HEADERS_C += \
     include/grpc/compression.h \
     include/grpc/event_engine/endpoint_config.h \
     include/grpc/event_engine/event_engine.h \
+    include/grpc/event_engine/extensible.h \
     include/grpc/event_engine/internal/memory_allocator_impl.h \
     include/grpc/event_engine/internal/slice_cast.h \
     include/grpc/event_engine/memory_allocator.h \
@@ -2979,7 +2987,7 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c \
     third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c \
     third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c \
-    third_party/boringssl-with-bazel/src/crypto/kyber/keccak.c \
+    third_party/boringssl-with-bazel/src/crypto/keccak/keccak.c \
     third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c \
     third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c \
     third_party/boringssl-with-bazel/src/crypto/mem.c \
@@ -3016,6 +3024,13 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_crypt.c \
     third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_print.c \
     third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/address.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/fors.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/merkle.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/spx.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/spx_util.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/thash.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/wots.c \
     third_party/boringssl-with-bazel/src/crypto/stack/stack.c \
     third_party/boringssl-with-bazel/src/crypto/thread.c \
     third_party/boringssl-with-bazel/src/crypto/thread_none.c \
@@ -3039,6 +3054,29 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/x509/t_req.c \
     third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_akey.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_akeya.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_alt.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_bcons.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_bitst.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_conf.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_cpols.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_crld.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_enum.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_extku.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_genn.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_ia5.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_info.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_int.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_lib.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_ncons.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_ocsp.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_pcons.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_pmaps.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_prn.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_purp.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_skey.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_utl.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c \
@@ -3063,9 +3101,7 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_exten.c \
-    third_party/boringssl-with-bazel/src/crypto/x509/x_info.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_name.c \
-    third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_req.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_sig.c \
@@ -3073,29 +3109,6 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akeya.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bcons.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_int.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ocsp.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c \
     third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_both.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \
@@ -3274,7 +3287,7 @@ LIBGRPC_ABSEIL_SRC = \
     third_party/abseil-cpp/absl/crc/internal/crc.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc \
-    third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc \
+    third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc \
     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 \
@@ -3284,7 +3297,6 @@ LIBGRPC_ABSEIL_SRC = \
     third_party/abseil-cpp/absl/debugging/stacktrace.cc \
     third_party/abseil-cpp/absl/debugging/symbolize.cc \
     third_party/abseil-cpp/absl/flags/commandlineflag.cc \
-    third_party/abseil-cpp/absl/flags/flag.cc \
     third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc \
     third_party/abseil-cpp/absl/flags/internal/flag.cc \
     third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc \
@@ -3308,6 +3320,7 @@ LIBGRPC_ABSEIL_SRC = \
     third_party/abseil-cpp/absl/random/internal/seed_material.cc \
     third_party/abseil-cpp/absl/random/seed_gen_exception.cc \
     third_party/abseil-cpp/absl/random/seed_sequences.cc \
+    third_party/abseil-cpp/absl/status/internal/status_internal.cc \
     third_party/abseil-cpp/absl/status/status.cc \
     third_party/abseil-cpp/absl/status/status_payload_printer.cc \
     third_party/abseil-cpp/absl/status/statusor.cc \
@@ -3325,7 +3338,6 @@ LIBGRPC_ABSEIL_SRC = \
     third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \
     third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \
     third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc \
-    third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \
     third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \
     third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \
     third_party/abseil-cpp/absl/strings/internal/cordz_info.cc \

Package.swift

@@ -23,7 +23,7 @@ let package = Package(
   ],
 
   dependencies: [
-    .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20220623.0"..<"0.20220624.0"),
+    .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20230802.0"..<"0.20230803.0"),
     .package(url: "https://github.com/firebase/boringssl-SwiftPM.git", "0.9.0"..<"0.10.0"),
   ],
 
@@ -47,6 +47,7 @@ let package = Package(
         "include/grpc/compression.h",
         "include/grpc/event_engine/endpoint_config.h",
         "include/grpc/event_engine/event_engine.h",
+        "include/grpc/event_engine/extensible.h",
         "include/grpc/event_engine/internal/memory_allocator_impl.h",
         "include/grpc/event_engine/internal/slice_cast.h",
         "include/grpc/event_engine/memory_allocator.h",
@@ -1276,6 +1277,8 @@ let package = Package(
         "src/core/lib/event_engine/default_event_engine_factory.cc",
         "src/core/lib/event_engine/default_event_engine_factory.h",
         "src/core/lib/event_engine/event_engine.cc",
+        "src/core/lib/event_engine/extensions/can_track_errors.h",
+        "src/core/lib/event_engine/extensions/supports_fd.h",
         "src/core/lib/event_engine/forkable.cc",
         "src/core/lib/event_engine/forkable.h",
         "src/core/lib/event_engine/grpc_polled_fd.h",
@@ -1324,6 +1327,7 @@ let package = Package(
         "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h",
         "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc",
         "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h",
+        "src/core/lib/event_engine/query_extensions.h",
         "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h",
         "src/core/lib/event_engine/resolved_address.cc",
         "src/core/lib/event_engine/resolved_address_internal.h",
@@ -1895,10 +1899,16 @@ let package = Package(
         "src/core/lib/transport/batch_builder.h",
         "src/core/lib/transport/bdp_estimator.cc",
         "src/core/lib/transport/bdp_estimator.h",
+        "src/core/lib/transport/call_factory.cc",
+        "src/core/lib/transport/call_factory.h",
         "src/core/lib/transport/call_filters.cc",
         "src/core/lib/transport/call_filters.h",
         "src/core/lib/transport/call_final_info.cc",
         "src/core/lib/transport/call_final_info.h",
+        "src/core/lib/transport/call_size_estimator.cc",
+        "src/core/lib/transport/call_size_estimator.h",
+        "src/core/lib/transport/call_spine.cc",
+        "src/core/lib/transport/call_spine.h",
         "src/core/lib/transport/connectivity_state.cc",
         "src/core/lib/transport/connectivity_state.h",
         "src/core/lib/transport/custom_metadata.h",
@@ -2038,11 +2048,16 @@ let package = Package(
         "third_party/re2/util/utf.h",
         "third_party/re2/util/util.h",
         "third_party/upb/upb/base/descriptor_constants.h",
+        "third_party/upb/upb/base/internal/log2.h",
         "third_party/upb/upb/base/status.c",
         "third_party/upb/upb/base/status.h",
         "third_party/upb/upb/base/status.hpp",
         "third_party/upb/upb/base/string_view.h",
         "third_party/upb/upb/generated_code_support.h",
+        "third_party/upb/upb/hash/common.c",
+        "third_party/upb/upb/hash/common.h",
+        "third_party/upb/upb/hash/int_table.h",
+        "third_party/upb/upb/hash/str_table.h",
         "third_party/upb/upb/json/decode.c",
         "third_party/upb/upb/json/decode.h",
         "third_party/upb/upb/json/encode.c",
@@ -2063,7 +2078,25 @@ let package = Package(
         "third_party/upb/upb/mem/internal/arena.h",
         "third_party/upb/upb/message/accessors.c",
         "third_party/upb/upb/message/accessors.h",
+        "third_party/upb/upb/message/array.c",
+        "third_party/upb/upb/message/array.h",
         "third_party/upb/upb/message/internal/accessors.h",
+        "third_party/upb/upb/message/internal/array.h",
+        "third_party/upb/upb/message/internal/extension.h",
+        "third_party/upb/upb/message/internal/map.h",
+        "third_party/upb/upb/message/internal/map_entry.h",
+        "third_party/upb/upb/message/internal/map_sorter.h",
+        "third_party/upb/upb/message/internal/message.h",
+        "third_party/upb/upb/message/internal/types.h",
+        "third_party/upb/upb/message/map.c",
+        "third_party/upb/upb/message/map.h",
+        "third_party/upb/upb/message/map_gencode_util.h",
+        "third_party/upb/upb/message/map_sorter.c",
+        "third_party/upb/upb/message/message.c",
+        "third_party/upb/upb/message/message.h",
+        "third_party/upb/upb/message/tagged_ptr.h",
+        "third_party/upb/upb/message/types.h",
+        "third_party/upb/upb/message/value.h",
         "third_party/upb/upb/mini_descriptor/build_enum.c",
         "third_party/upb/upb/mini_descriptor/build_enum.h",
         "third_party/upb/upb/mini_descriptor/decode.c",
@@ -2078,6 +2111,22 @@ let package = Package(
         "third_party/upb/upb/mini_descriptor/internal/wire_constants.h",
         "third_party/upb/upb/mini_descriptor/link.c",
         "third_party/upb/upb/mini_descriptor/link.h",
+        "third_party/upb/upb/mini_table/enum.h",
+        "third_party/upb/upb/mini_table/extension.h",
+        "third_party/upb/upb/mini_table/extension_registry.c",
+        "third_party/upb/upb/mini_table/extension_registry.h",
+        "third_party/upb/upb/mini_table/field.h",
+        "third_party/upb/upb/mini_table/file.h",
+        "third_party/upb/upb/mini_table/internal/enum.h",
+        "third_party/upb/upb/mini_table/internal/extension.h",
+        "third_party/upb/upb/mini_table/internal/field.h",
+        "third_party/upb/upb/mini_table/internal/file.h",
+        "third_party/upb/upb/mini_table/internal/message.c",
+        "third_party/upb/upb/mini_table/internal/message.h",
+        "third_party/upb/upb/mini_table/internal/sub.h",
+        "third_party/upb/upb/mini_table/message.c",
+        "third_party/upb/upb/mini_table/message.h",
+        "third_party/upb/upb/mini_table/sub.h",
         "third_party/upb/upb/port/atomic.h",
         "third_party/upb/upb/port/def.inc",
         "third_party/upb/upb/port/undef.inc",
@@ -2154,10 +2203,10 @@ let package = Package(
         "third_party/utf8_range/utf8_range.h",
         "third_party/xxhash/xxhash.h",
       ],
-      publicHeadersPath: "spm-core-include",
       resources: [
         .copy("src/objective-c/PrivacyInfo.xcprivacy"),
       ],
+      publicHeadersPath: "spm-core-include",
       cSettings: [
         .headerSearchPath("./"),
         .headerSearchPath("include/"),
@@ -2203,10 +2252,10 @@ let package = Package(
       sources: [
         "src/cpp/",
       ],
-      publicHeadersPath: "spm-cpp-include",
       resources: [
         .copy("src/objective-c/PrivacyInfo.xcprivacy"),
       ],
+      publicHeadersPath: "spm-cpp-include",
       cSettings: [
         .headerSearchPath("./"),
         .headerSearchPath("include/"),

README.md

@@ -26,20 +26,21 @@ runtime comes as a package available in a user's language package manager.
 For instructions on how to use the language-specific gRPC runtime for a project,
 please refer to these documents
 
-- [C++](src/cpp): follow the instructions under the `src/cpp` directory
-- [C#/.NET](https://github.com/grpc/grpc-dotnet): NuGet packages `Grpc.Net.Client`, `Grpc.AspNetCore.Server`
-- [Dart](https://github.com/grpc/grpc-dart): pub package `grpc`
-- [Go](https://github.com/grpc/grpc-go): `go get google.golang.org/grpc`
-- [Java](https://github.com/grpc/grpc-java): Use JARs from Maven Central
-  Repository
-- [Kotlin](https://github.com/grpc/grpc-kotlin): Use JARs from Maven Central
-  Repository
-- [Node](https://github.com/grpc/grpc-node): `npm install @grpc/grpc-js`
-- [Objective-C](src/objective-c): Add `gRPC-ProtoRPC` dependency to podspec
-- [PHP](src/php): `pecl install grpc`
-- [Python](src/python/grpcio): `pip install grpcio`
-- [Ruby](src/ruby): `gem install grpc`
-- [WebJS](https://github.com/grpc/grpc-web): follow the grpc-web instructions
+-   [C++](src/cpp): follow the instructions under the `src/cpp` directory
+-   [C#/.NET](https://github.com/grpc/grpc-dotnet): NuGet packages
+    `Grpc.Net.Client`, `Grpc.AspNetCore.Server`
+-   [Dart](https://github.com/grpc/grpc-dart): pub package `grpc`
+-   [Go](https://github.com/grpc/grpc-go): `go get google.golang.org/grpc`
+-   [Java](https://github.com/grpc/grpc-java): Use JARs from Maven Central
+    Repository
+-   [Kotlin](https://github.com/grpc/grpc-kotlin): Use JARs from Maven Central
+    Repository
+-   [Node](https://github.com/grpc/grpc-node): `npm install @grpc/grpc-js`
+-   [Objective-C](src/objective-c): Add `gRPC-ProtoRPC` dependency to podspec
+-   [PHP](src/php): `pecl install grpc`
+-   [Python](src/python/grpcio): `pip install grpcio`
+-   [Ruby](src/ruby): `gem install grpc`
+-   [WebJS](https://github.com/grpc/grpc-web): follow the grpc-web instructions
 
 Per-language quickstart guides and tutorials can be found in the
 [documentation section on the grpc.io website](https://grpc.io/docs/). Code
@@ -66,8 +67,7 @@ gRPC.
 
 ## Performance
 
-See the
-[Performance dashboard](https://grafana-dot-grpc-testing.appspot.com/)
+See the [Performance dashboard](https://grafana-dot-grpc-testing.appspot.com/)
 for performance numbers of master branch daily builds.
 
 ## Concepts
@@ -77,28 +77,28 @@ See [gRPC Concepts](CONCEPTS.md)
 ## About This Repository
 
 This repository contains source code for gRPC libraries implemented in multiple
-languages written on top of a shared C core library [src/core](src/core).
+languages written on top of a shared C++ core library [src/core](src/core).
 
 Libraries in different languages may be in various states of development. We are
 seeking contributions for all of these libraries:
 
-| Language                | Source                             |
-| ----------------------- | ---------------------------------- |
-| Shared C [core library] | [src/core](src/core)               |
-| C++                     | [src/cpp](src/cpp)                 |
-| Ruby                    | [src/ruby](src/ruby)               |
-| Python                  | [src/python](src/python)           |
-| PHP                     | [src/php](src/php)                 |
-| C# (core library based) | [src/csharp](src/csharp)           |
-| Objective-C             | [src/objective-c](src/objective-c) |
-
-| Language             | Source repo                                        |
-| -------------------- | -------------------------------------------------- |
-| Java                 | [grpc-java](https://github.com/grpc/grpc-java)     |
-| Kotlin               | [grpc-kotlin](https://github.com/grpc/grpc-kotlin) |
-| Go                   | [grpc-go](https://github.com/grpc/grpc-go)         |
-| NodeJS               | [grpc-node](https://github.com/grpc/grpc-node)     |
-| WebJS                | [grpc-web](https://github.com/grpc/grpc-web)       |
-| Dart                 | [grpc-dart](https://github.com/grpc/grpc-dart)     |
-| .NET (pure C# impl.) | [grpc-dotnet](https://github.com/grpc/grpc-dotnet) |
-| Swift                | [grpc-swift](https://github.com/grpc/grpc-swift) |
+Language                  | Source
+------------------------- | ----------------------------------
+Shared C++ [core library] | [src/core](src/core)
+C++                       | [src/cpp](src/cpp)
+Ruby                      | [src/ruby](src/ruby)
+Python                    | [src/python](src/python)
+PHP                       | [src/php](src/php)
+C# (core library based)   | [src/csharp](src/csharp)
+Objective-C               | [src/objective-c](src/objective-c)
+
+Language             | Source repo
+-------------------- | --------------------------------------------------
+Java                 | [grpc-java](https://github.com/grpc/grpc-java)
+Kotlin               | [grpc-kotlin](https://github.com/grpc/grpc-kotlin)
+Go                   | [grpc-go](https://github.com/grpc/grpc-go)
+NodeJS               | [grpc-node](https://github.com/grpc/grpc-node)
+WebJS                | [grpc-web](https://github.com/grpc/grpc-web)
+Dart                 | [grpc-dart](https://github.com/grpc/grpc-dart)
+.NET (pure C# impl.) | [grpc-dotnet](https://github.com/grpc/grpc-dotnet)
+Swift                | [grpc-swift](https://github.com/grpc/grpc-swift)

bazel/experiments.bzl

@@ -18,6 +18,7 @@
 
 EXPERIMENT_ENABLES = {
     "call_status_override_on_cancellation": "call_status_override_on_cancellation",
+    "call_v3": "call_v3",
     "canary_client_privacy": "canary_client_privacy",
     "client_idleness": "client_idleness",
     "client_privacy": "client_privacy",
@@ -33,7 +34,7 @@ EXPERIMENT_ENABLES = {
     "peer_state_based_framing": "peer_state_based_framing",
     "pending_queue_cap": "pending_queue_cap",
     "pick_first_happy_eyeballs": "pick_first_happy_eyeballs",
-    "promise_based_client_call": "promise_based_client_call",
+    "promise_based_client_call": "event_engine_client,event_engine_listener,promise_based_client_call",
     "promise_based_server_call": "promise_based_server_call",
     "registered_method_lookup_in_transport": "registered_method_lookup_in_transport",
     "promise_based_inproc_transport": "promise_based_client_call,promise_based_inproc_transport,promise_based_server_call,registered_method_lookup_in_transport",
@@ -58,6 +59,12 @@ EXPERIMENT_ENABLES = {
     "wrr_delegate_to_pick_first": "wrr_delegate_to_pick_first",
 }
 
+EXPERIMENT_POLLERS = [
+    "event_engine_client",
+    "event_engine_dns",
+    "event_engine_listener",
+]
+
 EXPERIMENTS = {
     "windows": {
         "dbg": {
@@ -225,7 +232,6 @@ EXPERIMENTS = {
                 "v3_compression_filter",
             ],
             "core_end2end_test": [
-                "event_engine_client",
                 "promise_based_client_call",
                 "promise_based_server_call",
                 "work_serializer_dispatch",
@@ -238,9 +244,6 @@ EXPERIMENTS = {
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
             ],
-            "event_engine_client_test": [
-                "event_engine_client",
-            ],
             "flow_control_test": [
                 "multiping",
                 "peer_state_based_framing",
@@ -271,6 +274,7 @@ EXPERIMENTS = {
         },
         "on": {
             "core_end2end_test": [
+                "event_engine_client",
                 "event_engine_listener",
             ],
             "cpp_lb_end2end_test": [
@@ -278,6 +282,9 @@ EXPERIMENTS = {
                 "round_robin_delegate_to_pick_first",
                 "wrr_delegate_to_pick_first",
             ],
+            "event_engine_client_test": [
+                "event_engine_client",
+            ],
             "event_engine_listener_test": [
                 "event_engine_listener",
             ],

bazel/grpc_build_system.bzl

@@ -29,8 +29,8 @@ Contains macros used throughout the repo.
 
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
-load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES")
-load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS", "TEST_EXPERIMENT_ENABLES")
+load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES", "EXPERIMENT_POLLERS")
+load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS", "TEST_EXPERIMENT_ENABLES", "TEST_EXPERIMENT_POLLERS")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
 load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
@@ -279,8 +279,10 @@ def ios_cc_test(
             deps = ios_test_deps,
         )
 
-def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, uses_event_engine, flaky):
-    """Common logic used to parameterize tests for every poller and EventEngine and experiment.
+def expand_poller_config(name, srcs, deps, tags, args, exclude_pollers, uses_polling, uses_event_engine, flaky):
+    """Common logic used to parameterize tests for every poller and EventEngine.
+
+    Used by expand_tests (repeatedly) to form base lists of pollers for each experiment.
 
     Args:
         name: base name of the test
@@ -297,6 +299,7 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
     Returns:
         A list of dictionaries containing modified values of name, srcs, deps, tags, and args.
     """
+
     poller_config = []
 
     # See work_stealing_thread_pool.cc for details.
@@ -373,6 +376,27 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
                     "flaky": flaky,
                 })
 
+    return poller_config
+
+def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, uses_event_engine, flaky):
+    """Common logic used to parameterize tests for every poller and EventEngine and experiment.
+
+    Args:
+        name: base name of the test
+        srcs: source files
+        deps: base deps
+        tags: base tags
+        args: base args
+        flaky: base flaky
+        exclude_pollers: list of poller names to exclude for this set of tests.
+        uses_polling: set to False if the test is not sensitive to polling methodology.
+        uses_event_engine: set to False if the test is not sensitive to
+            EventEngine implementation differences
+
+    Returns:
+        A list of dictionaries containing modified values of name, srcs, deps, tags, and args.
+    """
+
     experiments = {}
 
     # buildifier: disable=uninitialized
@@ -421,13 +445,28 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
                 tags.append("no_test_ios")
         return tags
 
-    experiment_config = list(poller_config)
+    base_params = {
+        "name": name,
+        "srcs": srcs,
+        "deps": deps,
+        "tags": tags,
+        "args": args,
+        "exclude_pollers": exclude_pollers,
+        "uses_polling": uses_polling,
+        "uses_event_engine": uses_event_engine,
+        "flaky": flaky,
+    }
+
+    experiment_config = expand_poller_config(**base_params)
     experiment_enables = {k: v for k, v in EXPERIMENT_ENABLES.items() + TEST_EXPERIMENT_ENABLES.items()}
+    experiment_pollers = EXPERIMENT_POLLERS + TEST_EXPERIMENT_POLLERS
     for mode, config in mode_config.items():
         enabled_tags, disabled_tags = config
         if enabled_tags != None:
             for experiment in experiments[mode].keys():
-                for config in poller_config:
+                experiment_params = dict(base_params)
+                experiment_params["uses_polling"] = uses_polling and (experiment in experiment_pollers)
+                for config in expand_poller_config(**experiment_params):
                     config = dict(config)
                     config["name"] = config["name"] + "@experiment=" + experiment
                     env = dict(config["env"])
@@ -443,7 +482,9 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
                     experiment_config.append(config)
         if disabled_tags != None:
             for experiment in experiments[mode].keys():
-                for config in poller_config:
+                experiment_params = dict(base_params)
+                experiment_params["uses_polling"] = uses_polling and (experiment in experiment_pollers)
+                for config in expand_poller_config(**experiment_params):
                     config = dict(config)
                     config["name"] = config["name"] + "@experiment=no_" + experiment
                     env = dict(config["env"])

bazel/grpc_deps.bzl

@@ -240,11 +240,11 @@ def grpc_deps():
             name = "boringssl",
             # Use github mirror instead of https://boringssl.googlesource.com/boringssl
             # to obtain a boringssl archive with consistent sha256
-            sha256 = "b21994a857a7aa6d5256ffe355c735ad4c286de44c6c81dfc04edc41a8feaeef",
-            strip_prefix = "boringssl-2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b",
+            sha256 = "057f662b0e85931a84945b2e89ba201fd44b0583da827c948fe443593690fb83",
+            strip_prefix = "boringssl-ae72a4514c7afd150596b0a80947f3ca9b8363b5",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b.tar.gz",
-                "https://github.com/google/boringssl/archive/2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
+                "https://github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
             ],
         )
 
@@ -348,11 +348,11 @@ def grpc_deps():
     if "com_google_absl" not in native.existing_rules():
         http_archive(
             name = "com_google_absl",
-            sha256 = "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
-            strip_prefix = "abseil-cpp-20230802.0",
+            sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440",
+            strip_prefix = "abseil-cpp-20240116.0",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz",
-                "https://github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz",
+                "https://github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz",
             ],
         )
 

bazel/test_experiments.bzl

@@ -23,6 +23,9 @@ TEST_EXPERIMENT_ENABLES = {
     "test_experiment_4": "test_experiment_4",
 }
 
+TEST_EXPERIMENT_POLLERS = [
+]
+
 TEST_EXPERIMENTS = {
     "windows": {
         "dbg": {

black.toml

@@ -19,6 +19,8 @@ extend-exclude = '''
   | src/python/grpcio/grpc/_grpcio_metadata.py
   # AUTO-GENERATED BY make_grpcio_tools.py
   | tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+  # AUTO-GENERATED BY make_grpcio_observability.py
+  | src/python/grpcio_observability/observability_lib_deps.py
   | .*_pb2.py  # autogenerated Protocol Buffer files
   | .*_pb2_grpc.py  # autogenerated Protocol Buffer gRPC files
   # AUTO-GENERATED By tools/distrib/python/xds_protos/build.py
@@ -41,7 +43,7 @@ known_first_party = [
 ]
 known_third_party = ["grpc"]
 skip_glob = [
-    "third_party/*",
+    "*/third_party/*",
     "*/env/*",
     "*pb2*.py",
     "*pb2*.pyi",

build_autogenerated.yaml

@@ -149,6 +149,7 @@ libs:
   - include/grpc/compression.h
   - include/grpc/event_engine/endpoint_config.h
   - include/grpc/event_engine/event_engine.h
+  - include/grpc/event_engine/extensible.h
   - include/grpc/event_engine/internal/memory_allocator_impl.h
   - include/grpc/event_engine/internal/slice_cast.h
   - include/grpc/event_engine/memory_allocator.h
@@ -876,6 +877,8 @@ libs:
   - src/core/lib/event_engine/common_closures.h
   - src/core/lib/event_engine/default_event_engine.h
   - src/core/lib/event_engine/default_event_engine_factory.h
+  - src/core/lib/event_engine/extensions/can_track_errors.h
+  - src/core/lib/event_engine/extensions/supports_fd.h
   - src/core/lib/event_engine/forkable.h
   - src/core/lib/event_engine/grpc_polled_fd.h
   - src/core/lib/event_engine/handle_containers.h
@@ -905,6 +908,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/query_extensions.h
   - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
@@ -1173,8 +1177,11 @@ libs:
   - src/core/lib/surface/wait_for_cq_end_op.h
   - src/core/lib/transport/batch_builder.h
   - src/core/lib/transport/bdp_estimator.h
+  - src/core/lib/transport/call_factory.h
   - src/core/lib/transport/call_filters.h
   - src/core/lib/transport/call_final_info.h
+  - src/core/lib/transport/call_size_estimator.h
+  - src/core/lib/transport/call_spine.h
   - src/core/lib/transport/connectivity_state.h
   - src/core/lib/transport/custom_metadata.h
   - src/core/lib/transport/error_utils.h
@@ -1976,8 +1983,11 @@ libs:
   - src/core/lib/surface/version.cc
   - src/core/lib/transport/batch_builder.cc
   - src/core/lib/transport/bdp_estimator.cc
+  - src/core/lib/transport/call_factory.cc
   - src/core/lib/transport/call_filters.cc
   - src/core/lib/transport/call_final_info.cc
+  - src/core/lib/transport/call_size_estimator.cc
+  - src/core/lib/transport/call_spine.cc
   - src/core/lib/transport/connectivity_state.cc
   - src/core/lib/transport/error_utils.cc
   - src/core/lib/transport/handshaker.cc
@@ -2118,6 +2128,7 @@ libs:
   - include/grpc/compression.h
   - include/grpc/event_engine/endpoint_config.h
   - include/grpc/event_engine/event_engine.h
+  - include/grpc/event_engine/extensible.h
   - include/grpc/event_engine/internal/memory_allocator_impl.h
   - include/grpc/event_engine/internal/slice_cast.h
   - include/grpc/event_engine/memory_allocator.h
@@ -2357,6 +2368,8 @@ libs:
   - src/core/lib/event_engine/common_closures.h
   - src/core/lib/event_engine/default_event_engine.h
   - src/core/lib/event_engine/default_event_engine_factory.h
+  - src/core/lib/event_engine/extensions/can_track_errors.h
+  - src/core/lib/event_engine/extensions/supports_fd.h
   - src/core/lib/event_engine/forkable.h
   - src/core/lib/event_engine/grpc_polled_fd.h
   - src/core/lib/event_engine/handle_containers.h
@@ -2386,6 +2399,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/query_extensions.h
   - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
@@ -2618,8 +2632,11 @@ libs:
   - src/core/lib/surface/wait_for_cq_end_op.h
   - src/core/lib/transport/batch_builder.h
   - src/core/lib/transport/bdp_estimator.h
+  - src/core/lib/transport/call_factory.h
   - src/core/lib/transport/call_filters.h
   - src/core/lib/transport/call_final_info.h
+  - src/core/lib/transport/call_size_estimator.h
+  - src/core/lib/transport/call_spine.h
   - src/core/lib/transport/connectivity_state.h
   - src/core/lib/transport/custom_metadata.h
   - src/core/lib/transport/error_utils.h
@@ -3037,8 +3054,11 @@ libs:
   - src/core/lib/surface/version.cc
   - src/core/lib/transport/batch_builder.cc
   - src/core/lib/transport/bdp_estimator.cc
+  - src/core/lib/transport/call_factory.cc
   - src/core/lib/transport/call_filters.cc
   - src/core/lib/transport/call_final_info.cc
+  - src/core/lib/transport/call_size_estimator.cc
+  - src/core/lib/transport/call_spine.cc
   - src/core/lib/transport/connectivity_state.cc
   - src/core/lib/transport/error_utils.cc
   - src/core/lib/transport/handshaker.cc
@@ -4282,6 +4302,7 @@ libs:
   - include/grpc/compression.h
   - include/grpc/event_engine/endpoint_config.h
   - include/grpc/event_engine/event_engine.h
+  - include/grpc/event_engine/extensible.h
   - include/grpc/event_engine/internal/memory_allocator_impl.h
   - include/grpc/event_engine/internal/slice_cast.h
   - include/grpc/event_engine/memory_allocator.h
@@ -4400,6 +4421,8 @@ libs:
   - src/core/lib/event_engine/common_closures.h
   - src/core/lib/event_engine/default_event_engine.h
   - src/core/lib/event_engine/default_event_engine_factory.h
+  - src/core/lib/event_engine/extensions/can_track_errors.h
+  - src/core/lib/event_engine/extensions/supports_fd.h
   - src/core/lib/event_engine/forkable.h
   - src/core/lib/event_engine/grpc_polled_fd.h
   - src/core/lib/event_engine/handle_containers.h
@@ -4429,6 +4452,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/query_extensions.h
   - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
@@ -4655,8 +4679,11 @@ libs:
   - src/core/lib/surface/validate_metadata.h
   - src/core/lib/surface/wait_for_cq_end_op.h
   - src/core/lib/transport/batch_builder.h
+  - src/core/lib/transport/call_factory.h
   - src/core/lib/transport/call_filters.h
   - src/core/lib/transport/call_final_info.h
+  - src/core/lib/transport/call_size_estimator.h
+  - src/core/lib/transport/call_spine.h
   - src/core/lib/transport/connectivity_state.h
   - src/core/lib/transport/custom_metadata.h
   - src/core/lib/transport/error_utils.h
@@ -4951,8 +4978,11 @@ libs:
   - src/core/lib/surface/validate_metadata.cc
   - src/core/lib/surface/version.cc
   - src/core/lib/transport/batch_builder.cc
+  - src/core/lib/transport/call_factory.cc
   - src/core/lib/transport/call_filters.cc
   - src/core/lib/transport/call_final_info.cc
+  - src/core/lib/transport/call_size_estimator.cc
+  - src/core/lib/transport/call_spine.cc
   - src/core/lib/transport/connectivity_state.cc
   - src/core/lib/transport/error_utils.cc
   - src/core/lib/transport/handshaker.cc
@@ -16479,6 +16509,7 @@ targets:
   language: c++
   headers:
   - src/core/lib/debug/trace.h
+  - src/core/lib/event_engine/extensions/can_track_errors.h
   - src/core/lib/event_engine/handle_containers.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/iomgr/port.h

build_handwritten.yaml

@@ -209,6 +209,7 @@ swift_package:
   - gpr
   - upb_base_lib
   - upb_mem_lib
+  - upb_message_lib
   - upb_json_lib
   - upb_textformat_lib
   - utf8_range_lib

config.m4

@@ -836,8 +836,11 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/surface/version.cc \
     src/core/lib/transport/batch_builder.cc \
     src/core/lib/transport/bdp_estimator.cc \
+    src/core/lib/transport/call_factory.cc \
     src/core/lib/transport/call_filters.cc \
     src/core/lib/transport/call_final_info.cc \
+    src/core/lib/transport/call_size_estimator.cc \
+    src/core/lib/transport/call_spine.cc \
     src/core/lib/transport/connectivity_state.cc \
     src/core/lib/transport/error_utils.cc \
     src/core/lib/transport/handshaker.cc \
@@ -913,7 +916,7 @@ if test "$PHP_GRPC" != "no"; then
     third_party/abseil-cpp/absl/crc/internal/crc.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc \
-    third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc \
+    third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc \
     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 \
@@ -923,7 +926,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/abseil-cpp/absl/debugging/stacktrace.cc \
     third_party/abseil-cpp/absl/debugging/symbolize.cc \
     third_party/abseil-cpp/absl/flags/commandlineflag.cc \
-    third_party/abseil-cpp/absl/flags/flag.cc \
     third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc \
     third_party/abseil-cpp/absl/flags/internal/flag.cc \
     third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc \
@@ -947,6 +949,7 @@ if test "$PHP_GRPC" != "no"; then
     third_party/abseil-cpp/absl/random/internal/seed_material.cc \
     third_party/abseil-cpp/absl/random/seed_gen_exception.cc \
     third_party/abseil-cpp/absl/random/seed_sequences.cc \
+    third_party/abseil-cpp/absl/status/internal/status_internal.cc \
     third_party/abseil-cpp/absl/status/status.cc \
     third_party/abseil-cpp/absl/status/status_payload_printer.cc \
     third_party/abseil-cpp/absl/status/statusor.cc \
@@ -964,7 +967,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \
     third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \
     third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc \
-    third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \
     third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \
     third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \
     third_party/abseil-cpp/absl/strings/internal/cordz_info.cc \
@@ -1131,7 +1133,7 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c \
     third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c \
     third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c \
-    third_party/boringssl-with-bazel/src/crypto/kyber/keccak.c \
+    third_party/boringssl-with-bazel/src/crypto/keccak/keccak.c \
     third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c \
     third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c \
     third_party/boringssl-with-bazel/src/crypto/mem.c \
@@ -1168,6 +1170,13 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_crypt.c \
     third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_print.c \
     third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/address.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/fors.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/merkle.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/spx.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/spx_util.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/thash.c \
+    third_party/boringssl-with-bazel/src/crypto/spx/wots.c \
     third_party/boringssl-with-bazel/src/crypto/stack/stack.c \
     third_party/boringssl-with-bazel/src/crypto/thread.c \
     third_party/boringssl-with-bazel/src/crypto/thread_none.c \
@@ -1191,6 +1200,29 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/x509/t_req.c \
     third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_akey.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_akeya.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_alt.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_bcons.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_bitst.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_conf.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_cpols.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_crld.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_enum.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_extku.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_genn.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_ia5.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_info.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_int.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_lib.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_ncons.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_ocsp.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_pcons.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_pmaps.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_prn.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_purp.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_skey.c \
+    third_party/boringssl-with-bazel/src/crypto/x509/v3_utl.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c \
@@ -1215,9 +1247,7 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_exten.c \
-    third_party/boringssl-with-bazel/src/crypto/x509/x_info.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_name.c \
-    third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_req.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_sig.c \
@@ -1225,29 +1255,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \
     third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akeya.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bcons.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_int.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ocsp.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c \
-    third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c \
     third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_both.cc \
     third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \
@@ -1598,6 +1605,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/random)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/random/internal)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/status)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/status/internal)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings/internal)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings/internal/str_format)
@@ -1633,6 +1641,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/fipsmodule)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/hpke)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/hrss)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/keccak)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/kyber)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/lhash)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/obj)
@@ -1645,10 +1654,10 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/rc4)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/rsa_extra)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/siphash)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/spx)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/stack)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/trust_token)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/x509)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/x509v3)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/ssl)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/re2)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/util)

config.w32

@@ -801,8 +801,11 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\surface\\version.cc " +
     "src\\core\\lib\\transport\\batch_builder.cc " +
     "src\\core\\lib\\transport\\bdp_estimator.cc " +
+    "src\\core\\lib\\transport\\call_factory.cc " +
     "src\\core\\lib\\transport\\call_filters.cc " +
     "src\\core\\lib\\transport\\call_final_info.cc " +
+    "src\\core\\lib\\transport\\call_size_estimator.cc " +
+    "src\\core\\lib\\transport\\call_spine.cc " +
     "src\\core\\lib\\transport\\connectivity_state.cc " +
     "src\\core\\lib\\transport\\error_utils.cc " +
     "src\\core\\lib\\transport\\handshaker.cc " +
@@ -878,7 +881,7 @@ if (PHP_GRPC != "no") {
     "third_party\\abseil-cpp\\absl\\crc\\internal\\crc.cc " +
     "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_cord_state.cc " +
     "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_memcpy_fallback.cc " +
-    "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_memcpy_x86_64.cc " +
+    "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_memcpy_x86_arm_combined.cc " +
     "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 " +
@@ -888,7 +891,6 @@ if (PHP_GRPC != "no") {
     "third_party\\abseil-cpp\\absl\\debugging\\stacktrace.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " +
     "third_party\\abseil-cpp\\absl\\flags\\commandlineflag.cc " +
-    "third_party\\abseil-cpp\\absl\\flags\\flag.cc " +
     "third_party\\abseil-cpp\\absl\\flags\\internal\\commandlineflag.cc " +
     "third_party\\abseil-cpp\\absl\\flags\\internal\\flag.cc " +
     "third_party\\abseil-cpp\\absl\\flags\\internal\\private_handle_accessor.cc " +
@@ -912,6 +914,7 @@ if (PHP_GRPC != "no") {
     "third_party\\abseil-cpp\\absl\\random\\internal\\seed_material.cc " +
     "third_party\\abseil-cpp\\absl\\random\\seed_gen_exception.cc " +
     "third_party\\abseil-cpp\\absl\\random\\seed_sequences.cc " +
+    "third_party\\abseil-cpp\\absl\\status\\internal\\status_internal.cc " +
     "third_party\\abseil-cpp\\absl\\status\\status.cc " +
     "third_party\\abseil-cpp\\absl\\status\\status_payload_printer.cc " +
     "third_party\\abseil-cpp\\absl\\status\\statusor.cc " +
@@ -929,7 +932,6 @@ if (PHP_GRPC != "no") {
     "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree_reader.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_consume.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_crc.cc " +
-    "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_ring.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_functions.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_handle.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_info.cc " +
@@ -1096,7 +1098,7 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\fipsmodule\\fips_shared_support.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\hpke\\hpke.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\hrss\\hrss.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\kyber\\keccak.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\keccak\\keccak.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\kyber\\kyber.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\lhash\\lhash.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\mem.c " +
@@ -1133,6 +1135,13 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\rsa_extra\\rsa_crypt.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\rsa_extra\\rsa_print.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\siphash\\siphash.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\address.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\fors.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\merkle.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\spx.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\spx_util.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\thash.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\spx\\wots.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\stack\\stack.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\thread.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\thread_none.c " +
@@ -1156,6 +1165,29 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\t_req.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\t_x509.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\t_x509a.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_akey.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_akeya.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_alt.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_bcons.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_bitst.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_conf.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_cpols.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_crld.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_enum.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_extku.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_genn.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_ia5.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_info.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_int.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_lib.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_ncons.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_ocsp.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_pcons.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_pmaps.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_prn.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_purp.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_skey.c " +
+    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\v3_utl.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x509.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x509_att.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x509_cmp.c " +
@@ -1180,9 +1212,7 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_attrib.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_crl.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_exten.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_info.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_name.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_pkey.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_pubkey.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_req.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_sig.c " +
@@ -1190,29 +1220,6 @@ if (PHP_GRPC != "no") {
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_val.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509.c " +
     "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509a.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_akey.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_akeya.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_alt.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_bcons.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_bitst.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_conf.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_cpols.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_crld.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_enum.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_extku.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_genn.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_ia5.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_info.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_int.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_lib.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_ncons.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_ocsp.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_pcons.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_pmaps.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_prn.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_purp.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_skey.c " +
-    "third_party\\boringssl-with-bazel\\src\\crypto\\x509v3\\v3_utl.c " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\bio_ssl.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\d1_both.cc " +
     "third_party\\boringssl-with-bazel\\src\\ssl\\d1_lib.cc " +
@@ -1746,6 +1753,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\random");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\random\\internal");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\status");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\status\\internal");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings\\internal");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings\\internal\\str_format");
@@ -1784,6 +1792,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\fipsmodule");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\hpke");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\hrss");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\keccak");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\kyber");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\lhash");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\obj");
@@ -1796,10 +1805,10 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\rc4");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\rsa_extra");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\siphash");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\spx");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\stack");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\trust_token");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\x509");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\x509v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\ssl");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2\\re2");

doc/command_line_tool.md

@@ -2,37 +2,44 @@
 
 ## Overview
 
-This document describes the command line tool that comes with gRPC repository. It is desirable to have command line
-tools written in other languages roughly follow the same syntax and flags.
+This document describes the command line tool that comes with gRPC repository.
+It is desirable to have command line tools written in other languages roughly
+follow the same syntax and flags.
 
-At this point, the tool needs to be built from source, and it should be moved out to grpc-tools repository as a stand
-alone application once it is mature enough.
+> [!NOTE]
+> At present, the tool needs to be built from source, and it should be moved out
+> to grpc-tools repository as a stand alone application once it is mature
+> enough. This tool in its current state though is not up to par in its
+> user-friendliness. Other tools in the ecosystem, for example,
+> [grpcurl](https://github.com/fullstorydev/grpcurl) are better maintained.
 
 ## Core functionality
 
 The command line tool can do the following things:
 
-- Send unary rpc.
-- Attach metadata and display received metadata.
-- Handle common authentication to server.
-- Infer request/response types from server reflection result.
-- Find the request/response types from a given proto file.
-- Read proto request in text form.
-- Read request in wire form (for protobuf messages, this means serialized binary form).
-- Display proto response in text form.
-- Write response in wire form to a file.
+-   Send unary rpc.
+-   Attach metadata and display received metadata.
+-   Handle common authentication to server.
+-   Infer request/response types from server reflection result.
+-   Find the request/response types from a given proto file.
+-   Read proto request in text form.
+-   Read request in wire form (for protobuf messages, this means serialized
+    binary form).
+-   Display proto response in text form.
+-   Write response in wire form to a file.
 
 The command line tool should support the following things:
 
-- List server services and methods through server reflection.
-- Fine-grained auth control (such as, use this oauth token to talk to the server).
-- Send streaming rpc.
+-   List server services and methods through server reflection.
+-   Fine-grained auth control (such as, use this oauth token to talk to the
+    server).
+-   Send streaming rpc.
 
 ## Code location
 
 To use the tool, you need to get the grpc repository and make sure your system
-has the prerequisites for building grpc from source, given in the [installation
-instructions](../BUILDING.md).
+has the prerequisites for building grpc from source, given in the
+[installation instructions](../BUILDING.md).
 
 In order to build the grpc command line tool from a fresh clone of the grpc
 repository, you need to run the following command to update submodules:
@@ -58,10 +65,13 @@ https://github.com/grpc/grpc/blob/master/test/cpp/util/grpc_cli.cc
 Most `grpc_cli` commands need the server to support server reflection. See
 guides for
 [Java](https://github.com/grpc/grpc-java/blob/master/documentation/server-reflection-tutorial.md#enable-server-reflection)
-, [C++](https://github.com/grpc/grpc/blob/master/doc/server_reflection_tutorial.md)
-and [Go](https://github.com/grpc/grpc-go/blob/master/Documentation/server-reflection-tutorial.md)
+,
+[C++](https://github.com/grpc/grpc/blob/master/doc/server_reflection_tutorial.md)
+and
+[Go](https://github.com/grpc/grpc-go/blob/master/Documentation/server-reflection-tutorial.md)
 
-Local proto files can be used as an alternative. See instructions [below](#Call-a-remote-method).
+Local proto files can be used as an alternative. See instructions
+[below](#Call-a-remote-method).
 
 ## Usage
 
@@ -176,8 +186,8 @@ We can send RPCs to a server and get responses using `grpc_cli call` command.
     ```
 
     If the proto file is not under the current directory, you can use
-    `--proto_path` to specify new search roots
-    (separated by colon on Mac/Linux/Cygwin or semicolon on Windows).
+    `--proto_path` to specify new search roots (separated by colon on
+    Mac/Linux/Cygwin or semicolon on Windows).
 
     Note that the tool will always attempt to use the reflection service first,
     falling back to local proto files if the service is not found. Use

gRPC-C++.podspec

@@ -225,7 +225,7 @@ Pod::Spec.new do |s|
     ss.dependency "#{s.name}/Privacy", version
     ss.dependency "#{s.name}/Interface", version
     ss.dependency 'gRPC-Core', version
-    abseil_version = '1.20230802.0'
+    abseil_version = '1.20240116.0'
     ss.dependency 'abseil/algorithm/container', abseil_version
     ss.dependency 'abseil/base/base', abseil_version
     ss.dependency 'abseil/base/config', abseil_version
@@ -958,6 +958,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/common_closures.h',
                       'src/core/lib/event_engine/default_event_engine.h',
                       'src/core/lib/event_engine/default_event_engine_factory.h',
+                      'src/core/lib/event_engine/extensions/can_track_errors.h',
+                      'src/core/lib/event_engine/extensions/supports_fd.h',
                       'src/core/lib/event_engine/forkable.h',
                       'src/core/lib/event_engine/grpc_polled_fd.h',
                       'src/core/lib/event_engine/handle_containers.h',
@@ -987,6 +989,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                      'src/core/lib/event_engine/query_extensions.h',
                       'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                       'src/core/lib/event_engine/resolved_address_internal.h',
                       'src/core/lib/event_engine/shim.h',
@@ -1278,8 +1281,11 @@ Pod::Spec.new do |s|
                       'src/core/lib/surface/wait_for_cq_end_op.h',
                       'src/core/lib/transport/batch_builder.h',
                       'src/core/lib/transport/bdp_estimator.h',
+                      'src/core/lib/transport/call_factory.h',
                       'src/core/lib/transport/call_filters.h',
                       'src/core/lib/transport/call_final_info.h',
+                      'src/core/lib/transport/call_size_estimator.h',
+                      'src/core/lib/transport/call_spine.h',
                       'src/core/lib/transport/connectivity_state.h',
                       'src/core/lib/transport/custom_metadata.h',
                       'src/core/lib/transport/error_utils.h',
@@ -2209,6 +2215,8 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/common_closures.h',
                               'src/core/lib/event_engine/default_event_engine.h',
                               'src/core/lib/event_engine/default_event_engine_factory.h',
+                              'src/core/lib/event_engine/extensions/can_track_errors.h',
+                              'src/core/lib/event_engine/extensions/supports_fd.h',
                               'src/core/lib/event_engine/forkable.h',
                               'src/core/lib/event_engine/grpc_polled_fd.h',
                               'src/core/lib/event_engine/handle_containers.h',
@@ -2238,6 +2246,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                              'src/core/lib/event_engine/query_extensions.h',
                               'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                               'src/core/lib/event_engine/resolved_address_internal.h',
                               'src/core/lib/event_engine/shim.h',
@@ -2529,8 +2538,11 @@ Pod::Spec.new do |s|
                               'src/core/lib/surface/wait_for_cq_end_op.h',
                               'src/core/lib/transport/batch_builder.h',
                               'src/core/lib/transport/bdp_estimator.h',
+                              'src/core/lib/transport/call_factory.h',
                               'src/core/lib/transport/call_filters.h',
                               'src/core/lib/transport/call_final_info.h',
+                              'src/core/lib/transport/call_size_estimator.h',
+                              'src/core/lib/transport/call_spine.h',
                               'src/core/lib/transport/connectivity_state.h',
                               'src/core/lib/transport/custom_metadata.h',
                               'src/core/lib/transport/error_utils.h',

gRPC-Core.podspec

@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
   s.requires_arc = false
 
   name = 'grpc'
-  abseil_version = '1.20230802.0'
+  abseil_version = '1.20240116.0'
 
   # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
   # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include
@@ -121,6 +121,7 @@ Pod::Spec.new do |s|
                       'include/grpc/compression.h',
                       'include/grpc/event_engine/endpoint_config.h',
                       'include/grpc/event_engine/event_engine.h',
+                      'include/grpc/event_engine/extensible.h',
                       'include/grpc/event_engine/internal/memory_allocator_impl.h',
                       'include/grpc/event_engine/internal/slice_cast.h',
                       'include/grpc/event_engine/memory_allocator.h',
@@ -194,7 +195,7 @@ Pod::Spec.new do |s|
     ss.libraries = 'z'
     ss.dependency "#{s.name}/Interface", version
     ss.dependency "#{s.name}/Privacy", version
-    ss.dependency 'BoringSSL-GRPC', '0.0.31'
+    ss.dependency 'BoringSSL-GRPC', '0.0.32'
     ss.dependency 'abseil/algorithm/container', abseil_version
     ss.dependency 'abseil/base/base', abseil_version
     ss.dependency 'abseil/base/config', abseil_version
@@ -1389,6 +1390,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/default_event_engine_factory.cc',
                       'src/core/lib/event_engine/default_event_engine_factory.h',
                       'src/core/lib/event_engine/event_engine.cc',
+                      'src/core/lib/event_engine/extensions/can_track_errors.h',
+                      'src/core/lib/event_engine/extensions/supports_fd.h',
                       'src/core/lib/event_engine/forkable.cc',
                       'src/core/lib/event_engine/forkable.h',
                       'src/core/lib/event_engine/grpc_polled_fd.h',
@@ -1437,6 +1440,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                      'src/core/lib/event_engine/query_extensions.h',
                       'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                       'src/core/lib/event_engine/resolved_address.cc',
                       'src/core/lib/event_engine/resolved_address_internal.h',
@@ -2004,10 +2008,16 @@ Pod::Spec.new do |s|
                       'src/core/lib/transport/batch_builder.h',
                       'src/core/lib/transport/bdp_estimator.cc',
                       'src/core/lib/transport/bdp_estimator.h',
+                      'src/core/lib/transport/call_factory.cc',
+                      'src/core/lib/transport/call_factory.h',
                       'src/core/lib/transport/call_filters.cc',
                       'src/core/lib/transport/call_filters.h',
                       'src/core/lib/transport/call_final_info.cc',
                       'src/core/lib/transport/call_final_info.h',
+                      'src/core/lib/transport/call_size_estimator.cc',
+                      'src/core/lib/transport/call_size_estimator.h',
+                      'src/core/lib/transport/call_spine.cc',
+                      'src/core/lib/transport/call_spine.h',
                       'src/core/lib/transport/connectivity_state.cc',
                       'src/core/lib/transport/connectivity_state.h',
                       'src/core/lib/transport/custom_metadata.h',
@@ -2985,6 +2995,8 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/common_closures.h',
                               'src/core/lib/event_engine/default_event_engine.h',
                               'src/core/lib/event_engine/default_event_engine_factory.h',
+                              'src/core/lib/event_engine/extensions/can_track_errors.h',
+                              'src/core/lib/event_engine/extensions/supports_fd.h',
                               'src/core/lib/event_engine/forkable.h',
                               'src/core/lib/event_engine/grpc_polled_fd.h',
                               'src/core/lib/event_engine/handle_containers.h',
@@ -3014,6 +3026,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                              'src/core/lib/event_engine/query_extensions.h',
                               'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                               'src/core/lib/event_engine/resolved_address_internal.h',
                               'src/core/lib/event_engine/shim.h',
@@ -3305,8 +3318,11 @@ Pod::Spec.new do |s|
                               'src/core/lib/surface/wait_for_cq_end_op.h',
                               'src/core/lib/transport/batch_builder.h',
                               'src/core/lib/transport/bdp_estimator.h',
+                              'src/core/lib/transport/call_factory.h',
                               'src/core/lib/transport/call_filters.h',
                               'src/core/lib/transport/call_final_info.h',
+                              'src/core/lib/transport/call_size_estimator.h',
+                              'src/core/lib/transport/call_spine.h',
                               'src/core/lib/transport/connectivity_state.h',
                               'src/core/lib/transport/custom_metadata.h',
                               'src/core/lib/transport/error_utils.h',

grpc.gemspec

@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
   s.files += %w( include/grpc/compression.h )
   s.files += %w( include/grpc/event_engine/endpoint_config.h )
   s.files += %w( include/grpc/event_engine/event_engine.h )
+  s.files += %w( include/grpc/event_engine/extensible.h )
   s.files += %w( include/grpc/event_engine/internal/memory_allocator_impl.h )
   s.files += %w( include/grpc/event_engine/internal/slice_cast.h )
   s.files += %w( include/grpc/event_engine/memory_allocator.h )
@@ -1282,6 +1283,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/default_event_engine_factory.cc )
   s.files += %w( src/core/lib/event_engine/default_event_engine_factory.h )
   s.files += %w( src/core/lib/event_engine/event_engine.cc )
+  s.files += %w( src/core/lib/event_engine/extensions/can_track_errors.h )
+  s.files += %w( src/core/lib/event_engine/extensions/supports_fd.h )
   s.files += %w( src/core/lib/event_engine/forkable.cc )
   s.files += %w( src/core/lib/event_engine/forkable.h )
   s.files += %w( src/core/lib/event_engine/grpc_polled_fd.h )
@@ -1330,6 +1333,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc )
   s.files += %w( src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h )
+  s.files += %w( src/core/lib/event_engine/query_extensions.h )
   s.files += %w( src/core/lib/event_engine/ref_counted_dns_resolver_interface.h )
   s.files += %w( src/core/lib/event_engine/resolved_address.cc )
   s.files += %w( src/core/lib/event_engine/resolved_address_internal.h )
@@ -1897,10 +1901,16 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/transport/batch_builder.h )
   s.files += %w( src/core/lib/transport/bdp_estimator.cc )
   s.files += %w( src/core/lib/transport/bdp_estimator.h )
+  s.files += %w( src/core/lib/transport/call_factory.cc )
+  s.files += %w( src/core/lib/transport/call_factory.h )
   s.files += %w( src/core/lib/transport/call_filters.cc )
   s.files += %w( src/core/lib/transport/call_filters.h )
   s.files += %w( src/core/lib/transport/call_final_info.cc )
   s.files += %w( src/core/lib/transport/call_final_info.h )
+  s.files += %w( src/core/lib/transport/call_size_estimator.cc )
+  s.files += %w( src/core/lib/transport/call_size_estimator.h )
+  s.files += %w( src/core/lib/transport/call_spine.cc )
+  s.files += %w( src/core/lib/transport/call_spine.h )
   s.files += %w( src/core/lib/transport/connectivity_state.cc )
   s.files += %w( src/core/lib/transport/connectivity_state.h )
   s.files += %w( src/core/lib/transport/custom_metadata.h )
@@ -2020,8 +2030,8 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_alloc.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h )
+  s.files += %w( third_party/abseil-cpp/absl/base/internal/nullability_impl.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/per_thread_tls.h )
-  s.files += %w( third_party/abseil-cpp/absl/base/internal/prefetch.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/raw_logging.cc )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/raw_logging.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/scheduling_mode.h )
@@ -2037,7 +2047,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/base/internal/strerror.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/sysinfo.cc )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/sysinfo.h )
-  s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_annotations.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_identity.cc )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_identity.h )
   s.files += %w( third_party/abseil-cpp/absl/base/internal/throw_delegate.cc )
@@ -2050,6 +2059,8 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/base/log_severity.cc )
   s.files += %w( third_party/abseil-cpp/absl/base/log_severity.h )
   s.files += %w( third_party/abseil-cpp/absl/base/macros.h )
+  s.files += %w( third_party/abseil-cpp/absl/base/no_destructor.h )
+  s.files += %w( third_party/abseil-cpp/absl/base/nullability.h )
   s.files += %w( third_party/abseil-cpp/absl/base/optimization.h )
   s.files += %w( third_party/abseil-cpp/absl/base/options.h )
   s.files += %w( third_party/abseil-cpp/absl/base/policy_checks.h )
@@ -2091,7 +2102,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_internal.h )
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy.h )
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc )
-  s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc )
+  s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc )
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc )
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc )
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/non_temporal_arm_intrinsics.h )
@@ -2128,13 +2139,11 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/flags/commandlineflag.h )
   s.files += %w( third_party/abseil-cpp/absl/flags/config.h )
   s.files += %w( third_party/abseil-cpp/absl/flags/declare.h )
-  s.files += %w( third_party/abseil-cpp/absl/flags/flag.cc )
   s.files += %w( third_party/abseil-cpp/absl/flags/flag.h )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/commandlineflag.h )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/flag.cc )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/flag.h )
-  s.files += %w( third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/path_util.h )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc )
   s.files += %w( third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h )
@@ -2219,6 +2228,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/random/uniform_int_distribution.h )
   s.files += %w( third_party/abseil-cpp/absl/random/uniform_real_distribution.h )
   s.files += %w( third_party/abseil-cpp/absl/random/zipf_distribution.h )
+  s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.cc )
   s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.h )
   s.files += %w( third_party/abseil-cpp/absl/status/internal/statusor_internal.h )
   s.files += %w( third_party/abseil-cpp/absl/status/status.cc )
@@ -2231,6 +2241,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/strings/ascii.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/charconv.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/charconv.h )
+  s.files += %w( third_party/abseil-cpp/absl/strings/charset.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/cord.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/cord.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/cord_analysis.cc )
@@ -2239,7 +2250,8 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/strings/cord_buffer.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/escaping.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/escaping.h )
-  s.files += %w( third_party/abseil-cpp/absl/strings/internal/char_map.h )
+  s.files += %w( third_party/abseil-cpp/absl/strings/has_absl_stringify.h )
+  s.files += %w( third_party/abseil-cpp/absl/strings/has_ostream_operator.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc )
@@ -2258,9 +2270,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h )
-  s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc )
-  s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h )
-  s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_functions.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc )
@@ -2622,8 +2631,9 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/hrss/internal.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/internal.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/keccak/internal.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/keccak/keccak.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/kyber/internal.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/kyber/keccak.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/lhash/internal.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c )
@@ -2667,6 +2677,21 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_crypt.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_print.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/address.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/address.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/fors.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/fors.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/internal.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/merkle.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/merkle.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/params.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/spx.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/spx_util.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/spx_util.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/thash.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/thash.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/wots.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/wots.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/stack/stack.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/thread.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/thread_none.c )
@@ -2683,6 +2708,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/asn1_gen.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/by_dir.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/by_file.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/ext_dat.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/i2d_pr.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/internal.h )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/name_print.c )
@@ -2692,6 +2718,29 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/t_req.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_akey.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_akeya.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_alt.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_bcons.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_bitst.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_conf.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_cpols.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_crld.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_enum.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_extku.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_genn.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_ia5.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_info.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_int.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_lib.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_ncons.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_ocsp.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_pcons.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_pmaps.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_prn.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_purp.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_skey.c )
+  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/v3_utl.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c )
@@ -2716,9 +2765,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_exten.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_info.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_name.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_req.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_sig.c )
@@ -2726,31 +2773,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_val.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c )
   s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/ext_dat.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/internal.h )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akeya.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bcons.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_int.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ocsp.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c )
-  s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/aead.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/aes.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h )
@@ -2815,6 +2837,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pkcs8.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/poly1305.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pool.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/posix_time.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/rand.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/rc4.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/ripemd.h )
@@ -2837,6 +2860,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/x509.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/x509_vfy.h )
   s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/x509v3.h )
+  s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/x509v3_errors.h )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/d1_both.cc )
   s.files += %w( third_party/boringssl-with-bazel/src/ssl/d1_lib.cc )

grpc.gyp

@@ -1022,8 +1022,11 @@
         'src/core/lib/surface/version.cc',
         'src/core/lib/transport/batch_builder.cc',
         'src/core/lib/transport/bdp_estimator.cc',
+        'src/core/lib/transport/call_factory.cc',
         'src/core/lib/transport/call_filters.cc',
         'src/core/lib/transport/call_final_info.cc',
+        'src/core/lib/transport/call_size_estimator.cc',
+        'src/core/lib/transport/call_spine.cc',
         'src/core/lib/transport/connectivity_state.cc',
         'src/core/lib/transport/error_utils.cc',
         'src/core/lib/transport/handshaker.cc',
@@ -1511,8 +1514,11 @@
         'src/core/lib/surface/version.cc',
         'src/core/lib/transport/batch_builder.cc',
         'src/core/lib/transport/bdp_estimator.cc',
+        'src/core/lib/transport/call_factory.cc',
         'src/core/lib/transport/call_filters.cc',
         'src/core/lib/transport/call_final_info.cc',
+        'src/core/lib/transport/call_size_estimator.cc',
+        'src/core/lib/transport/call_spine.cc',
         'src/core/lib/transport/connectivity_state.cc',
         'src/core/lib/transport/error_utils.cc',
         'src/core/lib/transport/handshaker.cc',
@@ -2280,8 +2286,11 @@
         'src/core/lib/surface/validate_metadata.cc',
         'src/core/lib/surface/version.cc',
         'src/core/lib/transport/batch_builder.cc',
+        'src/core/lib/transport/call_factory.cc',
         'src/core/lib/transport/call_filters.cc',
         'src/core/lib/transport/call_final_info.cc',
+        'src/core/lib/transport/call_size_estimator.cc',
+        'src/core/lib/transport/call_spine.cc',
         'src/core/lib/transport/connectivity_state.cc',
         'src/core/lib/transport/error_utils.cc',
         'src/core/lib/transport/handshaker.cc',
@@ -2457,7 +2466,7 @@
         'third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c',
         'third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c',
         'third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c',
-        'third_party/boringssl-with-bazel/src/crypto/kyber/keccak.c',
+        'third_party/boringssl-with-bazel/src/crypto/keccak/keccak.c',
         'third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c',
         'third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c',
         'third_party/boringssl-with-bazel/src/crypto/mem.c',
@@ -2494,6 +2503,13 @@
         'third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_crypt.c',
         'third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_print.c',
         'third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/address.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/fors.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/merkle.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/spx.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/spx_util.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/thash.c',
+        'third_party/boringssl-with-bazel/src/crypto/spx/wots.c',
         'third_party/boringssl-with-bazel/src/crypto/stack/stack.c',
         'third_party/boringssl-with-bazel/src/crypto/thread.c',
         'third_party/boringssl-with-bazel/src/crypto/thread_none.c',
@@ -2517,6 +2533,29 @@
         'third_party/boringssl-with-bazel/src/crypto/x509/t_req.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_akey.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_akeya.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_alt.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_bcons.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_bitst.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_conf.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_cpols.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_crld.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_enum.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_extku.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_genn.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_ia5.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_info.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_int.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_lib.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_ncons.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_ocsp.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_pcons.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_pmaps.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_prn.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_purp.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_skey.c',
+        'third_party/boringssl-with-bazel/src/crypto/x509/v3_utl.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x509.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c',
@@ -2541,9 +2580,7 @@
         'third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_exten.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509/x_info.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_name.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_req.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_sig.c',
@@ -2551,29 +2588,6 @@
         'third_party/boringssl-with-bazel/src/crypto/x509/x_val.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c',
         'third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akeya.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bcons.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_int.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ocsp.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c',
-        'third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c',
         'third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc',
         'third_party/boringssl-with-bazel/src/ssl/d1_both.cc',
         'third_party/boringssl-with-bazel/src/ssl/d1_lib.cc',

include/grpc++/impl/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

include/grpc/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

include/grpc/event_engine/event_engine.h

@@ -16,7 +16,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <functional>
 #include <vector>
 
 #include "absl/functional/any_invocable.h"
@@ -24,6 +23,7 @@
 #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>
 #include <grpc/event_engine/port.h>
 #include <grpc/event_engine/slice_buffer.h>
@@ -100,7 +100,8 @@ namespace experimental {
 /// application state synchronization must be managed by the application.
 ///
 ////////////////////////////////////////////////////////////////////////////////
-class EventEngine : public std::enable_shared_from_this<EventEngine> {
+class EventEngine : public std::enable_shared_from_this<EventEngine>,
+                    public Extensible {
  public:
   /// A duration between two events.
   ///
@@ -176,7 +177,7 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
   /// allocations. gRPC allows applications to set memory constraints per
   /// Channel or Server, and the implementation depends on all dynamic memory
   /// allocation being handled by the quota system.
-  class Endpoint {
+  class Endpoint : public Extensible {
    public:
     /// Shuts down all connections and invokes all pending read or write
     /// callbacks with an error status.
@@ -255,45 +256,6 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
     /// values are expected to remain valid for the life of the Endpoint.
     virtual const ResolvedAddress& GetPeerAddress() const = 0;
     virtual const ResolvedAddress& GetLocalAddress() const = 0;
-
-    /// A method which allows users to query whether an Endpoint implementation
-    /// supports a specified extension. The name of the extension is provided
-    /// as an input.
-    ///
-    /// An extension could be any type with a unique string id. Each extension
-    /// may support additional capabilities and if the Endpoint implementation
-    /// supports the queried extension, it should return a valid pointer to the
-    /// extension type.
-    ///
-    /// E.g., use case of an EventEngine::Endpoint supporting a custom
-    /// extension.
-    ///
-    /// class CustomEndpointExtension {
-    ///  public:
-    ///    static constexpr std::string name = "my.namespace.extension_name";
-    ///    void Process() { ... }
-    /// }
-    ///
-    ///
-    /// class CustomEndpoint :
-    ///        public EventEngine::Endpoint, CustomEndpointExtension {
-    ///   public:
-    ///     void* QueryExtension(absl::string_view id) override {
-    ///       if (id == CustomEndpointExtension::name) {
-    ///         return static_cast<CustomEndpointExtension*>(this);
-    ///       }
-    ///       return nullptr;
-    ///     }
-    ///     ...
-    /// }
-    ///
-    /// auto ext_ =
-    /// static_cast<CustomEndpointExtension*>(
-    ///   endpoint->QueryExtension(CustomrEndpointExtension::name));
-    /// if (ext_ != nullptr) { ext_->Process(); }
-    ///
-    ///
-    virtual void* QueryExtension(absl::string_view /*id*/) { return nullptr; }
   };
 
   /// Called when a new connection is established.
@@ -307,7 +269,7 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
 
   /// Listens for incoming connection requests from gRPC clients and initiates
   /// request processing once connections are established.
-  class Listener {
+  class Listener : public Extensible {
    public:
     /// Called when the listener has accepted a new client connection.
     using AcceptCallback = absl::AnyInvocable<void(

include/grpc/event_engine/extensible.h

@@ -0,0 +1,68 @@
+// Copyright 2024 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+#ifndef GRPC_EVENT_ENGINE_EXTENSIBLE_H
+#define GRPC_EVENT_ENGINE_EXTENSIBLE_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/strings/string_view.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+class Extensible {
+ public:
+  /// A method which allows users to query whether an implementation supports a
+  /// specified extension. The name of the extension is provided as an input.
+  ///
+  /// An extension could be any type with a unique string id. Each extension may
+  /// support additional capabilities and if the implementation supports the
+  /// queried extension, it should return a valid pointer to the extension type.
+  ///
+  /// E.g., use case of an EventEngine::Endpoint supporting a custom extension.
+  ///
+  /// class CustomEndpointExtension {
+  ///  public:
+  ///   static std::string EndpointExtensionName() {
+  ///     return "my.namespace.extension_name";
+  ///   }
+  ///   virtual void Process() = 0;
+  /// }
+  ///
+  /// class CustomEndpoint :
+  ///        public EventEngine::Endpoint, public CustomEndpointExtension {
+  ///   public:
+  ///     void* QueryExtension(absl::string_view id) override {
+  ///       if (id == CustomEndpointExtension::EndpointExtensionName()) {
+  ///         return static_cast<CustomEndpointExtension*>(this);
+  ///       }
+  ///       return nullptr;
+  ///     }
+  ///     void Process() override { ... }
+  ///     ...
+  /// }
+  ///
+  /// auto endpoint =
+  ///     static_cast<CustomEndpointExtension*>(endpoint->QueryExtension(
+  ///         CustomEndpointExtension::EndpointExtensionName()));
+  /// if (endpoint != nullptr) endpoint->Process();
+  ///
+  virtual void* QueryExtension(absl::string_view /*id*/) { return nullptr; }
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_EVENT_ENGINE_EXTENSIBLE_H

include/grpcpp/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

include/grpcpp/impl/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

include/grpcpp/impl/codegen/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

include/grpcpp/security/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

include/grpcpp/support/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

package.xml

@@ -35,6 +35,7 @@
     <file baseinstalldir="/" name="include/grpc/compression.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/event_engine/endpoint_config.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/event_engine/event_engine.h" role="src" />
+    <file baseinstalldir="/" name="include/grpc/event_engine/extensible.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/event_engine/internal/memory_allocator_impl.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/event_engine/internal/slice_cast.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/event_engine/memory_allocator.h" role="src" />
@@ -1264,6 +1265,8 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/default_event_engine_factory.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/default_event_engine_factory.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/event_engine.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/extensions/can_track_errors.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/extensions/supports_fd.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/forkable.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/forkable.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/grpc_polled_fd.h" role="src" />
@@ -1312,6 +1315,7 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/query_extensions.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/resolved_address.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/resolved_address_internal.h" role="src" />
@@ -1879,10 +1883,16 @@
     <file baseinstalldir="/" name="src/core/lib/transport/batch_builder.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/bdp_estimator.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/bdp_estimator.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/transport/call_factory.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/transport/call_factory.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/call_filters.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/call_filters.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/call_final_info.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/call_final_info.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/transport/call_size_estimator.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/transport/call_size_estimator.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/transport/call_spine.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/transport/call_spine.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/connectivity_state.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/connectivity_state.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/custom_metadata.h" role="src" />
@@ -2024,8 +2034,8 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/low_level_alloc.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/nullability_impl.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/per_thread_tls.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/prefetch.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/raw_logging.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/raw_logging.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/scheduling_mode.h" role="src" />
@@ -2041,7 +2051,6 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/strerror.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/sysinfo.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/sysinfo.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/thread_annotations.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/thread_identity.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/thread_identity.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/throw_delegate.cc" role="src" />
@@ -2054,6 +2063,8 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/log_severity.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/log_severity.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/macros.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/no_destructor.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/nullability.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/optimization.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/options.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/policy_checks.h" role="src" />
@@ -2095,7 +2106,7 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_memcpy.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/non_temporal_arm_intrinsics.h" role="src" />
@@ -2132,13 +2143,11 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/commandlineflag.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/config.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/declare.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/flag.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/flag.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/commandlineflag.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/flag.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/flag.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/path_util.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h" role="src" />
@@ -2223,6 +2232,7 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/random/uniform_int_distribution.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/random/uniform_real_distribution.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/random/zipf_distribution.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/internal/status_internal.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/internal/status_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/internal/statusor_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/status.cc" role="src" />
@@ -2235,6 +2245,7 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/ascii.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/charconv.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/charconv.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/charset.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/cord.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/cord.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/cord_analysis.cc" role="src" />
@@ -2243,7 +2254,8 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/cord_buffer.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/escaping.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/escaping.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/char_map.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/has_absl_stringify.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/has_ostream_operator.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc" role="src" />
@@ -2262,9 +2274,6 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cordz_functions.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc" role="src" />
@@ -2626,8 +2635,9 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/hrss/internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/keccak/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/keccak/keccak.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/kyber/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/kyber/keccak.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/lhash/internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/lhash/lhash.c" role="src" />
@@ -2671,6 +2681,21 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_crypt.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_print.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/address.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/address.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/fors.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/fors.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/merkle.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/merkle.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/params.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/spx.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/spx_util.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/spx_util.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/thash.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/thash.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/wots.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/spx/wots.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/stack/stack.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/thread.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/thread_none.c" role="src" />
@@ -2687,6 +2712,7 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/asn1_gen.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/by_dir.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/by_file.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/ext_dat.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/i2d_pr.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/name_print.c" role="src" />
@@ -2696,6 +2722,29 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/t_req.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_akey.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_akeya.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_alt.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_bcons.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_bitst.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_conf.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_cpols.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_crld.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_enum.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_extku.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_genn.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_ia5.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_info.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_int.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_lib.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_ncons.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_ocsp.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_pcons.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_pmaps.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_prn.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_purp.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_skey.c" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/v3_utl.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x509.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c" role="src" />
@@ -2720,9 +2769,7 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_exten.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_info.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_name.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_req.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_sig.c" role="src" />
@@ -2730,31 +2777,6 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_val.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/ext_dat.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akeya.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bcons.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_int.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ocsp.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c" role="src" />
-    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/aead.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/aes.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h" role="src" />
@@ -2819,6 +2841,7 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/pkcs8.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/poly1305.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/pool.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/posix_time.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/rand.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/rc4.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/ripemd.h" role="src" />
@@ -2841,6 +2864,7 @@
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/x509.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/x509_vfy.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/x509v3.h" role="src" />
+    <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/include/openssl/x509v3_errors.h" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/d1_both.cc" role="src" />
     <file baseinstalldir="/" name="third_party/boringssl-with-bazel/src/ssl/d1_lib.cc" role="src" />

setup.py

@@ -245,32 +245,22 @@ def check_linker_need_libatomic():
 EXTRA_ENV_COMPILE_ARGS = os.environ.get("GRPC_PYTHON_CFLAGS", None)
 EXTRA_ENV_LINK_ARGS = os.environ.get("GRPC_PYTHON_LDFLAGS", None)
 if EXTRA_ENV_COMPILE_ARGS is None:
-    EXTRA_ENV_COMPILE_ARGS = " -std=c++14"
+    EXTRA_ENV_COMPILE_ARGS = ""
     if "win32" in sys.platform:
-        if sys.version_info < (3, 5):
-            EXTRA_ENV_COMPILE_ARGS += " -D_hypot=hypot"
-            # We use define flags here and don't directly add to DEFINE_MACROS below to
-            # ensure that the expert user/builder has a way of turning it off (via the
-            # envvars) without adding yet more GRPC-specific envvars.
-            # See https://sourceforge.net/p/mingw-w64/bugs/363/
-            if "32" in platform.architecture()[0]:
-                EXTRA_ENV_COMPILE_ARGS += (
-                    " -D_ftime=_ftime32 -D_timeb=__timeb32"
-                    " -D_ftime_s=_ftime32_s"
-                )
-            else:
-                EXTRA_ENV_COMPILE_ARGS += (
-                    " -D_ftime=_ftime64 -D_timeb=__timeb64"
-                )
-        else:
-            # We need to statically link the C++ Runtime, only the C runtime is
-            # available dynamically
-            EXTRA_ENV_COMPILE_ARGS += " /MT"
+        # MSVC by defaults uses C++14 so C11 needs to be specified.
+        EXTRA_ENV_COMPILE_ARGS += " /std:c11"
+        # We need to statically link the C++ Runtime, only the C runtime is
+        # available dynamically
+        EXTRA_ENV_COMPILE_ARGS += " /MT"
     elif "linux" in sys.platform:
+        # GCC by defaults uses C17 so only C++14 needs to be specified.
+        EXTRA_ENV_COMPILE_ARGS += " -std=c++14"
         EXTRA_ENV_COMPILE_ARGS += (
             " -fvisibility=hidden -fno-wrapv -fno-exceptions"
         )
     elif "darwin" in sys.platform:
+        # AppleClang by defaults uses C17 so only C++14 needs to be specified.
+        EXTRA_ENV_COMPILE_ARGS += " -std=c++14"
         EXTRA_ENV_COMPILE_ARGS += (
             " -stdlib=libc++ -fvisibility=hidden -fno-wrapv -fno-exceptions"
             " -DHAVE_UNISTD_H"

src/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/abseil-cpp/preprocessed_builds.yaml

@@ -9,6 +9,7 @@
   deps:
   - absl/algorithm:algorithm
   - absl/base:core_headers
+  - absl/base:nullability
   - absl/meta:type_traits
   headers:
   - third_party/abseil-cpp/absl/algorithm/container.h
@@ -31,6 +32,7 @@
   - absl/base:cycleclock_internal
   - absl/base:dynamic_annotations
   - absl/base:log_severity
+  - absl/base:nullability
   - absl/base:raw_logging_internal
   - absl/base:spinlock_wait
   - absl/meta:type_traits
@@ -78,7 +80,6 @@
   headers:
   - third_party/abseil-cpp/absl/base/attributes.h
   - third_party/abseil-cpp/absl/base/const_init.h
-  - third_party/abseil-cpp/absl/base/internal/thread_annotations.h
   - third_party/abseil-cpp/absl/base/macros.h
   - third_party/abseil-cpp/absl/base/optimization.h
   - third_party/abseil-cpp/absl/base/port.h
@@ -108,6 +109,7 @@
   - absl/base:base
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:nullability
   headers:
   - third_party/abseil-cpp/absl/base/internal/endian.h
   - third_party/abseil-cpp/absl/base/internal/unaligned_access.h
@@ -150,6 +152,13 @@
   name: absl/base:malloc_internal
   src:
   - third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc
+- cmake_target: absl::no_destructor
+  deps:
+  - absl/base:config
+  headers:
+  - third_party/abseil-cpp/absl/base/no_destructor.h
+  name: absl/base:no_destructor
+  src: []
 - cmake_target: absl::nullability
   deps:
   - absl/base:core_headers
@@ -164,7 +173,6 @@
   - absl/base:config
   - absl/base:core_headers
   headers:
-  - third_party/abseil-cpp/absl/base/internal/prefetch.h
   - third_party/abseil-cpp/absl/base/prefetch.h
   name: absl/base:prefetch
   src: []
@@ -394,6 +402,7 @@
   src: []
 - cmake_target: absl::inlined_vector_internal
   deps:
+  - absl/base:config
   - absl/base:core_headers
   - absl/container:compressed_tuple
   - absl/memory:memory
@@ -407,6 +416,7 @@
   deps:
   - absl/base:config
   - absl/base:core_headers
+  - absl/debugging:demangle_internal
   - absl/meta:type_traits
   - absl/strings:strings
   - absl/types:span
@@ -449,6 +459,8 @@
   src: []
 - cmake_target: absl::raw_hash_map
   deps:
+  - absl/base:config
+  - absl/base:core_headers
   - absl/base:throw_delegate
   - absl/container:container_memory
   - absl/container:raw_hash_set
@@ -493,7 +505,6 @@
   deps:
   - absl/base:config
   - absl/base:core_headers
-  - absl/base:dynamic_annotations
   - absl/base:endian
   - absl/base:prefetch
   - absl/crc:cpu_detect
@@ -510,7 +521,7 @@
   src:
   - third_party/abseil-cpp/absl/crc/crc32c.cc
   - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc
-  - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc
+  - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
   - third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc
 - cmake_target: absl::crc_cord_state
   deps:
@@ -525,10 +536,8 @@
   - third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc
 - cmake_target: absl::crc_internal
   deps:
-  - absl/base:base
   - absl/base:config
   - absl/base:core_headers
-  - absl/base:dynamic_annotations
   - absl/base:endian
   - absl/base:prefetch
   - absl/base:raw_logging_internal
@@ -710,10 +719,8 @@
   headers:
   - third_party/abseil-cpp/absl/flags/declare.h
   - third_party/abseil-cpp/absl/flags/flag.h
-  - third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc
   name: absl/flags:flag
-  src:
-  - third_party/abseil-cpp/absl/flags/flag.cc
+  src: []
 - cmake_target: absl::flags_internal
   deps:
   - absl/base:base
@@ -808,6 +815,7 @@
   deps:
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:no_destructor
   - absl/container:flat_hash_map
   - absl/flags:commandlineflag
   - absl/flags:commandlineflag_internal
@@ -838,7 +846,6 @@
   deps:
   - absl/base:config
   - absl/base:core_headers
-  - absl/container:flat_hash_map
   - absl/flags:commandlineflag
   - absl/flags:config
   - absl/flags:flag
@@ -848,6 +855,7 @@
   - absl/flags:program_name
   - absl/flags:reflection
   - absl/strings:strings
+  - absl/synchronization:synchronization
   headers:
   - third_party/abseil-cpp/absl/flags/internal/usage.h
   name: absl/flags:usage_internal
@@ -887,6 +895,14 @@
   - third_party/abseil-cpp/absl/functional/internal/function_ref.h
   name: absl/functional:function_ref
   src: []
+- cmake_target: absl::overload
+  deps:
+  - absl/base:config
+  - absl/meta:type_traits
+  headers:
+  - third_party/abseil-cpp/absl/functional/overload.h
+  name: absl/functional:overload
+  src: []
 - cmake_target: absl::city
   deps:
   - absl/base:config
@@ -989,6 +1005,15 @@
   - third_party/abseil-cpp/absl/log/internal/flags.h
   name: absl/log/internal:flags
   src: []
+- cmake_target: absl::log_internal_fnmatch
+  deps:
+  - absl/base:config
+  - absl/strings:strings
+  headers:
+  - third_party/abseil-cpp/absl/log/internal/fnmatch.h
+  name: absl/log/internal:fnmatch
+  src:
+  - third_party/abseil-cpp/absl/log/internal/fnmatch.cc
 - cmake_target: absl::log_internal_format
   deps:
   - absl/base:config
@@ -1024,6 +1049,7 @@
   - absl/log/internal:conditions
   - absl/log/internal:log_message
   - absl/log/internal:strip
+  - absl/log:absl_vlog_is_on
   headers:
   - third_party/abseil-cpp/absl/log/internal/log_impl.h
   name: absl/log/internal:log_impl
@@ -1064,6 +1090,7 @@
   - absl/base:config
   - absl/base:core_headers
   - absl/base:log_severity
+  - absl/base:no_destructor
   - absl/base:raw_logging_internal
   - absl/cleanup:cleanup
   - absl/log/internal:config
@@ -1128,6 +1155,22 @@
   - third_party/abseil-cpp/absl/log/internal/structured.h
   name: absl/log/internal:structured
   src: []
+- cmake_target: absl::vlog_config_internal
+  deps:
+  - absl/base:base
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/base:no_destructor
+  - absl/log/internal:fnmatch
+  - absl/memory:memory
+  - absl/strings:strings
+  - absl/synchronization:synchronization
+  - absl/types:optional
+  headers:
+  - third_party/abseil-cpp/absl/log/internal/vlog_config.h
+  name: absl/log/internal:vlog_config
+  src:
+  - third_party/abseil-cpp/absl/log/internal/vlog_config.cc
 - cmake_target: absl::log_internal_voidify
   deps:
   - absl/base:config
@@ -1149,6 +1192,16 @@
   - third_party/abseil-cpp/absl/log/absl_log.h
   name: absl/log:absl_log
   src: []
+- cmake_target: absl::absl_vlog_is_on
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/log/internal:vlog_config
+  - absl/strings:strings
+  headers:
+  - third_party/abseil-cpp/absl/log/absl_vlog_is_on.h
+  name: absl/log:absl_vlog_is_on
+  src: []
 - cmake_target: absl::check
   deps:
   - absl/log/internal:check_impl
@@ -1180,6 +1233,7 @@
   - absl/flags:marshalling
   - absl/log/internal:config
   - absl/log/internal:flags
+  - absl/log/internal:vlog_config
   - absl/log:globals
   - absl/strings:strings
   headers:
@@ -1195,6 +1249,7 @@
   - absl/base:log_severity
   - absl/base:raw_logging_internal
   - absl/hash:hash
+  - absl/log/internal:vlog_config
   - absl/strings:strings
   headers:
   - third_party/abseil-cpp/absl/log/globals.h
@@ -1215,6 +1270,7 @@
 - cmake_target: absl::log
   deps:
   - absl/log/internal:log_impl
+  - absl/log:vlog_is_on
   headers:
   - third_party/abseil-cpp/absl/log/log.h
   name: absl/log:log
@@ -1273,6 +1329,13 @@
   - third_party/abseil-cpp/absl/log/structured.h
   name: absl/log:structured
   src: []
+- cmake_target: absl::vlog_is_on
+  deps:
+  - absl/log:absl_vlog_is_on
+  headers:
+  - third_party/abseil-cpp/absl/log/vlog_is_on.h
+  name: absl/log:vlog_is_on
+  src: []
 - cmake_target: absl::memory
   deps:
   - absl/base:core_headers
@@ -1648,32 +1711,42 @@
 - cmake_target: absl::status
   deps:
   - absl/base:atomic_hook
+  - absl/base:config
   - absl/base:core_headers
+  - absl/base:no_destructor
+  - absl/base:nullability
   - absl/base:raw_logging_internal
   - absl/base:strerror
   - absl/container:inlined_vector
   - absl/debugging:stacktrace
   - absl/debugging:symbolize
   - absl/functional:function_ref
+  - absl/memory:memory
   - absl/strings:cord
   - absl/strings:str_format
   - absl/strings:strings
   - absl/types:optional
+  - absl/types:span
   headers:
   - third_party/abseil-cpp/absl/status/internal/status_internal.h
   - third_party/abseil-cpp/absl/status/status.h
   - third_party/abseil-cpp/absl/status/status_payload_printer.h
   name: absl/status:status
   src:
+  - third_party/abseil-cpp/absl/status/internal/status_internal.cc
   - third_party/abseil-cpp/absl/status/status.cc
   - third_party/abseil-cpp/absl/status/status_payload_printer.cc
 - cmake_target: absl::statusor
   deps:
   - absl/base:base
+  - absl/base:config
   - absl/base:core_headers
+  - absl/base:nullability
   - absl/base:raw_logging_internal
   - absl/meta:type_traits
   - absl/status:status
+  - absl/strings:has_ostream_operator
+  - absl/strings:str_format
   - absl/strings:strings
   - absl/types:variant
   - absl/utility:utility
@@ -1683,15 +1756,24 @@
   name: absl/status:statusor
   src:
   - third_party/abseil-cpp/absl/status/statusor.cc
+- cmake_target: absl::charset
+  deps:
+  - absl/base:core_headers
+  - absl/strings:string_view
+  headers:
+  - third_party/abseil-cpp/absl/strings/charset.h
+  name: absl/strings:charset
+  src: []
 - cmake_target: absl::cord
   deps:
   - absl/base:base
   - absl/base:config
   - absl/base:core_headers
   - absl/base:endian
+  - absl/base:nullability
   - absl/base:raw_logging_internal
-  - absl/container:fixed_array
   - absl/container:inlined_vector
+  - absl/crc:crc32c
   - absl/crc:crc_cord_state
   - absl/functional:function_ref
   - absl/meta:type_traits
@@ -1741,8 +1823,6 @@
   - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h
   - third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h
   - third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h
-  - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h
-  - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h
   name: absl/strings:cord_internal
   src:
   - third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
@@ -1751,7 +1831,6 @@
   - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc
   - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc
   - third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc
-  - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
 - cmake_target: absl::cordz_functions
   deps:
   - absl/base:config
@@ -1831,6 +1910,13 @@
   - third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h
   name: absl/strings:cordz_update_tracker
   src: []
+- cmake_target: absl::has_ostream_operator
+  deps:
+  - absl/base:config
+  headers:
+  - third_party/abseil-cpp/absl/strings/has_ostream_operator.h
+  name: absl/strings:has_ostream_operator
+  src: []
 - cmake_target: absl::strings_internal
   deps:
   - absl/base:config
@@ -1839,7 +1925,6 @@
   - absl/base:raw_logging_internal
   - absl/meta:type_traits
   headers:
-  - third_party/abseil-cpp/absl/strings/internal/char_map.h
   - third_party/abseil-cpp/absl/strings/internal/escaping.h
   - third_party/abseil-cpp/absl/strings/internal/ostringstream.h
   - third_party/abseil-cpp/absl/strings/internal/resize_uninitialized.h
@@ -1851,7 +1936,12 @@
   - third_party/abseil-cpp/absl/strings/internal/utf8.cc
 - cmake_target: absl::str_format
   deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/base:nullability
   - absl/strings:str_format_internal
+  - absl/strings:string_view
+  - absl/types:span
   headers:
   - third_party/abseil-cpp/absl/strings/str_format.h
   name: absl/strings:str_format
@@ -1860,6 +1950,7 @@
   deps:
   - absl/base:config
   - absl/base:core_headers
+  - absl/container:fixed_array
   - absl/container:inlined_vector
   - absl/functional:function_ref
   - absl/meta:type_traits
@@ -1892,6 +1983,7 @@
   - absl/base:base
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:nullability
   - absl/base:throw_delegate
   headers:
   - third_party/abseil-cpp/absl/strings/string_view.h
@@ -1904,18 +1996,21 @@
   - absl/base:config
   - absl/base:core_headers
   - absl/base:endian
+  - absl/base:nullability
   - absl/base:raw_logging_internal
   - absl/base:throw_delegate
   - absl/memory:memory
   - absl/meta:type_traits
   - absl/numeric:bits
   - absl/numeric:int128
+  - absl/strings:charset
   - absl/strings:internal
   - absl/strings:string_view
   headers:
   - third_party/abseil-cpp/absl/strings/ascii.h
   - third_party/abseil-cpp/absl/strings/charconv.h
   - third_party/abseil-cpp/absl/strings/escaping.h
+  - third_party/abseil-cpp/absl/strings/has_absl_stringify.h
   - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
   - third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
   - third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h
@@ -2128,6 +2223,7 @@
   - third_party/abseil-cpp/absl/types/bad_variant_access.cc
 - cmake_target: absl::compare
   deps:
+  - absl/base:config
   - absl/base:core_headers
   - absl/meta:type_traits
   headers:
@@ -2139,6 +2235,7 @@
   - absl/base:base_internal
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:nullability
   - absl/memory:memory
   - absl/meta:type_traits
   - absl/types:bad_optional_access
@@ -2152,6 +2249,7 @@
   deps:
   - absl/algorithm:algorithm
   - absl/base:core_headers
+  - absl/base:nullability
   - absl/base:throw_delegate
   - absl/meta:type_traits
   headers:

src/boringssl/boringssl_prefix_symbols.h

@@ -1,4 +1,4 @@
-// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b
+// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: ae72a4514c7afd150596b0a80947f3ca9b8363b5
 
 // Copyright (c) 2018, Google Inc.
 //
@@ -470,6 +470,7 @@
 #define SSL_set_SSL_CTX BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_SSL_CTX)
 #define SSL_set_accept_state BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_accept_state)
 #define SSL_set_alpn_protos BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_alpn_protos)
+#define SSL_set_alps_use_new_codepoint BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_alps_use_new_codepoint)
 #define SSL_set_bio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_bio)
 #define SSL_set_cert_cb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_cert_cb)
 #define SSL_set_chain_and_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_chain_and_key)
@@ -822,6 +823,8 @@
 #define BIO_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_free)
 #define BIO_free_all BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_free_all)
 #define BIO_get_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_get_data)
+#define BIO_get_ex_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_get_ex_data)
+#define BIO_get_ex_new_index BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_get_ex_new_index)
 #define BIO_get_fd BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_get_fd)
 #define BIO_get_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_get_fp)
 #define BIO_get_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_get_init)
@@ -879,6 +882,7 @@
 #define BIO_set_conn_int_port BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_conn_int_port)
 #define BIO_set_conn_port BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_conn_port)
 #define BIO_set_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_data)
+#define BIO_set_ex_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_ex_data)
 #define BIO_set_fd BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_fd)
 #define BIO_set_flags BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_flags)
 #define BIO_set_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BIO_set_fp)
@@ -945,6 +949,7 @@
 #define BN_bn2dec BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_bn2dec)
 #define BN_bn2hex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_bn2hex)
 #define BN_bn2le_padded BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_bn2le_padded)
+#define BN_bn2lebinpad BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_bn2lebinpad)
 #define BN_bn2mpi BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_bn2mpi)
 #define BN_clear BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_clear)
 #define BN_clear_bit BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_clear_bit)
@@ -984,6 +989,7 @@
 #define BN_is_word BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_is_word)
 #define BN_is_zero BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_is_zero)
 #define BN_le2bn BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_le2bn)
+#define BN_lebin2bn BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_lebin2bn)
 #define BN_lshift BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_lshift)
 #define BN_lshift1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_lshift1)
 #define BN_marshal_asn1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_marshal_asn1)
@@ -1050,6 +1056,7 @@
 #define BN_zero BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BN_zero)
 #define BORINGSSL_function_hit BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BORINGSSL_function_hit)
 #define BORINGSSL_keccak BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BORINGSSL_keccak)
+#define BORINGSSL_keccak_absorb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BORINGSSL_keccak_absorb)
 #define BORINGSSL_keccak_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BORINGSSL_keccak_init)
 #define BORINGSSL_keccak_squeeze BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BORINGSSL_keccak_squeeze)
 #define BORINGSSL_self_test BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, BORINGSSL_self_test)
@@ -1074,6 +1081,7 @@
 #define CBB_add_asn1_uint64 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_asn1_uint64)
 #define CBB_add_asn1_uint64_with_tag BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_asn1_uint64_with_tag)
 #define CBB_add_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_bytes)
+#define CBB_add_latin1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_latin1)
 #define CBB_add_space BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_space)
 #define CBB_add_u16 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_u16)
 #define CBB_add_u16_length_prefixed BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_u16_length_prefixed)
@@ -1086,6 +1094,9 @@
 #define CBB_add_u64le BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_u64le)
 #define CBB_add_u8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_u8)
 #define CBB_add_u8_length_prefixed BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_u8_length_prefixed)
+#define CBB_add_ucs2_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_ucs2_be)
+#define CBB_add_utf32_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_utf32_be)
+#define CBB_add_utf8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_utf8)
 #define CBB_add_zeros BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_add_zeros)
 #define CBB_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_cleanup)
 #define CBB_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_data)
@@ -1095,6 +1106,7 @@
 #define CBB_finish_i2d BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_finish_i2d)
 #define CBB_flush BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_flush)
 #define CBB_flush_asn1_set_of BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_flush_asn1_set_of)
+#define CBB_get_utf8_len BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_get_utf8_len)
 #define CBB_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_init)
 #define CBB_init_fixed BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_init_fixed)
 #define CBB_len BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBB_len)
@@ -1117,6 +1129,7 @@
 #define CBS_get_asn1_uint64 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_asn1_uint64)
 #define CBS_get_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_bytes)
 #define CBS_get_last_u8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_last_u8)
+#define CBS_get_latin1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_latin1)
 #define CBS_get_optional_asn1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_optional_asn1)
 #define CBS_get_optional_asn1_bool BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_optional_asn1_bool)
 #define CBS_get_optional_asn1_octet_string BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_optional_asn1_octet_string)
@@ -1133,7 +1146,10 @@
 #define CBS_get_u64le BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_u64le)
 #define CBS_get_u8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_u8)
 #define CBS_get_u8_length_prefixed BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_u8_length_prefixed)
+#define CBS_get_ucs2_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_ucs2_be)
 #define CBS_get_until_first BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_until_first)
+#define CBS_get_utf32_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_utf32_be)
+#define CBS_get_utf8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_get_utf8)
 #define CBS_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_init)
 #define CBS_is_unsigned_asn1_integer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_is_unsigned_asn1_integer)
 #define CBS_is_valid_asn1_bitstring BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CBS_is_valid_asn1_bitstring)
@@ -1197,6 +1213,7 @@
 #define CRYPTO_cleanup_all_ex_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_cleanup_all_ex_data)
 #define CRYPTO_ctr128_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_ctr128_encrypt)
 #define CRYPTO_ctr128_encrypt_ctr32 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_ctr128_encrypt_ctr32)
+#define CRYPTO_fips_186_2_prf BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_fips_186_2_prf)
 #define CRYPTO_fork_detect_force_madv_wipeonfork_for_testing BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_fork_detect_force_madv_wipeonfork_for_testing)
 #define CRYPTO_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_free)
 #define CRYPTO_free_ex_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_free_ex_data)
@@ -1262,7 +1279,10 @@
 #define CTR_DRBG_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CTR_DRBG_init)
 #define CTR_DRBG_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CTR_DRBG_new)
 #define CTR_DRBG_reseed BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CTR_DRBG_reseed)
-#define ChaCha20_ctr32 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32)
+#define ChaCha20_ctr32_avx2 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_avx2)
+#define ChaCha20_ctr32_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_nohw)
+#define ChaCha20_ctr32_ssse3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3)
+#define ChaCha20_ctr32_ssse3_4x BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ChaCha20_ctr32_ssse3_4x)
 #define DES_decrypt3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_decrypt3)
 #define DES_ecb3_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb3_encrypt)
 #define DES_ecb_encrypt BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, DES_ecb_encrypt)
@@ -1955,6 +1975,7 @@
 #define OBJ_find_sigid_algs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_find_sigid_algs)
 #define OBJ_find_sigid_by_algs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_find_sigid_by_algs)
 #define OBJ_get0_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_get0_data)
+#define OBJ_get_undef BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_get_undef)
 #define OBJ_length BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_length)
 #define OBJ_ln2nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_ln2nid)
 #define OBJ_nid2cbb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_nid2cbb)
@@ -1968,6 +1989,7 @@
 #define OBJ_txt2obj BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OBJ_txt2obj)
 #define OPENSSL_add_all_algorithms_conf BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_add_all_algorithms_conf)
 #define OPENSSL_asprintf BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_asprintf)
+#define OPENSSL_calloc BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_calloc)
 #define OPENSSL_cleanse BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_cleanse)
 #define OPENSSL_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_cleanup)
 #define OPENSSL_clear_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_clear_free)
@@ -1975,6 +1997,7 @@
 #define OPENSSL_cpuid_setup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_cpuid_setup)
 #define OPENSSL_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_free)
 #define OPENSSL_fromxdigit BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_fromxdigit)
+#define OPENSSL_get_ia32cap BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_get_ia32cap)
 #define OPENSSL_gmtime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_gmtime)
 #define OPENSSL_gmtime_adj BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_gmtime_adj)
 #define OPENSSL_gmtime_diff BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_gmtime_diff)
@@ -2037,6 +2060,7 @@
 #define OPENSSL_tolower BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_tolower)
 #define OPENSSL_vasprintf BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_vasprintf)
 #define OPENSSL_vasprintf_internal BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_vasprintf_internal)
+#define OPENSSL_zalloc BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_zalloc)
 #define OTHERNAME_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OTHERNAME_free)
 #define OTHERNAME_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OTHERNAME_it)
 #define OTHERNAME_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OTHERNAME_new)
@@ -2190,6 +2214,7 @@
 #define RAND_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_bytes)
 #define RAND_bytes_with_additional_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_bytes_with_additional_data)
 #define RAND_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_cleanup)
+#define RAND_disable_fork_unsafe_buffering BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_disable_fork_unsafe_buffering)
 #define RAND_egd BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_egd)
 #define RAND_enable_fork_unsafe_buffering BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_enable_fork_unsafe_buffering)
 #define RAND_file_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, RAND_file_name)
@@ -2362,7 +2387,6 @@
 #define X509V3_EXT_nconf_nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_EXT_nconf_nid)
 #define X509V3_EXT_print BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_EXT_print)
 #define X509V3_EXT_print_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_EXT_print_fp)
-#define X509V3_EXT_val_prn BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_EXT_val_prn)
 #define X509V3_NAME_from_section BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_NAME_from_section)
 #define X509V3_add1_i2d BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_add1_i2d)
 #define X509V3_add_standard_extensions BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509V3_add_standard_extensions)
@@ -2416,7 +2440,6 @@
 #define X509_CRL_add_ext BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_add_ext)
 #define X509_CRL_cmp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_cmp)
 #define X509_CRL_delete_ext BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_delete_ext)
-#define X509_CRL_diff BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_diff)
 #define X509_CRL_digest BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_digest)
 #define X509_CRL_dup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_dup)
 #define X509_CRL_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_free)
@@ -2468,15 +2491,12 @@
 #define X509_EXTENSION_set_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_EXTENSION_set_data)
 #define X509_EXTENSION_set_object BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_EXTENSION_set_object)
 #define X509_INFO_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_INFO_free)
-#define X509_INFO_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_INFO_new)
-#define X509_LOOKUP_by_subject BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_by_subject)
+#define X509_LOOKUP_add_dir BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_add_dir)
 #define X509_LOOKUP_ctrl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_ctrl)
 #define X509_LOOKUP_file BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_file)
 #define X509_LOOKUP_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_free)
 #define X509_LOOKUP_hash_dir BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_hash_dir)
-#define X509_LOOKUP_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_init)
-#define X509_LOOKUP_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_new)
-#define X509_LOOKUP_shutdown BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_shutdown)
+#define X509_LOOKUP_load_file BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_LOOKUP_load_file)
 #define X509_NAME_ENTRIES_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_NAME_ENTRIES_it)
 #define X509_NAME_ENTRY_create_by_NID BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_NAME_ENTRY_create_by_NID)
 #define X509_NAME_ENTRY_create_by_OBJ BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_NAME_ENTRY_create_by_OBJ)
@@ -2516,25 +2536,20 @@
 #define X509_NAME_print_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_NAME_print_ex)
 #define X509_NAME_print_ex_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_NAME_print_ex_fp)
 #define X509_NAME_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_NAME_set)
+#define X509_OBJECT_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_free)
 #define X509_OBJECT_free_contents BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_free_contents)
 #define X509_OBJECT_get0_X509 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_get0_X509)
 #define X509_OBJECT_get_type BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_get_type)
-#define X509_OBJECT_idx_by_subject BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_idx_by_subject)
-#define X509_OBJECT_retrieve_by_subject BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_retrieve_by_subject)
-#define X509_OBJECT_retrieve_match BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_retrieve_match)
-#define X509_OBJECT_up_ref_count BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_up_ref_count)
-#define X509_PKEY_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PKEY_free)
-#define X509_PKEY_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PKEY_new)
+#define X509_OBJECT_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_OBJECT_new)
 #define X509_PUBKEY_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_free)
 #define X509_PUBKEY_get BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get)
+#define X509_PUBKEY_get0 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get0)
 #define X509_PUBKEY_get0_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get0_param)
 #define X509_PUBKEY_get0_public_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get0_public_key)
 #define X509_PUBKEY_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_it)
 #define X509_PUBKEY_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_new)
 #define X509_PUBKEY_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_set)
 #define X509_PUBKEY_set0_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_set0_param)
-#define X509_PURPOSE_add BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PURPOSE_add)
-#define X509_PURPOSE_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PURPOSE_cleanup)
 #define X509_PURPOSE_get0 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PURPOSE_get0)
 #define X509_PURPOSE_get0_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PURPOSE_get0_name)
 #define X509_PURPOSE_get0_sname BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PURPOSE_get0_sname)
@@ -2559,6 +2574,7 @@
 #define X509_REQ_dup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_dup)
 #define X509_REQ_extension_nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_extension_nid)
 #define X509_REQ_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_free)
+#define X509_REQ_get0_pubkey BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get0_pubkey)
 #define X509_REQ_get0_signature BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get0_signature)
 #define X509_REQ_get1_email BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get1_email)
 #define X509_REQ_get_attr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_attr)
@@ -2611,13 +2627,15 @@
 #define X509_STORE_CTX_get0_cert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_cert)
 #define X509_STORE_CTX_get0_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_chain)
 #define X509_STORE_CTX_get0_current_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_current_crl)
-#define X509_STORE_CTX_get0_current_issuer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_current_issuer)
 #define X509_STORE_CTX_get0_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_param)
 #define X509_STORE_CTX_get0_parent_ctx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_parent_ctx)
 #define X509_STORE_CTX_get0_store BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_store)
 #define X509_STORE_CTX_get0_untrusted BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get0_untrusted)
+#define X509_STORE_CTX_get1_certs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get1_certs)
 #define X509_STORE_CTX_get1_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get1_chain)
+#define X509_STORE_CTX_get1_crls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get1_crls)
 #define X509_STORE_CTX_get1_issuer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get1_issuer)
+#define X509_STORE_CTX_get_by_subject BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get_by_subject)
 #define X509_STORE_CTX_get_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get_chain)
 #define X509_STORE_CTX_get_current_cert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get_current_cert)
 #define X509_STORE_CTX_get_error BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get_error)
@@ -2626,11 +2644,9 @@
 #define X509_STORE_CTX_get_ex_new_index BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_get_ex_new_index)
 #define X509_STORE_CTX_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_init)
 #define X509_STORE_CTX_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_new)
-#define X509_STORE_CTX_purpose_inherit BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_purpose_inherit)
 #define X509_STORE_CTX_set0_crls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set0_crls)
 #define X509_STORE_CTX_set0_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set0_param)
 #define X509_STORE_CTX_set0_trusted_stack BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set0_trusted_stack)
-#define X509_STORE_CTX_set_cert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set_cert)
 #define X509_STORE_CTX_set_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set_chain)
 #define X509_STORE_CTX_set_default BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set_default)
 #define X509_STORE_CTX_set_depth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set_depth)
@@ -2643,49 +2659,24 @@
 #define X509_STORE_CTX_set_trust BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set_trust)
 #define X509_STORE_CTX_set_verify_cb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_set_verify_cb)
 #define X509_STORE_CTX_trusted_stack BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_trusted_stack)
-#define X509_STORE_CTX_zero BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_CTX_zero)
 #define X509_STORE_add_cert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_add_cert)
 #define X509_STORE_add_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_add_crl)
 #define X509_STORE_add_lookup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_add_lookup)
 #define X509_STORE_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_free)
 #define X509_STORE_get0_objects BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get0_objects)
 #define X509_STORE_get0_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get0_param)
-#define X509_STORE_get1_certs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get1_certs)
-#define X509_STORE_get1_crls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get1_crls)
-#define X509_STORE_get_by_subject BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_by_subject)
-#define X509_STORE_get_cert_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_cert_crl)
-#define X509_STORE_get_check_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_check_crl)
-#define X509_STORE_get_check_issued BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_check_issued)
-#define X509_STORE_get_check_revocation BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_check_revocation)
-#define X509_STORE_get_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_cleanup)
-#define X509_STORE_get_get_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_get_crl)
-#define X509_STORE_get_get_issuer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_get_issuer)
-#define X509_STORE_get_lookup_certs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_lookup_certs)
-#define X509_STORE_get_lookup_crls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_lookup_crls)
-#define X509_STORE_get_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_verify)
-#define X509_STORE_get_verify_cb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_get_verify_cb)
 #define X509_STORE_load_locations BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_load_locations)
 #define X509_STORE_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_new)
 #define X509_STORE_set1_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set1_param)
-#define X509_STORE_set_cert_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_cert_crl)
 #define X509_STORE_set_check_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_check_crl)
-#define X509_STORE_set_check_issued BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_check_issued)
-#define X509_STORE_set_check_revocation BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_check_revocation)
-#define X509_STORE_set_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_cleanup)
 #define X509_STORE_set_default_paths BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_default_paths)
 #define X509_STORE_set_depth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_depth)
 #define X509_STORE_set_flags BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_flags)
 #define X509_STORE_set_get_crl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_get_crl)
-#define X509_STORE_set_get_issuer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_get_issuer)
-#define X509_STORE_set_lookup_certs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_lookup_certs)
-#define X509_STORE_set_lookup_crls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_lookup_crls)
 #define X509_STORE_set_purpose BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_purpose)
 #define X509_STORE_set_trust BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_trust)
-#define X509_STORE_set_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_verify)
 #define X509_STORE_set_verify_cb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_set_verify_cb)
 #define X509_STORE_up_ref BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_STORE_up_ref)
-#define X509_TRUST_add BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_TRUST_add)
-#define X509_TRUST_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_TRUST_cleanup)
 #define X509_TRUST_get0 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_TRUST_get0)
 #define X509_TRUST_get0_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_TRUST_get0_name)
 #define X509_TRUST_get_by_id BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_TRUST_get_by_id)
@@ -2700,8 +2691,6 @@
 #define X509_VERIFY_PARAM_add1_host BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_add1_host)
 #define X509_VERIFY_PARAM_clear_flags BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_clear_flags)
 #define X509_VERIFY_PARAM_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_free)
-#define X509_VERIFY_PARAM_get0_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_get0_name)
-#define X509_VERIFY_PARAM_get0_peername BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_get0_peername)
 #define X509_VERIFY_PARAM_get_depth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_get_depth)
 #define X509_VERIFY_PARAM_get_flags BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_get_flags)
 #define X509_VERIFY_PARAM_inherit BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_inherit)
@@ -2712,7 +2701,6 @@
 #define X509_VERIFY_PARAM_set1_host BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set1_host)
 #define X509_VERIFY_PARAM_set1_ip BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set1_ip)
 #define X509_VERIFY_PARAM_set1_ip_asc BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set1_ip_asc)
-#define X509_VERIFY_PARAM_set1_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set1_name)
 #define X509_VERIFY_PARAM_set1_policies BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set1_policies)
 #define X509_VERIFY_PARAM_set_depth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set_depth)
 #define X509_VERIFY_PARAM_set_flags BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_VERIFY_PARAM_set_flags)
@@ -2755,6 +2743,7 @@
 #define X509_get0_extensions BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_extensions)
 #define X509_get0_notAfter BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_notAfter)
 #define X509_get0_notBefore BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_notBefore)
+#define X509_get0_pubkey BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_pubkey)
 #define X509_get0_pubkey_bitstr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_pubkey_bitstr)
 #define X509_get0_serialNumber BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_serialNumber)
 #define X509_get0_signature BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get0_signature)
@@ -2845,7 +2834,6 @@
 #define X509v3_get_ext_by_OBJ BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509v3_get_ext_by_OBJ)
 #define X509v3_get_ext_by_critical BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509v3_get_ext_by_critical)
 #define X509v3_get_ext_count BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509v3_get_ext_count)
-#define a2i_GENERAL_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, a2i_GENERAL_NAME)
 #define a2i_IPADDRESS BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, a2i_IPADDRESS)
 #define a2i_IPADDRESS_NC BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, a2i_IPADDRESS_NC)
 #define abi_test_bad_unwind_temporary BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, abi_test_bad_unwind_temporary)
@@ -2937,6 +2925,7 @@
 #define asn1_refcount_set_one BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_refcount_set_one)
 #define asn1_set_choice_selector BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_set_choice_selector)
 #define asn1_type_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_type_cleanup)
+#define asn1_type_set0_string BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_type_set0_string)
 #define asn1_type_value_as_pointer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_type_value_as_pointer)
 #define asn1_utctime_to_tm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_utctime_to_tm)
 #define beeu_mod_inverse_vartime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, beeu_mod_inverse_vartime)
@@ -2983,14 +2972,17 @@
 #define bn_mont_ctx_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mont_ctx_init)
 #define bn_mont_ctx_set_RR_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mont_ctx_set_RR_consttime)
 #define bn_mont_n0 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mont_n0)
+#define bn_mul4x_mont BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul4x_mont)
 #define bn_mul_add_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_add_words)
 #define bn_mul_comba4 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_comba4)
 #define bn_mul_comba8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_comba8)
 #define bn_mul_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_consttime)
 #define bn_mul_mont BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_mont)
 #define bn_mul_mont_gather5 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_mont_gather5)
+#define bn_mul_mont_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_mont_nohw)
 #define bn_mul_small BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_small)
 #define bn_mul_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mul_words)
+#define bn_mulx4x_mont BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_mulx4x_mont)
 #define bn_odd_number_is_obviously_composite BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_odd_number_is_obviously_composite)
 #define bn_one_to_montgomery BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_one_to_montgomery)
 #define bn_power5 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_power5)
@@ -3008,6 +3000,7 @@
 #define bn_set_static_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_set_static_words)
 #define bn_set_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_set_words)
 #define bn_sqr8x_internal BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_sqr8x_internal)
+#define bn_sqr8x_mont BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_sqr8x_mont)
 #define bn_sqr_comba4 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_sqr_comba4)
 #define bn_sqr_comba8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_sqr_comba8)
 #define bn_sqr_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_sqr_consttime)
@@ -3026,15 +3019,6 @@
 #define c2i_ASN1_BIT_STRING BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, c2i_ASN1_BIT_STRING)
 #define c2i_ASN1_INTEGER BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, c2i_ASN1_INTEGER)
 #define c2i_ASN1_OBJECT BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, c2i_ASN1_OBJECT)
-#define cbb_add_latin1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbb_add_latin1)
-#define cbb_add_ucs2_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbb_add_ucs2_be)
-#define cbb_add_utf32_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbb_add_utf32_be)
-#define cbb_add_utf8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbb_add_utf8)
-#define cbb_get_utf8_len BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbb_get_utf8_len)
-#define cbs_get_latin1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbs_get_latin1)
-#define cbs_get_ucs2_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbs_get_ucs2_be)
-#define cbs_get_utf32_be BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbs_get_utf32_be)
-#define cbs_get_utf8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, cbs_get_utf8)
 #define chacha20_poly1305_open BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, chacha20_poly1305_open)
 #define chacha20_poly1305_seal BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, chacha20_poly1305_seal)
 #define crypto_gcm_clmul_enabled BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, crypto_gcm_clmul_enabled)
@@ -3090,7 +3074,6 @@
 #define d2i_EC_PUBKEY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_EC_PUBKEY)
 #define d2i_EC_PUBKEY_bio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_EC_PUBKEY_bio)
 #define d2i_EC_PUBKEY_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_EC_PUBKEY_fp)
-#define d2i_EDIPARTYNAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_EDIPARTYNAME)
 #define d2i_EXTENDED_KEY_USAGE BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_EXTENDED_KEY_USAGE)
 #define d2i_GENERAL_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_GENERAL_NAME)
 #define d2i_GENERAL_NAMES BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_GENERAL_NAMES)
@@ -3098,7 +3081,6 @@
 #define d2i_NETSCAPE_SPKAC BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_NETSCAPE_SPKAC)
 #define d2i_NETSCAPE_SPKI BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_NETSCAPE_SPKI)
 #define d2i_NOTICEREF BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_NOTICEREF)
-#define d2i_OTHERNAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_OTHERNAME)
 #define d2i_PKCS12 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_PKCS12)
 #define d2i_PKCS12_bio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_PKCS12_bio)
 #define d2i_PKCS12_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_PKCS12_fp)
@@ -3144,7 +3126,6 @@
 #define d2i_X509_EXTENSION BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_EXTENSION)
 #define d2i_X509_EXTENSIONS BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_EXTENSIONS)
 #define d2i_X509_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_NAME)
-#define d2i_X509_NAME_ENTRY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_NAME_ENTRY)
 #define d2i_X509_PUBKEY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_PUBKEY)
 #define d2i_X509_REQ BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_REQ)
 #define d2i_X509_REQ_INFO BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, d2i_X509_REQ_INFO)
@@ -3263,6 +3244,8 @@
 #define ed25519_pkey_meth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ed25519_pkey_meth)
 #define fiat_curve25519_adx_mul BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, fiat_curve25519_adx_mul)
 #define fiat_curve25519_adx_square BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, fiat_curve25519_adx_square)
+#define fiat_p256_adx_mul BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, fiat_p256_adx_mul)
+#define fiat_p256_adx_sqr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, fiat_p256_adx_sqr)
 #define gcm_ghash_avx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, gcm_ghash_avx)
 #define gcm_ghash_clmul BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, gcm_ghash_clmul)
 #define gcm_ghash_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, gcm_ghash_nohw)
@@ -3276,7 +3259,6 @@
 #define gcm_init_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, gcm_init_nohw)
 #define gcm_init_ssse3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, gcm_init_ssse3)
 #define hkdf_pkey_meth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, hkdf_pkey_meth)
-#define i2a_ACCESS_DESCRIPTION BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2a_ACCESS_DESCRIPTION)
 #define i2a_ASN1_ENUMERATED BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2a_ASN1_ENUMERATED)
 #define i2a_ASN1_INTEGER BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2a_ASN1_INTEGER)
 #define i2a_ASN1_OBJECT BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2a_ASN1_OBJECT)
@@ -3334,7 +3316,6 @@
 #define i2d_EC_PUBKEY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_EC_PUBKEY)
 #define i2d_EC_PUBKEY_bio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_EC_PUBKEY_bio)
 #define i2d_EC_PUBKEY_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_EC_PUBKEY_fp)
-#define i2d_EDIPARTYNAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_EDIPARTYNAME)
 #define i2d_EXTENDED_KEY_USAGE BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_EXTENDED_KEY_USAGE)
 #define i2d_GENERAL_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_GENERAL_NAME)
 #define i2d_GENERAL_NAMES BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_GENERAL_NAMES)
@@ -3342,7 +3323,6 @@
 #define i2d_NETSCAPE_SPKAC BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_NETSCAPE_SPKAC)
 #define i2d_NETSCAPE_SPKI BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_NETSCAPE_SPKI)
 #define i2d_NOTICEREF BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_NOTICEREF)
-#define i2d_OTHERNAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_OTHERNAME)
 #define i2d_PKCS12 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_PKCS12)
 #define i2d_PKCS12_bio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_PKCS12_bio)
 #define i2d_PKCS12_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_PKCS12_fp)
@@ -3393,7 +3373,6 @@
 #define i2d_X509_EXTENSION BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_EXTENSION)
 #define i2d_X509_EXTENSIONS BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_EXTENSIONS)
 #define i2d_X509_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_NAME)
-#define i2d_X509_NAME_ENTRY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_NAME_ENTRY)
 #define i2d_X509_PUBKEY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_PUBKEY)
 #define i2d_X509_REQ BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_REQ)
 #define i2d_X509_REQ_INFO BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, i2d_X509_REQ_INFO)
@@ -3479,9 +3458,17 @@
 #define rsaz_1024_sqr_avx2 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, rsaz_1024_sqr_avx2)
 #define s2i_ASN1_INTEGER BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, s2i_ASN1_INTEGER)
 #define s2i_ASN1_OCTET_STRING BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, s2i_ASN1_OCTET_STRING)
-#define sha1_block_data_order BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha1_block_data_order)
-#define sha256_block_data_order BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha256_block_data_order)
-#define sha512_block_data_order BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha512_block_data_order)
+#define sha1_block_data_order_avx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha1_block_data_order_avx)
+#define sha1_block_data_order_avx2 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha1_block_data_order_avx2)
+#define sha1_block_data_order_hw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha1_block_data_order_hw)
+#define sha1_block_data_order_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha1_block_data_order_nohw)
+#define sha1_block_data_order_ssse3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha1_block_data_order_ssse3)
+#define sha256_block_data_order_avx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha256_block_data_order_avx)
+#define sha256_block_data_order_hw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha256_block_data_order_hw)
+#define sha256_block_data_order_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha256_block_data_order_nohw)
+#define sha256_block_data_order_ssse3 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha256_block_data_order_ssse3)
+#define sha512_block_data_order_avx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha512_block_data_order_avx)
+#define sha512_block_data_order_nohw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sha512_block_data_order_nohw)
 #define sk_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_free)
 #define sk_new_null BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_new_null)
 #define sk_num BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_num)
@@ -3490,6 +3477,42 @@
 #define sk_pop_free_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop_free_ex)
 #define sk_push BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_push)
 #define sk_value BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_value)
+#define spx_base_b BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_base_b)
+#define spx_copy_keypair_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_copy_keypair_addr)
+#define spx_fors_pk_from_sig BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_fors_pk_from_sig)
+#define spx_fors_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_fors_sign)
+#define spx_fors_sk_gen BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_fors_sk_gen)
+#define spx_fors_treehash BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_fors_treehash)
+#define spx_generate_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_generate_key)
+#define spx_generate_key_from_seed BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_generate_key_from_seed)
+#define spx_get_tree_index BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_get_tree_index)
+#define spx_ht_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_ht_sign)
+#define spx_ht_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_ht_verify)
+#define spx_set_chain_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_chain_addr)
+#define spx_set_hash_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_hash_addr)
+#define spx_set_keypair_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_keypair_addr)
+#define spx_set_layer_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_layer_addr)
+#define spx_set_tree_addr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_tree_addr)
+#define spx_set_tree_height BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_tree_height)
+#define spx_set_tree_index BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_tree_index)
+#define spx_set_type BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_set_type)
+#define spx_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_sign)
+#define spx_thash_f BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_f)
+#define spx_thash_h BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_h)
+#define spx_thash_hmsg BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_hmsg)
+#define spx_thash_prf BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_prf)
+#define spx_thash_prfmsg BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_prfmsg)
+#define spx_thash_tk BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_tk)
+#define spx_thash_tl BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_thash_tl)
+#define spx_to_uint64 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_to_uint64)
+#define spx_treehash BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_treehash)
+#define spx_uint64_to_len_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_uint64_to_len_bytes)
+#define spx_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_verify)
+#define spx_wots_pk_from_sig BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_wots_pk_from_sig)
+#define spx_wots_pk_gen BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_wots_pk_gen)
+#define spx_wots_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_wots_sign)
+#define spx_xmss_pk_from_sig BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_xmss_pk_from_sig)
+#define spx_xmss_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, spx_xmss_sign)
 #define v2i_GENERAL_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAME)
 #define v2i_GENERAL_NAMES BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAMES)
 #define v2i_GENERAL_NAME_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAME_ex)
@@ -3556,6 +3579,7 @@
 #define x25519_sc_reduce BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x25519_sc_reduce)
 #define x25519_scalar_mult_adx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x25519_scalar_mult_adx)
 #define x509V3_add_value_asn1_string BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509V3_add_value_asn1_string)
+#define x509_check_issued_with_callback BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509_check_issued_with_callback)
 #define x509_digest_sign_algorithm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509_digest_sign_algorithm)
 #define x509_digest_verify_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509_digest_verify_init)
 #define x509_print_rsa_pss_params BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509_print_rsa_pss_params)

src/compiler/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/BUILD

@@ -55,6 +55,23 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "event_engine_extensions",
+    hdrs = [
+        "lib/event_engine/extensions/can_track_errors.h",
+        "lib/event_engine/extensions/supports_fd.h",
+    ],
+    external_deps = [
+        "absl/status:statusor",
+        "absl/functional:any_invocable",
+        "absl/strings",
+    ],
+    deps = [
+        "//:event_engine_base_hdrs",
+        "//:gpr_platform",
+    ],
+)
+
 grpc_cc_library(
     name = "event_engine_common",
     srcs = [
@@ -64,6 +81,7 @@ grpc_cc_library(
         "lib/event_engine/slice_buffer.cc",
     ],
     hdrs = [
+        "lib/event_engine/extensions/can_track_errors.h",
         "lib/event_engine/handle_containers.h",
         "lib/event_engine/resolved_address_internal.h",
         "//:include/grpc/event_engine/slice.h",
@@ -1742,6 +1760,8 @@ grpc_cc_library(
         "absl/status:statusor",
     ],
     deps = [
+        "event_engine_extensions",
+        "event_engine_query_extensions",
         "//:event_engine_base_hdrs",
         "//:gpr",
     ],
@@ -2043,6 +2063,7 @@ grpc_cc_library(
     ],
     deps = [
         "event_engine_common",
+        "event_engine_extensions",
         "event_engine_tcp_socket_utils",
         "experiments",
         "iomgr_port",
@@ -6713,6 +6734,38 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "call_factory",
+    srcs = [
+        "lib/transport/call_factory.cc",
+    ],
+    hdrs = [
+        "lib/transport/call_factory.h",
+    ],
+    deps = [
+        "arena",
+        "call_size_estimator",
+        "call_spine",
+        "channel_args",
+        "ref_counted",
+        "resource_quota",
+        "//:gpr_platform",
+        "//:stats",
+    ],
+)
+
+grpc_cc_library(
+    name = "call_destination",
+    hdrs = [
+        "lib/transport/call_destination.h",
+    ],
+    deps = [
+        "call_spine",
+        "//:gpr_platform",
+        "//:orphanable",
+    ],
+)
+
 grpc_cc_library(
     name = "parsed_metadata",
     srcs = [
@@ -6767,6 +6820,30 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "call_spine",
+    srcs = [
+        "lib/transport/call_spine.cc",
+    ],
+    hdrs = [
+        "lib/transport/call_spine.h",
+    ],
+    deps = [
+        "1999",
+        "for_each",
+        "if",
+        "latch",
+        "message",
+        "metadata",
+        "pipe",
+        "prioritized_race",
+        "promise_status",
+        "status_flag",
+        "try_seq",
+        "//:gpr",
+    ],
+)
+
 grpc_cc_library(
     name = "metadata_batch",
     srcs = [
@@ -6823,6 +6900,17 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "call_size_estimator",
+    srcs = [
+        "lib/transport/call_size_estimator.cc",
+    ],
+    hdrs = [
+        "lib/transport/call_size_estimator.h",
+    ],
+    deps = ["//:gpr_platform"],
+)
+
 grpc_cc_library(
     name = "compression_internal",
     srcs = [

src/core/ext/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/filters/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/filters/client_channel/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/filters/client_channel/channel_connectivity.cc

@@ -67,8 +67,8 @@ grpc_connectivity_state grpc_channel_check_connectivity_state(
       (c_channel, try_to_connect));
   grpc_core::Channel* channel = grpc_core::Channel::FromC(c_channel);
   // Forward through to the underlying client channel.
-  grpc_core::ClientChannel* client_channel =
-      grpc_core::ClientChannel::GetFromChannel(channel);
+  grpc_core::ClientChannelFilter* client_channel =
+      grpc_core::ClientChannelFilter::GetFromChannel(channel);
   if (GPR_UNLIKELY(client_channel == nullptr)) {
     if (grpc_core::IsLameChannel(channel)) {
       return GRPC_CHANNEL_TRANSIENT_FAILURE;
@@ -83,8 +83,8 @@ grpc_connectivity_state grpc_channel_check_connectivity_state(
 
 int grpc_channel_num_external_connectivity_watchers(grpc_channel* c_channel) {
   grpc_core::Channel* channel = grpc_core::Channel::FromC(c_channel);
-  grpc_core::ClientChannel* client_channel =
-      grpc_core::ClientChannel::GetFromChannel(channel);
+  grpc_core::ClientChannelFilter* client_channel =
+      grpc_core::ClientChannelFilter::GetFromChannel(channel);
   if (client_channel == nullptr) {
     if (!grpc_core::IsLameChannel(channel)) {
       gpr_log(GPR_ERROR,
@@ -97,7 +97,7 @@ int grpc_channel_num_external_connectivity_watchers(grpc_channel* c_channel) {
 }
 
 int grpc_channel_support_connectivity_watcher(grpc_channel* channel) {
-  return grpc_core::ClientChannel::GetFromChannel(
+  return grpc_core::ClientChannelFilter::GetFromChannel(
              grpc_core::Channel::FromC(channel)) != nullptr;
 }
 
@@ -115,8 +115,8 @@ class StateWatcher : public DualRefCounted<StateWatcher> {
         state_(last_observed_state) {
     GPR_ASSERT(grpc_cq_begin_op(cq, tag));
     GRPC_CLOSURE_INIT(&on_complete_, WatchComplete, this, nullptr);
-    ClientChannel* client_channel =
-        ClientChannel::GetFromChannel(channel_.get());
+    ClientChannelFilter* client_channel =
+        ClientChannelFilter::GetFromChannel(channel_.get());
     if (client_channel == nullptr) {
       // If the target URI used to create the channel was invalid, channel
       // stack initialization failed, and that caused us to create a lame
@@ -145,7 +145,7 @@ class StateWatcher : public DualRefCounted<StateWatcher> {
 
  private:
   // A fire-and-forget object used to delay starting the timer until the
-  // ClientChannel actually starts the watch.
+  // ClientChannelFilter actually starts the watch.
   class WatcherTimerInitState {
    public:
     WatcherTimerInitState(StateWatcher* state_watcher, Timestamp deadline)
@@ -201,8 +201,8 @@ class StateWatcher : public DualRefCounted<StateWatcher> {
   void TimeoutComplete() {
     timer_fired_ = true;
     // If this is a client channel (not a lame channel), cancel the watch.
-    ClientChannel* client_channel =
-        ClientChannel::GetFromChannel(channel_.get());
+    ClientChannelFilter* client_channel =
+        ClientChannelFilter::GetFromChannel(channel_.get());
     if (client_channel != nullptr) {
       client_channel->CancelExternalConnectivityWatcher(&on_complete_);
     }

src/core/ext/filters/client_channel/client_channel.h

@@ -87,8 +87,8 @@
 // Channel arg key for server URI string.
 #define GRPC_ARG_SERVER_URI "grpc.server_uri"
 
-// Channel arg containing a pointer to the ClientChannel object.
-#define GRPC_ARG_CLIENT_CHANNEL "grpc.internal.client_channel"
+// Channel arg containing a pointer to the ClientChannelFilter object.
+#define GRPC_ARG_CLIENT_CHANNEL "grpc.internal.client_channel_filter"
 
 // Max number of batches that can be pending on a call at any given
 // time.  This includes one batch for each of the following ops:
@@ -102,7 +102,7 @@
 
 namespace grpc_core {
 
-class ClientChannel {
+class ClientChannelFilter {
  public:
   static const grpc_channel_filter kFilterVtableWithPromises;
   static const grpc_channel_filter kFilterVtableWithoutPromises;
@@ -115,9 +115,9 @@ class ClientChannel {
   struct RawPointerChannelArgTag {};
   static absl::string_view ChannelArgName() { return GRPC_ARG_CLIENT_CHANNEL; }
 
-  // Returns the ClientChannel object from channel, or null if channel
+  // Returns the ClientChannelFilter object from channel, or null if channel
   // is not a client channel.
-  static ClientChannel* GetFromChannel(Channel* channel);
+  static ClientChannelFilter* GetFromChannel(Channel* channel);
 
   static ArenaPromise<ServerMetadataHandle> MakeCallPromise(
       grpc_channel_element* elem, CallArgs call_args,
@@ -196,7 +196,7 @@ class ClientChannel {
   // via grpc_client_channel_watch_connectivity_state().
   class ExternalConnectivityWatcher : public ConnectivityStateWatcherInterface {
    public:
-    ExternalConnectivityWatcher(ClientChannel* chand,
+    ExternalConnectivityWatcher(ClientChannelFilter* chand,
                                 grpc_polling_entity pollent,
                                 grpc_connectivity_state* state,
                                 grpc_closure* on_complete,
@@ -205,7 +205,7 @@ class ClientChannel {
     ~ExternalConnectivityWatcher() override;
 
     // Removes the watcher from the external_watchers_ map.
-    static void RemoveWatcherFromExternalWatchersMap(ClientChannel* chand,
+    static void RemoveWatcherFromExternalWatchersMap(ClientChannelFilter* chand,
                                                      grpc_closure* on_complete,
                                                      bool cancel);
 
@@ -222,7 +222,7 @@ class ClientChannel {
     void RemoveWatcherLocked()
         ABSL_EXCLUSIVE_LOCKS_REQUIRED(*chand_->work_serializer_);
 
-    ClientChannel* chand_;
+    ClientChannelFilter* chand_;
     grpc_polling_entity pollent_;
     grpc_connectivity_state initial_state_;
     grpc_connectivity_state* state_;
@@ -231,8 +231,9 @@ class ClientChannel {
     std::atomic<bool> done_{false};
   };
 
-  ClientChannel(grpc_channel_element_args* args, grpc_error_handle* error);
-  ~ClientChannel();
+  ClientChannelFilter(grpc_channel_element_args* args,
+                      grpc_error_handle* error);
+  ~ClientChannelFilter();
 
   // Filter vtable functions.
   static grpc_error_handle Init(grpc_channel_element* elem,
@@ -378,15 +379,15 @@ class ClientChannel {
 };
 
 //
-// ClientChannel::LoadBalancedCall
+// ClientChannelFilter::LoadBalancedCall
 //
 
 // TODO(roth): As part of simplifying cancellation in the filter stack,
 // this should no longer need to be ref-counted.
-class ClientChannel::LoadBalancedCall
+class ClientChannelFilter::LoadBalancedCall
     : public InternallyRefCounted<LoadBalancedCall, UnrefCallDtor> {
  public:
-  LoadBalancedCall(ClientChannel* chand,
+  LoadBalancedCall(ClientChannelFilter* chand,
                    grpc_call_context_element* call_context,
                    absl::AnyInvocable<void()> on_commit,
                    bool is_transparent_retry);
@@ -396,15 +397,15 @@ class ClientChannel::LoadBalancedCall
 
   // Called by channel when removing a call from the list of queued calls.
   void RemoveCallFromLbQueuedCallsLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   // Called by the channel for each queued call when a new picker
   // becomes available.
   virtual void RetryPickLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_) = 0;
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_) = 0;
 
  protected:
-  ClientChannel* chand() const { return chand_; }
+  ClientChannelFilter* chand() const { return chand_; }
   ClientCallTracer::CallAttemptTracer* call_attempt_tracer() const {
     return static_cast<ClientCallTracer::CallAttemptTracer*>(
         call_context_[GRPC_CONTEXT_CALL_TRACER].value);
@@ -458,13 +459,13 @@ class ClientChannel::LoadBalancedCall
                           grpc_error_handle* error);
   // Adds the call to the channel's list of queued picks if not already present.
   void AddCallToLbQueuedCallsLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   // Called when adding the call to the LB queue.
   virtual void OnAddToQueueLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_) = 0;
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_) = 0;
 
-  ClientChannel* chand_;
+  ClientChannelFilter* chand_;
 
   absl::AnyInvocable<void()> on_commit_;
 
@@ -477,8 +478,8 @@ class ClientChannel::LoadBalancedCall
   grpc_call_context_element* const call_context_;
 };
 
-class ClientChannel::FilterBasedLoadBalancedCall
-    : public ClientChannel::LoadBalancedCall {
+class ClientChannelFilter::FilterBasedLoadBalancedCall
+    : public ClientChannelFilter::LoadBalancedCall {
  public:
   // If on_call_destruction_complete is non-null, then it will be
   // invoked once the LoadBalancedCall is completely destroyed.
@@ -486,7 +487,7 @@ class ClientChannel::FilterBasedLoadBalancedCall
   // the LB call has a subchannel call and ensuring that the
   // on_call_destruction_complete closure passed down from the surface
   // is not invoked until after the subchannel call stack is destroyed.
-  FilterBasedLoadBalancedCall(ClientChannel* chand,
+  FilterBasedLoadBalancedCall(ClientChannelFilter* chand,
                               const grpc_call_element_args& args,
                               grpc_polling_entity* pollent,
                               grpc_closure* on_call_destruction_complete,
@@ -555,10 +556,10 @@ class ClientChannel::FilterBasedLoadBalancedCall
   void TryPick(bool was_queued);
 
   void OnAddToQueueLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   void RetryPickLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   void CreateSubchannelCall();
 
@@ -579,9 +580,8 @@ class ClientChannel::FilterBasedLoadBalancedCall
   // Set when we fail inside the LB call.
   grpc_error_handle failure_error_;
 
-  // Accessed while holding ClientChannel::lb_mu_.
   LbQueuedCallCanceller* lb_call_canceller_
-      ABSL_GUARDED_BY(&ClientChannel::lb_mu_) = nullptr;
+      ABSL_GUARDED_BY(&ClientChannelFilter::lb_mu_) = nullptr;
 
   RefCountedPtr<SubchannelCall> subchannel_call_;
 
@@ -604,10 +604,10 @@ class ClientChannel::FilterBasedLoadBalancedCall
   grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {};
 };
 
-class ClientChannel::PromiseBasedLoadBalancedCall
-    : public ClientChannel::LoadBalancedCall {
+class ClientChannelFilter::PromiseBasedLoadBalancedCall
+    : public ClientChannelFilter::LoadBalancedCall {
  public:
-  PromiseBasedLoadBalancedCall(ClientChannel* chand,
+  PromiseBasedLoadBalancedCall(ClientChannelFilter* chand,
                                absl::AnyInvocable<void()> on_commit,
                                bool is_transparent_retry);
 
@@ -622,7 +622,7 @@ class ClientChannel::PromiseBasedLoadBalancedCall
   void RetryPickLocked() override;
 
   void OnAddToQueueLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   grpc_polling_entity pollent_;
   ClientMetadataHandle client_initial_metadata_;

src/core/ext/filters/client_channel/client_channel_internal.h

@@ -35,7 +35,7 @@
 //
 // This file contains internal interfaces used to allow various plugins
 // (filters, LB policies, etc) to access internal data provided by the
-// ClientChannel that is not normally accessible via external APIs.
+// ClientChannelFilter that is not normally accessible via external APIs.
 //
 
 // Channel arg key for health check service name.

src/core/ext/filters/client_channel/client_channel_plugin.cc

@@ -42,12 +42,12 @@ void BuildClientChannelConfiguration(CoreConfiguration::Builder* builder) {
   internal::RetryServiceConfigParser::Register(builder);
   builder->channel_init()
       ->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                       &ClientChannel::kFilterVtableWithPromises)
+                       &ClientChannelFilter::kFilterVtableWithPromises)
       .If(IsEverythingBelowClientChannelPromiseSafe)
       .Terminal();
   builder->channel_init()
       ->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                       &ClientChannel::kFilterVtableWithoutPromises)
+                       &ClientChannelFilter::kFilterVtableWithoutPromises)
       .IfNot(IsEverythingBelowClientChannelPromiseSafe)
       .Terminal();
 }

src/core/ext/filters/client_channel/lb_policy/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc

@@ -1592,8 +1592,8 @@ absl::Status GrpcLb::UpdateLocked(UpdateArgs args) {
     // Start watching the channel's connectivity state.  If the channel
     // goes into state TRANSIENT_FAILURE before the timer fires, we go into
     // fallback mode even if the fallback timeout has not elapsed.
-    ClientChannel* client_channel =
-        ClientChannel::GetFromChannel(Channel::FromC(lb_channel_));
+    ClientChannelFilter* client_channel =
+        ClientChannelFilter::GetFromChannel(Channel::FromC(lb_channel_));
     GPR_ASSERT(client_channel != nullptr);
     // Ref held by callback.
     watcher_ =
@@ -1659,8 +1659,8 @@ absl::Status GrpcLb::UpdateBalancerChannelLocked() {
 }
 
 void GrpcLb::CancelBalancerChannelConnectivityWatchLocked() {
-  ClientChannel* client_channel =
-      ClientChannel::GetFromChannel(Channel::FromC(lb_channel_));
+  ClientChannelFilter* client_channel =
+      ClientChannelFilter::GetFromChannel(Channel::FromC(lb_channel_));
   GPR_ASSERT(client_channel != nullptr);
   client_channel->RemoveConnectivityWatcher(watcher_);
 }

src/core/ext/filters/client_channel/lb_policy/rls/rls.cc

@@ -1557,8 +1557,8 @@ RlsLb::RlsChannel::RlsChannel(RefCountedPtr<RlsLb> lb_policy)
       parent_channelz_node_ = std::move(parent_channelz_node);
     }
     // Start connectivity watch.
-    ClientChannel* client_channel =
-        ClientChannel::GetFromChannel(Channel::FromC(channel_));
+    ClientChannelFilter* client_channel =
+        ClientChannelFilter::GetFromChannel(Channel::FromC(channel_));
     GPR_ASSERT(client_channel != nullptr);
     watcher_ = new StateWatcher(Ref(DEBUG_LOCATION, "StateWatcher"));
     client_channel->AddConnectivityWatcher(
@@ -1583,8 +1583,8 @@ void RlsLb::RlsChannel::Orphan() {
     }
     // Stop connectivity watch.
     if (watcher_ != nullptr) {
-      ClientChannel* client_channel =
-          ClientChannel::GetFromChannel(Channel::FromC(channel_));
+      ClientChannelFilter* client_channel =
+          ClientChannelFilter::GetFromChannel(Channel::FromC(channel_));
       GPR_ASSERT(client_channel != nullptr);
       client_channel->RemoveConnectivityWatcher(watcher_);
       watcher_ = nullptr;

src/core/ext/filters/client_channel/resolver/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/filters/client_channel/retry_filter.cc

@@ -98,7 +98,7 @@ namespace grpc_core {
 //
 
 RetryFilter::RetryFilter(const ChannelArgs& args, grpc_error_handle* error)
-    : client_channel_(args.GetObject<ClientChannel>()),
+    : client_channel_(args.GetObject<ClientChannelFilter>()),
       event_engine_(args.GetObject<EventEngine>()),
       per_rpc_retry_buffer_size_(GetMaxPerRpcRetryBufferSize(args)),
       service_config_parser_index_(

src/core/ext/filters/client_channel/retry_filter.h

@@ -72,7 +72,7 @@ class RetryFilter {
     return retry_throttle_data_;
   }
 
-  ClientChannel* client_channel() const { return client_channel_; }
+  ClientChannelFilter* client_channel() const { return client_channel_; }
 
   size_t per_rpc_retry_buffer_size() const {
     return per_rpc_retry_buffer_size_;
@@ -110,7 +110,7 @@ class RetryFilter {
   static void GetChannelInfo(grpc_channel_element* /*elem*/,
                              const grpc_channel_info* /*info*/) {}
 
-  ClientChannel* client_channel_;
+  ClientChannelFilter* client_channel_;
   grpc_event_engine::experimental::EventEngine* const event_engine_;
   size_t per_rpc_retry_buffer_size_;
   RefCountedPtr<internal::ServerRetryThrottleData> retry_throttle_data_;

src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc

@@ -310,8 +310,9 @@ namespace {
 void StartBatchInCallCombiner(void* arg, grpc_error_handle /*ignored*/) {
   grpc_transport_stream_op_batch* batch =
       static_cast<grpc_transport_stream_op_batch*>(arg);
-  auto* lb_call = static_cast<ClientChannel::FilterBasedLoadBalancedCall*>(
-      batch->handler_private.extra_arg);
+  auto* lb_call =
+      static_cast<ClientChannelFilter::FilterBasedLoadBalancedCall*>(
+          batch->handler_private.extra_arg);
   // Note: This will release the call combiner.
   lb_call->StartTransportStreamOpBatch(batch);
 }
@@ -1710,7 +1711,7 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch(
   call_attempt_->StartRetriableBatches();
 }
 
-OrphanablePtr<ClientChannel::FilterBasedLoadBalancedCall>
+OrphanablePtr<ClientChannelFilter::FilterBasedLoadBalancedCall>
 RetryFilter::LegacyCallData::CreateLoadBalancedCall(
     absl::AnyInvocable<void()> on_commit, bool is_transparent_retry) {
   grpc_call_element_args args = {owning_call_, nullptr,          call_context_,
@@ -2020,8 +2021,10 @@ void RetryFilter::LegacyCallData::OnRetryTimer() {
 void RetryFilter::LegacyCallData::OnRetryTimerLocked(
     void* arg, grpc_error_handle /*error*/) {
   auto* calld = static_cast<RetryFilter::LegacyCallData*>(arg);
-  calld->retry_timer_handle_.reset();
-  calld->CreateCallAttempt(/*is_transparent_retry=*/false);
+  if (calld->retry_timer_handle_.has_value()) {
+    calld->retry_timer_handle_.reset();
+    calld->CreateCallAttempt(/*is_transparent_retry=*/false);
+  }
   GRPC_CALL_STACK_UNREF(calld->owning_call_, "OnRetryTimer");
 }
 

src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h

@@ -256,7 +256,7 @@ class RetryFilter::LegacyCallData {
     void MaybeCancelPerAttemptRecvTimer();
 
     LegacyCallData* calld_;
-    OrphanablePtr<ClientChannel::FilterBasedLoadBalancedCall> lb_call_;
+    OrphanablePtr<ClientChannelFilter::FilterBasedLoadBalancedCall> lb_call_;
     bool lb_call_committed_ = false;
 
     grpc_closure on_per_attempt_recv_timer_;
@@ -363,7 +363,7 @@ class RetryFilter::LegacyCallData {
   void AddClosureToStartTransparentRetry(CallCombinerClosureList* closures);
   static void StartTransparentRetry(void* arg, grpc_error_handle error);
 
-  OrphanablePtr<ClientChannel::FilterBasedLoadBalancedCall>
+  OrphanablePtr<ClientChannelFilter::FilterBasedLoadBalancedCall>
   CreateLoadBalancedCall(absl::AnyInvocable<void()> on_commit,
                          bool is_transparent_retry);
 
@@ -394,7 +394,8 @@ class RetryFilter::LegacyCallData {
   // LB call used when we've committed to a call attempt and the retry
   // state for that attempt is no longer needed.  This provides a fast
   // path for long-running streaming calls that minimizes overhead.
-  OrphanablePtr<ClientChannel::FilterBasedLoadBalancedCall> committed_call_;
+  OrphanablePtr<ClientChannelFilter::FilterBasedLoadBalancedCall>
+      committed_call_;
 
   // When are are not yet fully committed to a particular call (i.e.,
   // either we might still retry or we have committed to the call but

src/core/ext/transport/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/transport/binder/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/transport/chttp2/transport/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/ext/xds/xds_api.cc

@@ -75,32 +75,29 @@ struct XdsApiContext {
   upb_Arena* arena;
 };
 
-void PopulateMetadataValue(const XdsApiContext& context,
-                           google_protobuf_Value* value_pb, const Json& value);
+void PopulateMetadataValue(google_protobuf_Value* value_pb, const Json& value,
+                           upb_Arena* arena);
 
-void PopulateListValue(const XdsApiContext& context,
-                       google_protobuf_ListValue* list_value,
-                       const Json::Array& values) {
+void PopulateListValue(google_protobuf_ListValue* list_value,
+                       const Json::Array& values, upb_Arena* arena) {
   for (const auto& value : values) {
-    auto* value_pb =
-        google_protobuf_ListValue_add_values(list_value, context.arena);
-    PopulateMetadataValue(context, value_pb, value);
+    auto* value_pb = google_protobuf_ListValue_add_values(list_value, arena);
+    PopulateMetadataValue(value_pb, value, arena);
   }
 }
 
-void PopulateMetadata(const XdsApiContext& context,
-                      google_protobuf_Struct* metadata_pb,
-                      const Json::Object& metadata) {
+void PopulateMetadata(google_protobuf_Struct* metadata_pb,
+                      const Json::Object& metadata, upb_Arena* arena) {
   for (const auto& p : metadata) {
-    google_protobuf_Value* value = google_protobuf_Value_new(context.arena);
-    PopulateMetadataValue(context, value, p.second);
+    google_protobuf_Value* value = google_protobuf_Value_new(arena);
+    PopulateMetadataValue(value, p.second, arena);
     google_protobuf_Struct_fields_set(
-        metadata_pb, StdStringToUpbString(p.first), value, context.arena);
+        metadata_pb, StdStringToUpbString(p.first), value, arena);
   }
 }
 
-void PopulateMetadataValue(const XdsApiContext& context,
-                           google_protobuf_Value* value_pb, const Json& value) {
+void PopulateMetadataValue(google_protobuf_Value* value_pb, const Json& value,
+                           upb_Arena* arena) {
   switch (value.type()) {
     case Json::Type::kNull:
       google_protobuf_Value_set_null_value(value_pb, 0);
@@ -118,65 +115,19 @@ void PopulateMetadataValue(const XdsApiContext& context,
       break;
     case Json::Type::kObject: {
       google_protobuf_Struct* struct_value =
-          google_protobuf_Value_mutable_struct_value(value_pb, context.arena);
-      PopulateMetadata(context, struct_value, value.object());
+          google_protobuf_Value_mutable_struct_value(value_pb, arena);
+      PopulateMetadata(struct_value, value.object(), arena);
       break;
     }
     case Json::Type::kArray: {
       google_protobuf_ListValue* list_value =
-          google_protobuf_Value_mutable_list_value(value_pb, context.arena);
-      PopulateListValue(context, list_value, value.array());
+          google_protobuf_Value_mutable_list_value(value_pb, arena);
+      PopulateListValue(list_value, value.array(), arena);
       break;
     }
   }
 }
 
-void PopulateNode(const XdsApiContext& context, const XdsBootstrap::Node* node,
-                  const std::string& user_agent_name,
-                  const std::string& user_agent_version,
-                  envoy_config_core_v3_Node* node_msg) {
-  if (node != nullptr) {
-    if (!node->id().empty()) {
-      envoy_config_core_v3_Node_set_id(node_msg,
-                                       StdStringToUpbString(node->id()));
-    }
-    if (!node->cluster().empty()) {
-      envoy_config_core_v3_Node_set_cluster(
-          node_msg, StdStringToUpbString(node->cluster()));
-    }
-    if (!node->metadata().empty()) {
-      google_protobuf_Struct* metadata =
-          envoy_config_core_v3_Node_mutable_metadata(node_msg, context.arena);
-      PopulateMetadata(context, metadata, node->metadata());
-    }
-    if (!node->locality_region().empty() || !node->locality_zone().empty() ||
-        !node->locality_sub_zone().empty()) {
-      envoy_config_core_v3_Locality* locality =
-          envoy_config_core_v3_Node_mutable_locality(node_msg, context.arena);
-      if (!node->locality_region().empty()) {
-        envoy_config_core_v3_Locality_set_region(
-            locality, StdStringToUpbString(node->locality_region()));
-      }
-      if (!node->locality_zone().empty()) {
-        envoy_config_core_v3_Locality_set_zone(
-            locality, StdStringToUpbString(node->locality_zone()));
-      }
-      if (!node->locality_sub_zone().empty()) {
-        envoy_config_core_v3_Locality_set_sub_zone(
-            locality, StdStringToUpbString(node->locality_sub_zone()));
-      }
-    }
-  }
-  envoy_config_core_v3_Node_set_user_agent_name(
-      node_msg, StdStringToUpbString(user_agent_name));
-  envoy_config_core_v3_Node_set_user_agent_version(
-      node_msg, StdStringToUpbString(user_agent_version));
-  envoy_config_core_v3_Node_add_client_features(
-      node_msg,
-      upb_StringView_FromString("envoy.lb.does_not_support_overprovisioning"),
-      context.arena);
-}
-
 void MaybeLogDiscoveryRequest(
     const XdsApiContext& context,
     const envoy_service_discovery_v3_DiscoveryRequest* request) {
@@ -203,6 +154,50 @@ std::string SerializeDiscoveryRequest(
 
 }  // namespace
 
+void XdsApi::PopulateNode(envoy_config_core_v3_Node* node_msg,
+                          upb_Arena* arena) {
+  if (node_ != nullptr) {
+    if (!node_->id().empty()) {
+      envoy_config_core_v3_Node_set_id(node_msg,
+                                       StdStringToUpbString(node_->id()));
+    }
+    if (!node_->cluster().empty()) {
+      envoy_config_core_v3_Node_set_cluster(
+          node_msg, StdStringToUpbString(node_->cluster()));
+    }
+    if (!node_->metadata().empty()) {
+      google_protobuf_Struct* metadata =
+          envoy_config_core_v3_Node_mutable_metadata(node_msg, arena);
+      PopulateMetadata(metadata, node_->metadata(), arena);
+    }
+    if (!node_->locality_region().empty() || !node_->locality_zone().empty() ||
+        !node_->locality_sub_zone().empty()) {
+      envoy_config_core_v3_Locality* locality =
+          envoy_config_core_v3_Node_mutable_locality(node_msg, arena);
+      if (!node_->locality_region().empty()) {
+        envoy_config_core_v3_Locality_set_region(
+            locality, StdStringToUpbString(node_->locality_region()));
+      }
+      if (!node_->locality_zone().empty()) {
+        envoy_config_core_v3_Locality_set_zone(
+            locality, StdStringToUpbString(node_->locality_zone()));
+      }
+      if (!node_->locality_sub_zone().empty()) {
+        envoy_config_core_v3_Locality_set_sub_zone(
+            locality, StdStringToUpbString(node_->locality_sub_zone()));
+      }
+    }
+  }
+  envoy_config_core_v3_Node_set_user_agent_name(
+      node_msg, StdStringToUpbString(user_agent_name_));
+  envoy_config_core_v3_Node_set_user_agent_version(
+      node_msg, StdStringToUpbString(user_agent_version_));
+  envoy_config_core_v3_Node_add_client_features(
+      node_msg,
+      upb_StringView_FromString("envoy.lb.does_not_support_overprovisioning"),
+      arena);
+}
+
 std::string XdsApi::CreateAdsRequest(
     absl::string_view type_url, absl::string_view version,
     absl::string_view nonce, const std::vector<std::string>& resource_names,
@@ -249,8 +244,7 @@ std::string XdsApi::CreateAdsRequest(
     envoy_config_core_v3_Node* node_msg =
         envoy_service_discovery_v3_DiscoveryRequest_mutable_node(request,
                                                                  arena.ptr());
-    PopulateNode(context, node_, user_agent_name_, user_agent_version_,
-                 node_msg);
+    PopulateNode(node_msg, arena.ptr());
     envoy_config_core_v3_Node_add_client_features(
         node_msg, upb_StringView_FromString("xds.config.resource-in-sotw"),
         context.arena);
@@ -393,7 +387,7 @@ std::string XdsApi::CreateLrsInitialRequest() {
   envoy_config_core_v3_Node* node_msg =
       envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(request,
                                                                 arena.ptr());
-  PopulateNode(context, node_, user_agent_name_, user_agent_version_, node_msg);
+  PopulateNode(node_msg, arena.ptr());
   envoy_config_core_v3_Node_add_client_features(
       node_msg,
       upb_StringView_FromString("envoy.lrs.supports_send_all_clusters"),
@@ -575,85 +569,4 @@ absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response,
   return absl::OkStatus();
 }
 
-namespace {
-
-google_protobuf_Timestamp* EncodeTimestamp(const XdsApiContext& context,
-                                           Timestamp value) {
-  google_protobuf_Timestamp* timestamp =
-      google_protobuf_Timestamp_new(context.arena);
-  gpr_timespec timespec = value.as_timespec(GPR_CLOCK_REALTIME);
-  google_protobuf_Timestamp_set_seconds(timestamp, timespec.tv_sec);
-  google_protobuf_Timestamp_set_nanos(timestamp, timespec.tv_nsec);
-  return timestamp;
-}
-
-}  // namespace
-
-std::string XdsApi::AssembleClientConfig(
-    const ResourceTypeMetadataMap& resource_type_metadata_map) {
-  upb::Arena arena;
-  // Create the ClientConfig for resource metadata from XdsClient
-  auto* client_config = envoy_service_status_v3_ClientConfig_new(arena.ptr());
-  // Fill-in the node information
-  auto* node = envoy_service_status_v3_ClientConfig_mutable_node(client_config,
-                                                                 arena.ptr());
-  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
-                                 arena.ptr()};
-  PopulateNode(context, node_, user_agent_name_, user_agent_version_, node);
-  // Dump each resource.
-  std::vector<std::string> type_url_storage;
-  for (const auto& p : resource_type_metadata_map) {
-    absl::string_view type_url = p.first;
-    const ResourceMetadataMap& resource_metadata_map = p.second;
-    type_url_storage.emplace_back(
-        absl::StrCat("type.googleapis.com/", type_url));
-    for (const auto& q : resource_metadata_map) {
-      absl::string_view resource_name = q.first;
-      const ResourceMetadata& metadata = *q.second;
-      auto* entry =
-          envoy_service_status_v3_ClientConfig_add_generic_xds_configs(
-              client_config, context.arena);
-      envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_type_url(
-          entry, StdStringToUpbString(type_url_storage.back()));
-      envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_name(
-          entry, StdStringToUpbString(resource_name));
-      envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_client_status(
-          entry, metadata.client_status);
-      if (!metadata.serialized_proto.empty()) {
-        envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_version_info(
-            entry, StdStringToUpbString(metadata.version));
-        envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_updated(
-            entry, EncodeTimestamp(context, metadata.update_time));
-        auto* any_field =
-            envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_xds_config(
-                entry, context.arena);
-        google_protobuf_Any_set_type_url(
-            any_field, StdStringToUpbString(type_url_storage.back()));
-        google_protobuf_Any_set_value(
-            any_field, StdStringToUpbString(metadata.serialized_proto));
-      }
-      if (metadata.client_status == XdsApi::ResourceMetadata::NACKED) {
-        auto* update_failure_state =
-            envoy_admin_v3_UpdateFailureState_new(context.arena);
-        envoy_admin_v3_UpdateFailureState_set_details(
-            update_failure_state,
-            StdStringToUpbString(metadata.failed_details));
-        envoy_admin_v3_UpdateFailureState_set_version_info(
-            update_failure_state,
-            StdStringToUpbString(metadata.failed_version));
-        envoy_admin_v3_UpdateFailureState_set_last_update_attempt(
-            update_failure_state,
-            EncodeTimestamp(context, metadata.failed_update_time));
-        envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_state(
-            entry, update_failure_state);
-      }
-    }
-  }
-  // Serialize the upb message to bytes
-  size_t output_length;
-  char* output = envoy_service_status_v3_ClientConfig_serialize(
-      client_config, arena.ptr(), &output_length);
-  return std::string(output, output_length);
-}
-
 }  // namespace grpc_core

src/core/ext/xds/xds_api.h

@@ -30,6 +30,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "envoy/admin/v3/config_dump_shared.upb.h"
+#include "envoy/service/status/v3/csds.upb.h"
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.hpp"
 
@@ -126,10 +127,6 @@ class XdsApi {
     // Timestamp of the last failed update attempt.
     Timestamp failed_update_time;
   };
-  using ResourceMetadataMap =
-      std::map<std::string /*resource_name*/, const ResourceMetadata*>;
-  using ResourceTypeMetadataMap =
-      std::map<absl::string_view /*type_url*/, ResourceMetadataMap>;
   static_assert(static_cast<ResourceMetadata::ClientResourceStatus>(
                     envoy_admin_v3_REQUESTED) ==
                     ResourceMetadata::ClientResourceStatus::REQUESTED,
@@ -176,9 +173,7 @@ class XdsApi {
                                 std::set<std::string>* cluster_names,
                                 Duration* load_reporting_interval);
 
-  // Assemble the client config proto message and return the serialized result.
-  std::string AssembleClientConfig(
-      const ResourceTypeMetadataMap& resource_type_metadata_map);
+  void PopulateNode(envoy_config_core_v3_Node* node_msg, upb_Arena* arena);
 
  private:
   XdsClient* client_;

src/core/ext/xds/xds_client.cc

@@ -34,11 +34,17 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
+#include "envoy/config/core/v3/base.upb.h"
+#include "envoy/service/status/v3/csds.upb.h"
+#include "google/protobuf/any.upb.h"
+#include "google/protobuf/timestamp.upb.h"
+#include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/log.h>
 
+#include "src/core/ext/xds/upb_utils.h"
 #include "src/core/ext/xds/xds_api.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_client_stats.h"
@@ -2032,25 +2038,86 @@ XdsApi::ClusterLoadReportMap XdsClient::BuildLoadReportSnapshotLocked(
   return snapshot_map;
 }
 
-std::string XdsClient::DumpClientConfigBinary() {
-  MutexLock lock(&mu_);
-  XdsApi::ResourceTypeMetadataMap resource_type_metadata_map;
+namespace {
+
+google_protobuf_Timestamp* EncodeTimestamp(Timestamp value, upb_Arena* arena) {
+  google_protobuf_Timestamp* timestamp = google_protobuf_Timestamp_new(arena);
+  gpr_timespec timespec = value.as_timespec(GPR_CLOCK_REALTIME);
+  google_protobuf_Timestamp_set_seconds(timestamp, timespec.tv_sec);
+  google_protobuf_Timestamp_set_nanos(timestamp, timespec.tv_nsec);
+  return timestamp;
+}
+
+void FillGenericXdsConfig(
+    const XdsApi::ResourceMetadata& metadata, upb_StringView type_url,
+    upb_StringView resource_name, upb_Arena* arena,
+    envoy_service_status_v3_ClientConfig_GenericXdsConfig* entry) {
+  envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_type_url(entry,
+                                                                     type_url);
+  envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_name(entry,
+                                                                 resource_name);
+  envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_client_status(
+      entry, metadata.client_status);
+  if (!metadata.serialized_proto.empty()) {
+    envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_version_info(
+        entry, StdStringToUpbString(metadata.version));
+    envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_updated(
+        entry, EncodeTimestamp(metadata.update_time, arena));
+    auto* any_field =
+        envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_xds_config(
+            entry, arena);
+    google_protobuf_Any_set_type_url(any_field, type_url);
+    google_protobuf_Any_set_value(
+        any_field, StdStringToUpbString(metadata.serialized_proto));
+  }
+  if (metadata.client_status == XdsApi::ResourceMetadata::NACKED) {
+    auto* update_failure_state = envoy_admin_v3_UpdateFailureState_new(arena);
+    envoy_admin_v3_UpdateFailureState_set_details(
+        update_failure_state, StdStringToUpbString(metadata.failed_details));
+    envoy_admin_v3_UpdateFailureState_set_version_info(
+        update_failure_state, StdStringToUpbString(metadata.failed_version));
+    envoy_admin_v3_UpdateFailureState_set_last_update_attempt(
+        update_failure_state,
+        EncodeTimestamp(metadata.failed_update_time, arena));
+    envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_state(
+        entry, update_failure_state);
+  }
+}
+
+}  // namespace
+
+void XdsClient::DumpClientConfig(
+    std::set<std::string>* string_pool, upb_Arena* arena,
+    envoy_service_status_v3_ClientConfig* client_config) {
+  // Assemble config dump messages
+  // Fill-in the node information
+  auto* node =
+      envoy_service_status_v3_ClientConfig_mutable_node(client_config, arena);
+  api_.PopulateNode(node, arena);
+  // Dump each resource.
   for (const auto& a : authority_state_map_) {  // authority
     const std::string& authority = a.first;
     for (const auto& t : a.second.resource_map) {  // type
       const XdsResourceType* type = t.first;
-      auto& resource_metadata_map =
-          resource_type_metadata_map[type->type_url()];
+      auto it =
+          string_pool
+              ->emplace(absl::StrCat("type.googleapis.com/", type->type_url()))
+              .first;
+      upb_StringView type_url = StdStringToUpbString(*it);
       for (const auto& r : t.second) {  // resource id
-        const XdsResourceKey& resource_key = r.first;
-        const ResourceState& resource_state = r.second;
-        resource_metadata_map[ConstructFullXdsResourceName(
-            authority, type->type_url(), resource_key)] = &resource_state.meta;
+        auto it2 = string_pool
+                       ->emplace(ConstructFullXdsResourceName(
+                           authority, type->type_url(), r.first))
+                       .first;
+        upb_StringView resource_name = StdStringToUpbString(*it2);
+        envoy_service_status_v3_ClientConfig_GenericXdsConfig* entry =
+            envoy_service_status_v3_ClientConfig_add_generic_xds_configs(
+                client_config, arena);
+        FillGenericXdsConfig(r.second.meta, type_url, resource_name, arena,
+                             entry);
       }
     }
   }
-  // Assemble config dump messages
-  return api_.AssembleClientConfig(resource_type_metadata_map);
 }
 
 }  // namespace grpc_core

src/core/ext/xds/xds_client.h

@@ -51,6 +51,10 @@
 
 namespace grpc_core {
 
+namespace testing {
+class XdsClientTestPeer;
+}
+
 extern TraceFlag grpc_xds_client_trace;
 extern TraceFlag grpc_xds_client_refcount_trace;
 
@@ -147,20 +151,23 @@ class XdsClient : public DualRefCounted<XdsClient> {
   // Resets connection backoff state.
   void ResetBackoff();
 
-  // Dumps the active xDS config in JSON format.
-  // Individual xDS resource is encoded as envoy.admin.v3.*ConfigDump. Returns
-  // envoy.service.status.v3.ClientConfig which also includes the config
-  // status (e.g., CLIENT_REQUESTED, CLIENT_ACKED, CLIENT_NACKED).
-  //
-  // Expected to be invoked by wrapper languages in their CSDS service
-  // implementation.
-  std::string DumpClientConfigBinary();
-
   grpc_event_engine::experimental::EventEngine* engine() {
     return engine_.get();
   }
 
+ protected:
+  // Dumps the active xDS config to the provided
+  // envoy.service.status.v3.ClientConfig message including the config status
+  // (e.g., CLIENT_REQUESTED, CLIENT_ACKED, CLIENT_NACKED).
+  void DumpClientConfig(std::set<std::string>* string_pool, upb_Arena* arena,
+                        envoy_service_status_v3_ClientConfig* client_config)
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_);
+
+  Mutex* mu() ABSL_LOCK_RETURNED(&mu_) { return &mu_; }
+
  private:
+  friend testing::XdsClientTestPeer;
+
   struct XdsResourceKey {
     std::string id;
     std::vector<URI::QueryParam> query_params;

src/core/ext/xds/xds_client_grpc.cc

@@ -19,15 +19,19 @@
 #include "src/core/ext/xds/xds_client_grpc.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "envoy/service/status/v3/csds.upb.h"
+#include "upb/base/string_view.h"
 
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -36,9 +40,12 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
+#include "src/core/ext/xds/upb_utils.h"
+#include "src/core/ext/xds/xds_api.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_channel_args.h"
+#include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_transport.h"
 #include "src/core/ext/xds/xds_transport_grpc.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -133,6 +140,19 @@ absl::StatusOr<std::string> GetBootstrapContents(const char* fallback_config) {
       "not defined");
 }
 
+std::vector<RefCountedPtr<GrpcXdsClient>> GetAllXdsClients() {
+  MutexLock lock(g_mu);
+  std::vector<RefCountedPtr<GrpcXdsClient>> xds_clients;
+  if (g_xds_client != nullptr) {
+    auto xds_client =
+        g_xds_client->RefIfNonZero(DEBUG_LOCATION, "DumpAllClientConfigs");
+    if (xds_client != nullptr) {
+      xds_clients.emplace_back(xds_client.TakeAsSubclass<GrpcXdsClient>());
+    }
+  }
+  return xds_clients;
+}
+
 }  // namespace
 
 absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
@@ -178,6 +198,34 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
   return xds_client;
 }
 
+// ABSL_NO_THREAD_SAFETY_ANALYSIS because we have to manually manage locks for
+// individual XdsClients and compiler struggles with checking the validity
+grpc_slice GrpcXdsClient::DumpAllClientConfigs()
+    ABSL_NO_THREAD_SAFETY_ANALYSIS {
+  auto xds_clients = GetAllXdsClients();
+  upb::Arena arena;
+  // Contains strings that should survive till serialization
+  std::set<std::string> string_pool;
+  auto response = envoy_service_status_v3_ClientStatusResponse_new(arena.ptr());
+  // We lock each XdsClient mutex till we are done with the serialization to
+  // ensure that all data referenced from the UPB proto message stays alive.
+  for (const auto& xds_client : xds_clients) {
+    auto client_config =
+        envoy_service_status_v3_ClientStatusResponse_add_config(response,
+                                                                arena.ptr());
+    xds_client->mu()->Lock();
+    xds_client->DumpClientConfig(&string_pool, arena.ptr(), client_config);
+  }
+  // Serialize the upb message to bytes
+  size_t output_length;
+  char* output = envoy_service_status_v3_ClientStatusResponse_serialize(
+      response, arena.ptr(), &output_length);
+  for (const auto& xds_client : xds_clients) {
+    xds_client->mu()->Unlock();
+  }
+  return grpc_slice_from_cpp_string(std::string(output, output_length));
+}
+
 GrpcXdsClient::GrpcXdsClient(
     std::unique_ptr<GrpcXdsBootstrap> bootstrap, const ChannelArgs& args,
     OrphanablePtr<XdsTransportFactory> transport_factory)
@@ -233,11 +281,5 @@ void SetXdsFallbackBootstrapConfig(const char* config) {
 grpc_slice grpc_dump_xds_configs(void) {
   grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
   grpc_core::ExecCtx exec_ctx;
-  auto xds_client = grpc_core::GrpcXdsClient::GetOrCreate(
-      grpc_core::ChannelArgs(), "grpc_dump_xds_configs()");
-  if (!xds_client.ok()) {
-    // If we aren't using xDS, just return an empty string.
-    return grpc_empty_slice();
-  }
-  return grpc_slice_from_cpp_string((*xds_client)->DumpClientConfigBinary());
+  return grpc_core::GrpcXdsClient::DumpAllClientConfigs();
 }

src/core/ext/xds/xds_client_grpc.h

@@ -45,6 +45,9 @@ class GrpcXdsClient : public XdsClient {
   static absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GetOrCreate(
       const ChannelArgs& args, const char* reason);
 
+  // Builds ClientStatusResponse containing all resources from all XdsClients
+  static grpc_slice DumpAllClientConfigs();
+
   // Do not instantiate directly -- use GetOrCreate() instead.
   // TODO(roth): The transport factory is injectable here to support
   // tests that want to use a fake transport factory with code that

src/core/ext/xds/xds_transport_grpc.cc

@@ -281,8 +281,8 @@ GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport(
   if (IsLameChannel(channel_)) {
     *status = absl::UnavailableError("xds client has a lame channel");
   } else {
-    ClientChannel* client_channel =
-        ClientChannel::GetFromChannel(Channel::FromC(channel_));
+    ClientChannelFilter* client_channel =
+        ClientChannelFilter::GetFromChannel(Channel::FromC(channel_));
     GPR_ASSERT(client_channel != nullptr);
     watcher_ = new StateWatcher(std::move(on_connectivity_failure));
     client_channel->AddConnectivityWatcher(
@@ -297,8 +297,8 @@ GrpcXdsTransportFactory::GrpcXdsTransport::~GrpcXdsTransport() {
 
 void GrpcXdsTransportFactory::GrpcXdsTransport::Orphan() {
   if (!IsLameChannel(channel_)) {
-    ClientChannel* client_channel =
-        ClientChannel::GetFromChannel(Channel::FromC(channel_));
+    ClientChannelFilter* client_channel =
+        ClientChannelFilter::GetFromChannel(Channel::FromC(channel_));
     GPR_ASSERT(client_channel != nullptr);
     client_channel->RemoveConnectivityWatcher(watcher_);
   }

src/core/lib/event_engine/extensions/can_track_errors.h

@@ -0,0 +1,40 @@
+// Copyright 2024 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/strings/string_view.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+class EndpointCanTrackErrorsExtension {
+ public:
+  virtual ~EndpointCanTrackErrorsExtension() = default;
+  static absl::string_view EndpointExtensionName() {
+    return "io.grpc.event_engine.extension.can_track_errors";
+  }
+
+  /// Returns if the Endpoint supports tracking events from errmsg queues on
+  /// posix systems.
+  virtual bool CanTrackErrors() = 0;
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H

src/core/lib/event_engine/extensions/supports_fd.h

@@ -0,0 +1,160 @@
+// Copyright 2024 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+namespace grpc_event_engine {
+namespace experimental {
+
+class EndpointSupportsFdExtension {
+ public:
+  virtual ~EndpointSupportsFdExtension() = default;
+  static absl::string_view EndpointExtensionName() {
+    return "io.grpc.event_engine.extension.endpoint_supports_fd";
+  }
+  /// Returns the file descriptor associated with the posix endpoint.
+  virtual int GetWrappedFd() = 0;
+
+  /// Shutdown the endpoint. This function call should trigger execution of
+  /// any pending endpoint Read/Write callbacks with appropriate error
+  /// absl::Status. After this function call any subsequent endpoint
+  /// Read/Write operations until endpoint deletion should fail with an
+  /// appropriate absl::Status.
+  ///
+  /// \a on_release_fd - If specified, the callback is invoked when the
+  /// endpoint is destroyed/deleted. The underlying file descriptor is
+  /// released instead of being closed. The callback will get the released
+  /// file descriptor as its argument if the release operation is successful.
+  /// Otherwise it would get an appropriate error status as its argument.
+  virtual void Shutdown(absl::AnyInvocable<void(absl::StatusOr<int> release_fd)>
+                            on_release_fd) = 0;
+};
+
+class ListenerSupportsFdExtension {
+ public:
+  virtual ~ListenerSupportsFdExtension() = default;
+  static absl::string_view EndpointExtensionName() {
+    return "io.grpc.event_engine.extension.listener_supports_fd";
+  }
+  /// Called when a posix listener bind operation completes. A single bind
+  /// operation may trigger creation of multiple listener fds. This callback
+  /// should be invoked once on each newly created and bound fd. If the
+  /// corresponding bind operation fails for a particular fd, this callback
+  /// must be invoked with a absl::FailedPreConditionError status.
+  ///
+  /// \a listener_fd - The listening socket fd that was bound to the specified
+  /// address.
+  using OnPosixBindNewFdCallback =
+      absl::AnyInvocable<void(absl::StatusOr<int> listener_fd)>;
+  /// Bind an address/port to this Listener.
+  ///
+  /// It is expected that multiple addresses/ports can be bound to this
+  /// Listener before Listener::Start has been called. Returns either the
+  /// bound port or an appropriate error status.
+  /// \a addr - The address to listen for incoming connections.
+  /// \a on_bind_new_fd The callback is invoked once for each newly bound
+  /// listener fd that may be created by this Bind operation.
+  virtual absl::StatusOr<int> BindWithFd(
+      const EventEngine::ResolvedAddress& addr,
+      OnPosixBindNewFdCallback on_bind_new_fd) = 0;
+
+  /// Handle an externally accepted client connection. It must return an
+  /// appropriate error status in case of failure.
+  ///
+  /// This may be invoked to process a new client connection accepted by an
+  /// external listening fd.
+  /// \a listener_fd - The external listening socket fd that accepted the new
+  /// client connection.
+  /// \a fd - The socket file descriptor representing the new client
+  /// connection.
+  /// \a pending_data - If specified, it holds any pending data that may have
+  /// already been read over the externally accepted client connection.
+  /// Otherwise, it is assumed that no data has been read over the new client
+  /// connection.
+  virtual absl::Status HandleExternalConnection(int listener_fd, int fd,
+                                                SliceBuffer* pending_data) = 0;
+
+  /// Shutdown/stop listening on all bind Fds.
+  virtual void ShutdownListeningFds() = 0;
+};
+
+class EventEngineSupportsFdExtension {
+ public:
+  virtual ~EventEngineSupportsFdExtension() = default;
+  static absl::string_view EndpointExtensionName() {
+    return "io.grpc.event_engine.extension.event_engine_supports_fd";
+  }
+  /// Creates a posix specific EventEngine::Endpoint from an fd which is already
+  /// assumed to be connected to a remote peer. \a fd - The connected socket
+  /// file descriptor. \a config - Additional configuration to applied to the
+  /// endpoint. \a memory_allocator - The endpoint may use the provided memory
+  /// allocator to track memory allocations.
+  virtual std::unique_ptr<EventEngine::Endpoint> CreatePosixEndpointFromFd(
+      int fd, const EndpointConfig& config,
+      MemoryAllocator memory_allocator) = 0;
+
+  /// Called when the posix listener has accepted a new client connection.
+  /// \a listener_fd - The listening socket fd that accepted the new client
+  /// connection.
+  /// \a endpoint - The EventEngine endpoint to handle data exchange over the
+  /// new client connection.
+  /// \a is_external - A boolean indicating whether the new client connection
+  /// is accepted by an external listener_fd or by a listener_fd that is
+  /// managed by the EventEngine listener.
+  /// \a memory_allocator - The callback may use the provided memory
+  /// allocator to handle memory allocation operations.
+  /// \a pending_data - If specified, it holds any pending data that may have
+  /// already been read over the new client connection. Otherwise, it is
+  /// assumed that no data has been read over the new client connection.
+  using PosixAcceptCallback = absl::AnyInvocable<void(
+      int listener_fd, std::unique_ptr<EventEngine::Endpoint> endpoint,
+      bool is_external, MemoryAllocator memory_allocator,
+      SliceBuffer* pending_data)>;
+
+  /// Factory method to create a posix specific network listener / server with
+  /// fd support.
+  ///
+  /// Once a \a Listener is created and started, the \a on_accept callback will
+  /// be called once asynchronously for each established connection. This method
+  /// may return a non-OK status immediately if an error was encountered in any
+  /// synchronous steps required to create the Listener. In this case,
+  /// \a on_shutdown will never be called.
+  ///
+  /// If this method returns a Listener, then \a on_shutdown will be invoked
+  /// exactly once, when the Listener is shut down. The status passed to it will
+  /// indicate if there was a problem during shutdown.
+  ///
+  /// The provided \a MemoryAllocatorFactory is used to create \a
+  /// MemoryAllocators for Endpoint construction.
+  virtual absl::StatusOr<std::unique_ptr<EventEngine::Listener>>
+  CreatePosixListener(
+      PosixAcceptCallback on_accept,
+      absl::AnyInvocable<void(absl::Status)> on_shutdown,
+      const EndpointConfig& config,
+      std::unique_ptr<MemoryAllocatorFactory> memory_allocator_factory) = 0;
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H

src/core/lib/event_engine/forkable.cc

@@ -43,13 +43,15 @@ bool IsForkEnabled() {
 void ObjectGroupForkHandler::RegisterForkable(
     std::shared_ptr<Forkable> forkable, GRPC_UNUSED void (*prepare)(void),
     GRPC_UNUSED void (*parent)(void), GRPC_UNUSED void (*child)(void)) {
-  GPR_ASSERT(!is_forking_);
-  forkables_.emplace_back(forkable);
+  if (IsForkEnabled()) {
+    GPR_ASSERT(!is_forking_);
+    forkables_.emplace_back(forkable);
 #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
-  if (!std::exchange(registered_, true)) {
-    pthread_atfork(prepare, parent, child);
-  }
+    if (!std::exchange(registered_, true)) {
+      pthread_atfork(prepare, parent, child);
+    }
 #endif  // GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
+  }
 }
 
 void ObjectGroupForkHandler::Prefork() {

src/core/lib/event_engine/posix.h

@@ -16,145 +16,34 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <memory>
-
-#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/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/event_engine/slice_buffer.h>
 
+#include "src/core/lib/event_engine/extensions/can_track_errors.h"
+#include "src/core/lib/event_engine/extensions/supports_fd.h"
+#include "src/core/lib/event_engine/query_extensions.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
 /// This defines an interface that posix specific EventEngines endpoints
 /// may implement to support additional file descriptor related functionality.
-class PosixEndpointWithFdSupport : public EventEngine::Endpoint {
- public:
-  /// Returns the file descriptor associated with the posix endpoint.
-  virtual int GetWrappedFd() = 0;
-
-  /// Returns if the Endpoint supports tracking events from errmsg queues on
-  /// posix systems.
-  virtual bool CanTrackErrors() = 0;
-
-  /// Shutdown the endpoint. This function call should trigger execution of
-  /// any pending endpoint Read/Write callbacks with appropriate error
-  /// absl::Status. After this function call any subsequent endpoint
-  /// Read/Write operations until endpoint deletion should fail with an
-  /// appropriate absl::Status.
-  ///
-  /// \a on_release_fd - If specifed, the callback is invoked when the
-  /// endpoint is destroyed/deleted. The underlying file descriptor is
-  /// released instead of being closed. The callback will get the released
-  /// file descriptor as its argument if the release operation is successful.
-  /// Otherwise it would get an appropriate error status as its argument.
-  virtual void Shutdown(absl::AnyInvocable<void(absl::StatusOr<int> release_fd)>
-                            on_release_fd) = 0;
-};
+class PosixEndpointWithFdSupport
+    : public ExtendedType<EventEngine::Endpoint, EndpointSupportsFdExtension,
+                          EndpointCanTrackErrorsExtension> {};
 
 /// Defines an interface that posix EventEngine listeners may implement to
 /// support additional file descriptor related functionality.
-class PosixListenerWithFdSupport : public EventEngine::Listener {
- public:
-  /// Called when a posix listener bind operation completes. A single bind
-  /// operation may trigger creation of multiple listener fds. This callback
-  /// should be invoked once on each newly created and bound fd. If the
-  /// corresponding bind operation fails for a particular fd, this callback
-  /// must be invoked with a absl::FailedPreConditionError status.
-  ///
-  /// \a listener_fd - The listening socket fd that was bound to the specified
-  /// address.
-  using OnPosixBindNewFdCallback =
-      absl::AnyInvocable<void(absl::StatusOr<int> listener_fd)>;
-  /// Bind an address/port to this Listener.
-  ///
-  /// It is expected that multiple addresses/ports can be bound to this
-  /// Listener before Listener::Start has been called. Returns either the
-  /// bound port or an appropriate error status.
-  /// \a addr - The address to listen for incoming connections.
-  /// \a on_bind_new_fd The callback is invoked once for each newly bound
-  /// listener fd that may be created by this Bind operation.
-  virtual absl::StatusOr<int> BindWithFd(
-      const EventEngine::ResolvedAddress& addr,
-      OnPosixBindNewFdCallback on_bind_new_fd) = 0;
-
-  /// Handle an externally accepted client connection. It must return an
-  /// appropriate error status in case of failure.
-  ///
-  /// This may be invoked to process a new client connection accepted by an
-  /// external listening fd.
-  /// \a listener_fd - The external listening socket fd that accepted the new
-  /// client connection.
-  /// \a fd - The socket file descriptor representing the new client
-  /// connection.
-  /// \a pending_data - If specified, it holds any pending data that may have
-  /// already been read over the externally accepted client connection.
-  /// Otherwise, it is assumed that no data has been read over the new client
-  /// connection.
-  virtual absl::Status HandleExternalConnection(int listener_fd, int fd,
-                                                SliceBuffer* pending_data) = 0;
-
-  /// Shutdown/stop listening on all bind Fds.
-  virtual void ShutdownListeningFds() = 0;
+class PosixListenerWithFdSupport
+    : public ExtendedType<EventEngine::Listener, ListenerSupportsFdExtension> {
 };
 
 /// Defines an interface that posix EventEngines may implement to
 /// support additional file descriptor related functionality.
-class PosixEventEngineWithFdSupport : public EventEngine {
- public:
-  /// Creates a posix specific EventEngine::Endpoint from an fd which is already
-  /// assumed to be connected to a remote peer. \a fd - The connected socket
-  /// file descriptor. \a config - Additional configuration to applied to the
-  /// endpoint. \a memory_allocator - The endpoint may use the provided memory
-  /// allocator to track memory allocations.
-  virtual std::unique_ptr<PosixEndpointWithFdSupport> CreatePosixEndpointFromFd(
-      int fd, const EndpointConfig& config,
-      MemoryAllocator memory_allocator) = 0;
-
-  /// Called when the posix listener has accepted a new client connection.
-  /// \a listener_fd - The listening socket fd that accepted the new client
-  /// connection.
-  /// \a endpoint - The EventEngine endpoint to handle data exchange over the
-  /// new client connection.
-  /// \a is_external - A boolean indicating whether the new client connection
-  /// is accepted by an external listener_fd or by a listener_fd that is
-  /// managed by the EventEngine listener.
-  /// \a memory_allocator - The callback may use the provided memory
-  /// allocator to handle memory allocation operations.
-  /// \a pending_data - If specified, it holds any pending data that may have
-  /// already been read over the new client connection. Otherwise, it is
-  /// assumed that no data has been read over the new client connection.
-  using PosixAcceptCallback = absl::AnyInvocable<void(
-      int listener_fd, std::unique_ptr<EventEngine::Endpoint> endpoint,
-      bool is_external, MemoryAllocator memory_allocator,
-      SliceBuffer* pending_data)>;
-
-  /// Factory method to create a posix specific network listener / server with
-  /// fd support.
-  ///
-  /// Once a \a Listener is created and started, the \a on_accept callback will
-  /// be called once asynchronously for each established connection. This method
-  /// may return a non-OK status immediately if an error was encountered in any
-  /// synchronous steps required to create the Listener. In this case,
-  /// \a on_shutdown will never be called.
-  ///
-  /// If this method returns a Listener, then \a on_shutdown will be invoked
-  /// exactly once, when the Listener is shut down. The status passed to it will
-  /// indicate if there was a problem during shutdown.
-  ///
-  /// The provided \a MemoryAllocatorFactory is used to create \a
-  /// MemoryAllocators for Endpoint construction.
-  virtual absl::StatusOr<std::unique_ptr<PosixListenerWithFdSupport>>
-  CreatePosixListener(
-      PosixAcceptCallback on_accept,
-      absl::AnyInvocable<void(absl::Status)> on_shutdown,
-      const EndpointConfig& config,
-      std::unique_ptr<MemoryAllocatorFactory> memory_allocator_factory) = 0;
-};
+class PosixEventEngineWithFdSupport
+    : public ExtendedType<EventEngine, EventEngineSupportsFdExtension> {};
 
 }  // namespace experimental
 }  // namespace grpc_event_engine

src/core/lib/event_engine/posix_engine/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/lib/event_engine/posix_engine/posix_endpoint.h

@@ -38,6 +38,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"

src/core/lib/event_engine/posix_engine/posix_engine.cc

@@ -657,7 +657,7 @@ EventEngine::ConnectionHandle PosixEventEngine::Connect(
 #endif  // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
 }
 
-std::unique_ptr<PosixEndpointWithFdSupport>
+std::unique_ptr<EventEngine::Endpoint>
 PosixEventEngine::CreatePosixEndpointFromFd(int fd,
                                             const EndpointConfig& config,
                                             MemoryAllocator memory_allocator) {
@@ -701,7 +701,7 @@ PosixEventEngine::CreateListener(
 #endif  // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
 }
 
-absl::StatusOr<std::unique_ptr<PosixListenerWithFdSupport>>
+absl::StatusOr<std::unique_ptr<EventEngine::Listener>>
 PosixEventEngine::CreatePosixListener(
     PosixEventEngineWithFdSupport::PosixAcceptCallback on_accept,
     absl::AnyInvocable<void(absl::Status)> on_shutdown,

src/core/lib/event_engine/posix_engine/posix_engine.h

@@ -170,7 +170,7 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
 
   ~PosixEventEngine() override;
 
-  std::unique_ptr<PosixEndpointWithFdSupport> CreatePosixEndpointFromFd(
+  std::unique_ptr<EventEngine::Endpoint> CreatePosixEndpointFromFd(
       int fd, const EndpointConfig& config,
       MemoryAllocator memory_allocator) override;
 
@@ -181,8 +181,7 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
       std::unique_ptr<MemoryAllocatorFactory> memory_allocator_factory)
       override;
 
-  absl::StatusOr<std::unique_ptr<PosixListenerWithFdSupport>>
-  CreatePosixListener(
+  absl::StatusOr<std::unique_ptr<EventEngine::Listener>> CreatePosixListener(
       PosixEventEngineWithFdSupport::PosixAcceptCallback on_accept,
       absl::AnyInvocable<void(absl::Status)> on_shutdown,
       const EndpointConfig& config,

src/core/lib/event_engine/query_extensions.h

@@ -45,25 +45,40 @@ struct QueryExtensionRecursion<Querying> {
 
 // A helper class to derive from some set of base classes and export
 // QueryExtension for them all.
-// Endpoint implementations which need to support different extensions just need
-// to derive from ExtendedEndpoint class.
-template <typename... Exports>
-class ExtendedEndpoint : public EventEngine::Endpoint, public Exports... {
+// EventEngine Extensible object implementations which need to support different
+// extensions just need to derive from this class.
+template <typename EEClass, typename... Exports>
+class ExtendedType : public EEClass, public Exports... {
  public:
   void* QueryExtension(absl::string_view id) override {
-    return endpoint_detail::QueryExtensionRecursion<ExtendedEndpoint,
+    return endpoint_detail::QueryExtensionRecursion<ExtendedType,
                                                     Exports...>::Query(id,
                                                                        this);
   }
 };
 
-/// A helper method which returns a valid pointer if the extension is supported
-/// by the endpoint.
+/// A helper method which returns a valid pointer if the extension is
+/// supported by the endpoint.
 template <typename T>
 T* QueryExtension(EventEngine::Endpoint* endpoint) {
+  if (endpoint == nullptr) return nullptr;
   return static_cast<T*>(endpoint->QueryExtension(T::EndpointExtensionName()));
 }
 
+/// A helper method which returns a valid pointer if the extension is
+/// supported by the listener.
+template <typename T>
+T* QueryExtension(EventEngine::Listener* listener) {
+  return static_cast<T*>(listener->QueryExtension(T::EndpointExtensionName()));
+}
+
+/// A helper method which returns a valid pointer if the extension is
+/// supported by the EventEngine.
+template <typename T>
+T* QueryExtension(EventEngine* engine) {
+  return static_cast<T*>(engine->QueryExtension(T::EndpointExtensionName()));
+}
+
 }  // namespace experimental
 }  // namespace grpc_event_engine
 

src/core/lib/event_engine/shim.cc

@@ -22,18 +22,13 @@
 namespace grpc_event_engine {
 namespace experimental {
 
-#if defined(GRPC_POSIX_SOCKET_TCP) && !defined(GRPC_CFSTREAM)
-bool g_event_engine_supports_fd = true;
-#else
-bool g_event_engine_supports_fd = false;
-#endif
-
 bool UseEventEngineClient() {
 // TODO(hork, eryu): Adjust the ifdefs accordingly when event engines become
 // available for other platforms.
-#if defined(GRPC_POSIX_SOCKET_TCP) && !defined(GRPC_CFSTREAM)
+#if defined(GRPC_POSIX_SOCKET_TCP) && !defined(GRPC_CFSTREAM) && \
+    !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
   return grpc_core::IsEventEngineClientEnabled();
-#elif defined(GPR_WINDOWS)
+#elif defined(GPR_WINDOWS) && !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
   return grpc_core::IsEventEngineClientEnabled();
 #elif defined(GRPC_IOS_EVENT_ENGINE_CLIENT)
   return true;
@@ -53,14 +48,5 @@ bool UseEventEngineListener() {
 #endif
 }
 
-bool EventEngineSupportsFd() {
-#if defined(GRPC_POSIX_SOCKET_TCP) && !defined(GRPC_CFSTREAM) && \
-    !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-  return g_event_engine_supports_fd;
-#else
-  return false;
-#endif
-}
-
 }  // namespace experimental
 }  // namespace grpc_event_engine

src/core/lib/event_engine/shim.h

@@ -25,8 +25,6 @@ bool UseEventEngineClient();
 
 bool UseEventEngineListener();
 
-bool EventEngineSupportsFd();
-
 }  // namespace experimental
 }  // namespace grpc_event_engine
 

src/core/lib/event_engine/windows/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/lib/experiments/experiments.cc

@@ -29,6 +29,8 @@ const char* const description_call_status_override_on_cancellation =
     "with cancellation.";
 const char* const additional_constraints_call_status_override_on_cancellation =
     "{}";
+const char* const description_call_v3 = "Promise-based call version 3.";
+const char* const additional_constraints_call_v3 = "{}";
 const char* const description_canary_client_privacy =
     "If set, canary client privacy";
 const char* const additional_constraints_canary_client_privacy = "{}";
@@ -86,6 +88,9 @@ const char* const description_promise_based_client_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_client_call = "{}";
+const uint8_t required_experiments_promise_based_client_call[] = {
+    static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineClient),
+    static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineListener)};
 const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
@@ -188,6 +193,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_call_status_override_on_cancellation,
      additional_constraints_call_status_override_on_cancellation, nullptr, 0,
      kDefaultForDebugOnly, true},
+    {"call_v3", description_call_v3, additional_constraints_call_v3, nullptr, 0,
+     false, true},
     {"canary_client_privacy", description_canary_client_privacy,
      additional_constraints_canary_client_privacy, nullptr, 0, false, false},
     {"client_idleness", description_client_idleness,
@@ -219,7 +226,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"pick_first_happy_eyeballs", description_pick_first_happy_eyeballs,
      additional_constraints_pick_first_happy_eyeballs, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
-     additional_constraints_promise_based_client_call, nullptr, 0, false, true},
+     additional_constraints_promise_based_client_call,
+     required_experiments_promise_based_client_call, 2, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, nullptr, 0, false, true},
     {"registered_method_lookup_in_transport",
@@ -289,6 +297,8 @@ const char* const description_call_status_override_on_cancellation =
     "with cancellation.";
 const char* const additional_constraints_call_status_override_on_cancellation =
     "{}";
+const char* const description_call_v3 = "Promise-based call version 3.";
+const char* const additional_constraints_call_v3 = "{}";
 const char* const description_canary_client_privacy =
     "If set, canary client privacy";
 const char* const additional_constraints_canary_client_privacy = "{}";
@@ -346,6 +356,9 @@ const char* const description_promise_based_client_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_client_call = "{}";
+const uint8_t required_experiments_promise_based_client_call[] = {
+    static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineClient),
+    static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineListener)};
 const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
@@ -448,6 +461,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_call_status_override_on_cancellation,
      additional_constraints_call_status_override_on_cancellation, nullptr, 0,
      kDefaultForDebugOnly, true},
+    {"call_v3", description_call_v3, additional_constraints_call_v3, nullptr, 0,
+     false, true},
     {"canary_client_privacy", description_canary_client_privacy,
      additional_constraints_canary_client_privacy, nullptr, 0, false, false},
     {"client_idleness", description_client_idleness,
@@ -479,7 +494,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"pick_first_happy_eyeballs", description_pick_first_happy_eyeballs,
      additional_constraints_pick_first_happy_eyeballs, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
-     additional_constraints_promise_based_client_call, nullptr, 0, false, true},
+     additional_constraints_promise_based_client_call,
+     required_experiments_promise_based_client_call, 2, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, nullptr, 0, false, true},
     {"registered_method_lookup_in_transport",
@@ -549,6 +565,8 @@ const char* const description_call_status_override_on_cancellation =
     "with cancellation.";
 const char* const additional_constraints_call_status_override_on_cancellation =
     "{}";
+const char* const description_call_v3 = "Promise-based call version 3.";
+const char* const additional_constraints_call_v3 = "{}";
 const char* const description_canary_client_privacy =
     "If set, canary client privacy";
 const char* const additional_constraints_canary_client_privacy = "{}";
@@ -606,6 +624,9 @@ const char* const description_promise_based_client_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_client_call = "{}";
+const uint8_t required_experiments_promise_based_client_call[] = {
+    static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineClient),
+    static_cast<uint8_t>(grpc_core::kExperimentIdEventEngineListener)};
 const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
@@ -708,6 +729,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_call_status_override_on_cancellation,
      additional_constraints_call_status_override_on_cancellation, nullptr, 0,
      kDefaultForDebugOnly, true},
+    {"call_v3", description_call_v3, additional_constraints_call_v3, nullptr, 0,
+     false, true},
     {"canary_client_privacy", description_canary_client_privacy,
      additional_constraints_canary_client_privacy, nullptr, 0, false, false},
     {"client_idleness", description_client_idleness,
@@ -715,7 +738,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"client_privacy", description_client_privacy,
      additional_constraints_client_privacy, nullptr, 0, false, false},
     {"event_engine_client", description_event_engine_client,
-     additional_constraints_event_engine_client, nullptr, 0, false, true},
+     additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, false, false},
     {"event_engine_listener", description_event_engine_listener,
@@ -739,7 +762,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
     {"pick_first_happy_eyeballs", description_pick_first_happy_eyeballs,
      additional_constraints_pick_first_happy_eyeballs, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
-     additional_constraints_promise_based_client_call, nullptr, 0, false, true},
+     additional_constraints_promise_based_client_call,
+     required_experiments_promise_based_client_call, 2, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, nullptr, 0, false, true},
     {"registered_method_lookup_in_transport",

src/core/lib/experiments/experiments.h

@@ -67,6 +67,7 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
   return true;
 #endif
 }
+inline bool IsCallV3Enabled() { return false; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() { return true; }
@@ -128,6 +129,7 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
   return true;
 #endif
 }
+inline bool IsCallV3Enabled() { return false; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() { return true; }
@@ -190,11 +192,13 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
   return true;
 #endif
 }
+inline bool IsCallV3Enabled() { return false; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
-inline bool IsEventEngineClientEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
+inline bool IsEventEngineClientEnabled() { return true; }
 inline bool IsEventEngineDnsEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
@@ -245,6 +249,7 @@ inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
 #else
 enum ExperimentIds {
   kExperimentIdCallStatusOverrideOnCancellation,
+  kExperimentIdCallV3,
   kExperimentIdCanaryClientPrivacy,
   kExperimentIdClientIdleness,
   kExperimentIdClientPrivacy,
@@ -289,6 +294,10 @@ enum ExperimentIds {
 inline bool IsCallStatusOverrideOnCancellationEnabled() {
   return IsExperimentEnabled(kExperimentIdCallStatusOverrideOnCancellation);
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_V3
+inline bool IsCallV3Enabled() {
+  return IsExperimentEnabled(kExperimentIdCallV3);
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_CANARY_CLIENT_PRIVACY
 inline bool IsCanaryClientPrivacyEnabled() {
   return IsExperimentEnabled(kExperimentIdCanaryClientPrivacy);

src/core/lib/experiments/experiments.yaml

@@ -26,6 +26,9 @@
 #              Defaults to the empty list.
 #              If any of the experiments in the required list is determined to
 #              be disabled at runtime, this experiment is disabled at runtime.
+# uses_polling: optional boolean (false if not specified) that indicates that
+#              this experiment should be tested with all different polling
+#              engines.
 #
 # Well known test tags:
 #   core_end2end_test:   all tests, fixtures in the core end2end suite
@@ -44,6 +47,11 @@
   expiry: 2024/04/01
   owner: vigneshbabu@google.com
   test_tags: []
+- name: call_v3
+  description: Promise-based call version 3.
+  expiry: 2024/06/01
+  owner: ctiller@google.com
+  test_tags: []
 - name: canary_client_privacy
   description:
     If set, canary client privacy
@@ -68,6 +76,7 @@
   expiry: 2024/04/01
   owner: hork@google.com
   test_tags: ["core_end2end_test", "event_engine_client_test"]
+  uses_polling: true
 - name: event_engine_dns
   description:
     If set, use EventEngine DNSResolver for client channel resolution
@@ -75,11 +84,13 @@
   owner: yijiem@google.com
   test_tags: ["cancel_ares_query_test", "resolver_component_tests_runner_invoker"]
   allow_in_fuzzing_config: false
+  uses_polling: true
 - name: event_engine_listener
   description: Use EventEngine listeners instead of iomgr's grpc_tcp_server
   expiry: 2024/04/01
   owner: vigneshbabu@google.com
   test_tags: ["core_end2end_test", "event_engine_listener_test"]
+  uses_polling: true
 - name: free_large_allocator
   description: If set, return all free bytes from a "big" allocator
   expiry: 2024/04/01
@@ -150,6 +161,7 @@
   expiry: 2024/06/14
   owner: ctiller@google.com
   test_tags: ["core_end2end_test", "lame_client_test"]
+  requires: ["event_engine_listener", "event_engine_client"]
 - name: promise_based_inproc_transport
   description:
     Use promises for the in-process transport.

src/core/lib/experiments/rollouts.yaml

@@ -42,6 +42,8 @@
 
 - name: call_status_override_on_cancellation
   default: debug
+- name: call_v3
+  default: false
 - name: canary_client_privacy
   default: false
 - name: client_idleness
@@ -52,7 +54,7 @@
   default:
     # not tested on iOS at all
     ios: broken
-    posix: false
+    posix: true
     # TODO(hork): resolve when the client end2end test flake rate reduces to
     # a tolerable amount.
     windows: broken

src/core/lib/gpr/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/lib/gprpp/.clang-format

@@ -0,0 +1,53 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+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
+  # Some platforms (namely msys) need wchar to be included BEFORE
+  # anything else, especially strsafe.h.
+  - Regex: '^<wchar.h>'
+    Priority: 5
+  # use priority 100+ for grpc headers so they sort last
+  # 'system' headers - include things that have " in the names to make them
+  # stand out and get fixed
+  - Regex: '^(<|")grpc'
+    Priority: 100
+  # similary using include/ to get system headers should stand out and get
+  # fixed
+  - Regex: '^"include/'
+    Priority: 100
+  # source headers go last
+  - Regex: '^"(src|test)/'
+    Priority: 101
+  # not-grpc headers follow
+  # first, non system headers that are included like <> - these are all
+  # local carveouts, and get sorted below c++ but before non grpc "" files
+  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
+    Priority: 30
+  # first C system headers - they have a . in the filename
+  - Regex: '^<.*\.'
+    Priority: 10
+  # then C++ system headers - no ., the only thing that will match now
+  - Regex: '^<'
+    Priority: 20
+  # finally other "" includes go between system headers and our headers
+  - Regex: '^"'
+    Priority: 40
+---
+Language: ObjC
+BasedOnStyle: Google
+ColumnLimit: 100
+ObjCBlockIndentWidth: 2
+---
+Language: Proto
+BasedOnStyle: Google
+ColumnLimit: 100
+...

src/core/lib/iomgr/event_engine_shims/endpoint.cc

@@ -31,7 +31,9 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/event_engine/posix.h"
+#include "src/core/lib/event_engine/extensions/can_track_errors.h"
+#include "src/core/lib/event_engine/extensions/supports_fd.h"
+#include "src/core/lib/event_engine/query_extensions.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/trace.h"
@@ -217,9 +219,10 @@ class EventEngineEndpointWrapper {
   void ShutdownUnref() {
     if (shutdown_ref_.fetch_sub(1, std::memory_order_acq_rel) ==
         kShutdownBit + 1) {
-      if (EventEngineSupportsFd() && fd_ > 0 && on_release_fd_) {
-        reinterpret_cast<PosixEndpointWithFdSupport*>(endpoint_.get())
-            ->Shutdown(std::move(on_release_fd_));
+      auto* supports_fd =
+          QueryExtension<EndpointSupportsFdExtension>(endpoint_.get());
+      if (supports_fd != nullptr && fd_ > 0 && on_release_fd_) {
+        supports_fd->Shutdown(std::move(on_release_fd_));
       }
       OnShutdownInternal();
     }
@@ -231,7 +234,9 @@ class EventEngineEndpointWrapper {
   // invocation would simply return.
   void TriggerShutdown(
       absl::AnyInvocable<void(absl::StatusOr<int>)> on_release_fd) {
-    if (EventEngineSupportsFd()) {
+    auto* supports_fd =
+        QueryExtension<EndpointSupportsFdExtension>(endpoint_.get());
+    if (supports_fd != nullptr) {
       on_release_fd_ = std::move(on_release_fd);
     }
     int64_t curr = shutdown_ref_.load(std::memory_order_acquire);
@@ -245,9 +250,8 @@ class EventEngineEndpointWrapper {
         Ref();
         if (shutdown_ref_.fetch_sub(1, std::memory_order_acq_rel) ==
             kShutdownBit + 1) {
-          if (EventEngineSupportsFd() && fd_ > 0 && on_release_fd_) {
-            reinterpret_cast<PosixEndpointWithFdSupport*>(endpoint_.get())
-                ->Shutdown(std::move(on_release_fd_));
+          if (supports_fd != nullptr && fd_ > 0 && on_release_fd_) {
+            supports_fd->Shutdown(std::move(on_release_fd_));
           }
           OnShutdownInternal();
         }
@@ -257,9 +261,10 @@ class EventEngineEndpointWrapper {
   }
 
   bool CanTrackErrors() {
-    if (EventEngineSupportsFd()) {
-      return reinterpret_cast<PosixEndpointWithFdSupport*>(endpoint_.get())
-          ->CanTrackErrors();
+    auto* can_track_errors =
+        QueryExtension<EndpointCanTrackErrorsExtension>(endpoint_.get());
+    if (can_track_errors != nullptr) {
+      return can_track_errors->CanTrackErrors();
     } else {
       return false;
     }
@@ -413,9 +418,10 @@ EventEngineEndpointWrapper::EventEngineEndpointWrapper(
       eeep_(std::make_unique<grpc_event_engine_endpoint>()) {
   eeep_->base.vtable = &grpc_event_engine_endpoint_vtable;
   eeep_->wrapper = this;
-  if (EventEngineSupportsFd()) {
-    fd_ = reinterpret_cast<PosixEndpointWithFdSupport*>(endpoint_.get())
-              ->GetWrappedFd();
+  auto* supports_fd =
+      QueryExtension<EndpointSupportsFdExtension>(endpoint_.get());
+  if (supports_fd != nullptr) {
+    fd_ = supports_fd->GetWrappedFd();
   } else {
     fd_ = -1;
   }

src/core/lib/iomgr/tcp_server_posix.cc

@@ -58,6 +58,8 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
+#include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
+#include "src/core/lib/event_engine/query_extensions.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
@@ -95,7 +97,20 @@ static grpc_error_handle CreateEventEngineListener(
     grpc_tcp_server* s, grpc_closure* shutdown_complete,
     const EndpointConfig& config, grpc_tcp_server** server) {
   absl::StatusOr<std::unique_ptr<EventEngine::Listener>> listener;
-  if (grpc_event_engine::experimental::EventEngineSupportsFd()) {
+  auto* engine = reinterpret_cast<EventEngine*>(
+      config.GetVoidPointer(GRPC_INTERNAL_ARG_EVENT_ENGINE));
+  // Keeps the engine alive for some tests that have not otherwise
+  // instantiated an EventEngine
+  std::shared_ptr<EventEngine> keeper;
+  if (engine == nullptr) {
+    keeper = grpc_event_engine::experimental::GetDefaultEventEngine();
+    engine = keeper.get();
+  }
+  auto* event_engine_supports_fd =
+      grpc_event_engine::experimental::QueryExtension<
+          grpc_event_engine::experimental::EventEngineSupportsFdExtension>(
+          engine);
+  if (event_engine_supports_fd != nullptr) {
     PosixEventEngineWithFdSupport::PosixAcceptCallback accept_cb =
         [s](int listener_fd, std::unique_ptr<EventEngine::Endpoint> ep,
             bool is_external, MemoryAllocator /*allocator*/,
@@ -120,9 +135,10 @@ static grpc_error_handle CreateEventEngineListener(
             memset(&addr, 0, sizeof(addr));
             addr.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
             // Get the fd of the socket connected to peer.
-            int fd = reinterpret_cast<grpc_event_engine::experimental::
-                                          PosixEndpointWithFdSupport*>(ep.get())
-                         ->GetWrappedFd();
+            int fd =
+                reinterpret_cast<
+                    grpc_event_engine::experimental::PosixEndpoint*>(ep.get())
+                    ->GetWrappedFd();
             if (getpeername(fd, reinterpret_cast<struct sockaddr*>(addr.addr),
                             &(addr.len)) < 0) {
               gpr_log(GPR_ERROR, "Failed getpeername: %s",
@@ -162,18 +178,7 @@ static grpc_error_handle CreateEventEngineListener(
                               grpc_event_engine_endpoint_create(std::move(ep)),
                           read_notifier_pollset, acceptor);
         };
-    PosixEventEngineWithFdSupport* engine_ptr =
-        reinterpret_cast<PosixEventEngineWithFdSupport*>(
-            config.GetVoidPointer(GRPC_INTERNAL_ARG_EVENT_ENGINE));
-    // Keeps the engine alive for some tests that have not otherwise
-    // instantiated an EventEngine
-    std::shared_ptr<EventEngine> keeper;
-    if (engine_ptr == nullptr) {
-      keeper = grpc_event_engine::experimental::GetDefaultEventEngine();
-      engine_ptr =
-          reinterpret_cast<PosixEventEngineWithFdSupport*>(keeper.get());
-    }
-    listener = engine_ptr->CreatePosixListener(
+    listener = event_engine_supports_fd->CreatePosixListener(
         std::move(accept_cb),
         [s, shutdown_complete](absl::Status status) {
           grpc_event_engine::experimental::RunEventEngineClosure(
@@ -194,10 +199,9 @@ static grpc_error_handle CreateEventEngineListener(
                               grpc_event_engine_endpoint_create(std::move(ep)),
                           nullptr, nullptr);
         };
-    auto ee = grpc_event_engine::experimental::GetDefaultEventEngine();
-    listener = ee->CreateListener(
+    listener = engine->CreateListener(
         std::move(accept_cb),
-        [s, ee, shutdown_complete](absl::Status status) {
+        [s, ee = keeper, shutdown_complete](absl::Status status) {
           GPR_ASSERT(gpr_atm_no_barrier_load(&s->refs.count) == 0);
           grpc_event_engine::experimental::RunEventEngineClosure(
               shutdown_complete, absl_status_to_grpc_error(status));
@@ -250,7 +254,7 @@ static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete,
   s->head = nullptr;
   s->tail = nullptr;
   s->nports = 0;
-  s->options = TcpOptionsFromEndpointConfig(config);
+  s->options = ::TcpOptionsFromEndpointConfig(config);
   s->fd_handler = nullptr;
   GPR_ASSERT(s->options.resource_quota != nullptr);
   GPR_ASSERT(s->on_accept_cb);
@@ -618,22 +622,21 @@ static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s,
     }
     int fd_index = 0;
     absl::StatusOr<int> port;
-    if (grpc_event_engine::experimental::EventEngineSupportsFd()) {
-      port =
-          static_cast<
-              grpc_event_engine::experimental::PosixListenerWithFdSupport*>(
-              s->ee_listener.get())
-              ->BindWithFd(
-                  grpc_event_engine::experimental::CreateResolvedAddress(*addr),
-                  [s, &fd_index](absl::StatusOr<int> listen_fd) {
-                    if (!listen_fd.ok()) {
-                      return;
-                    }
-                    GPR_DEBUG_ASSERT(*listen_fd > 0);
-                    s->listen_fd_to_index_map.insert_or_assign(
-                        *listen_fd,
-                        std::make_tuple(s->n_bind_ports, fd_index++));
-                  });
+    auto* listener_supports_fd =
+        grpc_event_engine::experimental::QueryExtension<
+            grpc_event_engine::experimental::ListenerSupportsFdExtension>(
+            s->ee_listener.get());
+    if (listener_supports_fd != nullptr) {
+      port = listener_supports_fd->BindWithFd(
+          grpc_event_engine::experimental::CreateResolvedAddress(*addr),
+          [s, &fd_index](absl::StatusOr<int> listen_fd) {
+            if (!listen_fd.ok()) {
+              return;
+            }
+            GPR_DEBUG_ASSERT(*listen_fd > 0);
+            s->listen_fd_to_index_map.insert_or_assign(
+                *listen_fd, std::make_tuple(s->n_bind_ports, fd_index++));
+          });
     } else {
       port = s->ee_listener->Bind(
           grpc_event_engine::experimental::CreateResolvedAddress(*addr));
@@ -837,10 +840,12 @@ static void tcp_server_shutdown_listeners(grpc_tcp_server* s) {
   gpr_mu_lock(&s->mu);
   s->shutdown_listeners = true;
   if (grpc_event_engine::experimental::UseEventEngineListener()) {
-    if (grpc_event_engine::experimental::EventEngineSupportsFd()) {
-      static_cast<grpc_event_engine::experimental::PosixListenerWithFdSupport*>(
-          s->ee_listener.get())
-          ->ShutdownListeningFds();
+    auto* listener_supports_fd =
+        grpc_event_engine::experimental::QueryExtension<
+            grpc_event_engine::experimental::ListenerSupportsFdExtension>(
+            s->ee_listener.get());
+    if (listener_supports_fd != nullptr) {
+      listener_supports_fd->ShutdownListeningFds();
     }
   }
   /* shutdown all fd's */
@@ -872,19 +877,21 @@ class ExternalConnectionHandler : public grpc_core::TcpServerFdHandler {
   // TODO(yangg) resolve duplicate code with on_read
   void Handle(int listener_fd, int fd, grpc_byte_buffer* buf) override {
     if (grpc_event_engine::experimental::UseEventEngineListener()) {
-      GPR_ASSERT(grpc_event_engine::experimental::EventEngineSupportsFd());
+      auto* listener_supports_fd =
+          grpc_event_engine::experimental::QueryExtension<
+              grpc_event_engine::experimental::ListenerSupportsFdExtension>(
+              s_->ee_listener.get());
+      GPR_ASSERT(listener_supports_fd != nullptr);
       grpc_event_engine::experimental::SliceBuffer pending_data;
       if (buf != nullptr) {
         pending_data =
             grpc_event_engine::experimental::SliceBuffer::TakeCSliceBuffer(
                 buf->data.raw.slice_buffer);
       }
-      GPR_ASSERT(GRPC_LOG_IF_ERROR(
-          "listener_handle_external_connection",
-          static_cast<
-              grpc_event_engine::experimental::PosixListenerWithFdSupport*>(
-              s_->ee_listener.get())
-              ->HandleExternalConnection(listener_fd, fd, &pending_data)));
+      GPR_ASSERT(
+          GRPC_LOG_IF_ERROR("listener_handle_external_connection",
+                            listener_supports_fd->HandleExternalConnection(
+                                listener_fd, fd, &pending_data)));
       return;
     }
     grpc_pollset* read_notifier_pollset;

src/core/lib/surface/call.cc

@@ -412,8 +412,7 @@ void Call::DeleteThis() {
   RefCountedPtr<Channel> channel = std::move(channel_);
   Arena* arena = arena_;
   this->~Call();
-  channel->UpdateCallSizeEstimate(arena->TotalUsedBytes());
-  arena->Destroy();
+  channel->DestroyArena(arena);
 }
 
 void Call::PrepareOutgoingInitialMetadata(const grpc_op& op,
@@ -814,20 +813,15 @@ grpc_error_handle FilterStackCall::Create(grpc_call_create_args* args,
     *composite = grpc_error_add_child(*composite, new_err);
   };
 
-  Arena* arena;
   FilterStackCall* call;
   grpc_error_handle error;
   grpc_channel_stack* channel_stack = channel->channel_stack();
-  size_t initial_size = channel->CallSizeEstimate();
-  global_stats().IncrementCallInitialSize(initial_size);
   size_t call_alloc_size =
       GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(FilterStackCall)) +
       channel_stack->call_stack_size;
 
-  std::pair<Arena*, void*> arena_with_call = Arena::CreateWithAlloc(
-      initial_size, call_alloc_size, channel->allocator());
-  arena = arena_with_call.first;
-  call = new (arena_with_call.second) FilterStackCall(arena, *args);
+  Arena* arena = channel->CreateArena();
+  call = new (arena->Alloc(call_alloc_size)) FilterStackCall(arena, *args);
   GPR_DEBUG_ASSERT(FromC(call->c_ptr()) == call);
   GPR_DEBUG_ASSERT(FromCallStack(call->call_stack()) == call);
   *out_call = call->c_ptr();
@@ -2488,11 +2482,8 @@ grpc_error_handle MakePromiseBasedCall(grpc_call_create_args* args,
                                        grpc_call** out_call) {
   Channel* channel = args->channel.get();
 
-  const auto initial_size = channel->CallSizeEstimate();
-  global_stats().IncrementCallInitialSize(initial_size);
-  auto alloc =
-      Arena::CreateWithAlloc(initial_size, sizeof(T), channel->allocator());
-  PromiseBasedCall* call = new (alloc.second) T(alloc.first, args);
+  auto* arena = channel->CreateArena();
+  PromiseBasedCall* call = arena->New<T>(arena, args);
   *out_call = call->c_ptr();
   GPR_DEBUG_ASSERT(Call::FromC(*out_call) == call);
   return absl::OkStatus();

src/core/lib/surface/channel.cc

@@ -58,12 +58,25 @@
 #include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/init_internally.h"
+#include "src/core/lib/transport/call_factory.h"
 #include "src/core/lib/transport/transport.h"
 
 // IWYU pragma: no_include <type_traits>
 
 namespace grpc_core {
 
+namespace {
+
+class NotReallyACallFactory final : public CallFactory {
+ public:
+  using CallFactory::CallFactory;
+  CallInitiator CreateCall(ClientMetadataHandle, Arena*) override {
+    Crash("NotReallyACallFactory::CreateCall should never be called");
+  }
+};
+
+}  // namespace
+
 Channel::Channel(bool is_client, bool is_promising, std::string target,
                  const ChannelArgs& channel_args,
                  grpc_compression_options compression_options,
@@ -71,14 +84,10 @@ Channel::Channel(bool is_client, bool is_promising, std::string target,
     : is_client_(is_client),
       is_promising_(is_promising),
       compression_options_(compression_options),
-      call_size_estimate_(channel_stack->call_stack_size +
-                          grpc_call_get_initial_size_estimate()),
       channelz_node_(channel_args.GetObjectRef<channelz::ChannelNode>()),
-      allocator_(channel_args.GetObject<ResourceQuota>()
-                     ->memory_quota()
-                     ->CreateMemoryOwner()),
       target_(std::move(target)),
-      channel_stack_(std::move(channel_stack)) {
+      channel_stack_(std::move(channel_stack)),
+      call_factory_(MakeRefCounted<NotReallyACallFactory>(channel_args)) {
   // We need to make sure that grpc_shutdown() does not shut things down
   // until after the channel is destroyed.  However, the channel may not
   // actually be destroyed by the time grpc_channel_destroy() returns,
@@ -230,24 +239,6 @@ absl::StatusOr<RefCountedPtr<Channel>> Channel::Create(
   return CreateWithBuilder(&builder);
 }
 
-void Channel::UpdateCallSizeEstimate(size_t size) {
-  size_t cur = call_size_estimate_.load(std::memory_order_relaxed);
-  if (cur < size) {
-    // size grew: update estimate
-    call_size_estimate_.compare_exchange_weak(
-        cur, size, std::memory_order_relaxed, std::memory_order_relaxed);
-    // if we lose: never mind, something else will likely update soon enough
-  } else if (cur == size) {
-    // no change: holding pattern
-  } else if (cur > 0) {
-    // size shrank: decrease estimate
-    call_size_estimate_.compare_exchange_weak(
-        cur, std::min(cur - 1, (255 * cur + size) / 256),
-        std::memory_order_relaxed, std::memory_order_relaxed);
-    // if we lose: never mind, something else will likely update soon enough
-  }
-}
-
 }  // namespace grpc_core
 
 char* grpc_channel_get_target(grpc_channel* channel) {

src/core/lib/surface/channel.h

@@ -52,9 +52,9 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
-#include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/channel_stack_type.h"
+#include "src/core/lib/transport/call_factory.h"
 #include "src/core/lib/transport/transport.h"
 
 /// The same as grpc_channel_destroy, but doesn't create an ExecCtx, and so
@@ -80,9 +80,6 @@ grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel);
 grpc_core::channelz::ChannelNode* grpc_channel_get_channelz_node(
     grpc_channel* channel);
 
-size_t grpc_channel_get_call_size_estimate(grpc_channel* channel);
-void grpc_channel_update_call_size_estimate(grpc_channel* channel, size_t size);
-
 namespace grpc_core {
 
 struct RegisteredCall {
@@ -124,22 +121,10 @@ class Channel : public RefCounted<Channel>,
 
   channelz::ChannelNode* channelz_node() const { return channelz_node_.get(); }
 
-  size_t CallSizeEstimate() {
-    // We round up our current estimate to the NEXT value of kRoundUpSize.
-    // This ensures:
-    //  1. a consistent size allocation when our estimate is drifting slowly
-    //     (which is common) - which tends to help most allocators reuse memory
-    //  2. a small amount of allowed growth over the estimate without hitting
-    //     the arena size doubling case, reducing overall memory usage
-    static constexpr size_t kRoundUpSize = 256;
-    return (call_size_estimate_.load(std::memory_order_relaxed) +
-            2 * kRoundUpSize) &
-           ~(kRoundUpSize - 1);
-  }
+  Arena* CreateArena() { return call_factory_->CreateArena(); }
+  void DestroyArena(Arena* arena) { return call_factory_->DestroyArena(arena); }
 
-  void UpdateCallSizeEstimate(size_t size);
   absl::string_view target() const { return target_; }
-  MemoryAllocator* allocator() { return &allocator_; }
   bool is_client() const { return is_client_; }
   bool is_promising() const { return is_promising_; }
   RegisteredCall* RegisterCall(const char* method, const char* host);
@@ -162,12 +147,11 @@ class Channel : public RefCounted<Channel>,
   const bool is_client_;
   const bool is_promising_;
   const grpc_compression_options compression_options_;
-  std::atomic<size_t> call_size_estimate_;
   CallRegistrationTable registration_table_;
   RefCountedPtr<channelz::ChannelNode> channelz_node_;
-  MemoryAllocator allocator_;
   std::string target_;
   const RefCountedPtr<grpc_channel_stack> channel_stack_;
+  const RefCountedPtr<CallFactory> call_factory_;
 };
 
 }  // namespace grpc_core

src/core/lib/surface/server.cc

@@ -1298,11 +1298,7 @@ Server::ChannelData::~ChannelData() {
   }
 }
 
-Arena* Server::ChannelData::CreateArena() {
-  const auto initial_size = channel_->CallSizeEstimate();
-  global_stats().IncrementCallInitialSize(initial_size);
-  return Arena::Create(initial_size, channel_->allocator());
-}
+Arena* Server::ChannelData::CreateArena() { return channel_->CreateArena(); }
 
 absl::StatusOr<CallInitiator> Server::ChannelData::CreateCall(
     ClientMetadata& client_initial_metadata, Arena* arena) {