grpc 1.83.1 → 1.84.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7cad78eb1a239fccff217f8dfda9db31f92a3f0f32b713a55cf26ebc782c5e3
-  data.tar.gz: '039647b8a259b5e5c561efd5e23c0831d2caa17184ad92f4da26b8de00fe2594'
+  metadata.gz: 35881f9fa45f53a009e1c5c19eb30ac67664c53192ddb13b8d4275616c61a914
+  data.tar.gz: 1442944f8bb842300c090f16929fcd18509a1bca7ad564c54f78ca19b6233285
 SHA512:
-  metadata.gz: a442ff623a15321dc764714d9389c6cf58db45b8d7f5a73d40161d9277f7ff34ea6796a8e07cc9eece2443a1f37f406bea2b6b19804311545c2ebb444fc1c8e2
-  data.tar.gz: cc1c384f869bee5ff9336804619580ef647f0f9d3ce643a7b1494d41fa6da73511b8d74b30eabbb39f0a9baaa1ed3f806a51f44c42332395b2a3643d2963b7e6
+  metadata.gz: 19c07f8dc8aa885cbf116bbd8762c861705e6261b4cbaeedae0f309d712a5de6204c6239b80132554feff36131d9d299125607ff6df654ffe9e8b280689bec38
+  data.tar.gz: 2cef73246c7657d9608a9f2b95671c3c39c9caa6bf2b92d96dfbece9d61fc5aa02ed7db213d5cd542f33ab4a29ec45be67aacfbf656a9b3985443c9049377be2

data/Makefile

@@ -368,7 +368,7 @@ Q = @
 endif
 
 CORE_VERSION = 56.0.0
-CPP_VERSION = 1.83.1
+CPP_VERSION = 1.84.0-pre1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -708,6 +708,7 @@ LIBGRPC_SRC = \
     src/core/client_channel/retry_service_config.cc \
     src/core/client_channel/retry_throttle.cc \
     src/core/client_channel/subchannel.cc \
+    src/core/client_channel/subchannel_metrics.cc \
     src/core/client_channel/subchannel_pool_interface.cc \
     src/core/client_channel/subchannel_stream_client.cc \
     src/core/client_channel/subchannel_stream_limiter.cc \
@@ -725,6 +726,7 @@ LIBGRPC_SRC = \
     src/core/credentials/call/external/file_external_account_credentials.cc \
     src/core/credentials/call/external/url_external_account_credentials.cc \
     src/core/credentials/call/gcp_service_account_identity/gcp_service_account_identity_credentials.cc \
+    src/core/credentials/call/gdch_service_account/gdch_service_account_credentials.cc \
     src/core/credentials/call/iam/iam_credentials.cc \
     src/core/credentials/call/json_util.cc \
     src/core/credentials/call/jwt/json_token.cc \
@@ -910,6 +912,8 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/filters/common/matcher/action/v3/skip_action.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/filters/http/composite/v3/composite.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/ext_proc/v3/ext_proc.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/ext_proc/v3/processing_mode.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \
@@ -934,6 +938,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c \
     src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
     src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/ext_proc/v3/external_processor.upb_minitable.c \
     src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
     src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
     src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
@@ -974,7 +979,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
     src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
     src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
-    src/core/ext/upb-gen/src/proto/grpc/channelz/channelz.upb_minitable.c \
+    src/core/ext/upb-gen/grpc/channelz/v1/channelz.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/channelz.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/promise.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/property_list.upb_minitable.c \
@@ -1092,6 +1097,8 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/common/matcher/action/v3/skip_action.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/composite/v3/composite.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/ext_proc/v3/ext_proc.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/ext_proc/v3/processing_mode.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
@@ -1148,7 +1155,7 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
     src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
     src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
-    src/core/ext/upbdefs-gen/src/proto/grpc/channelz/channelz.upbdefs.c \
+    src/core/ext/upbdefs-gen/grpc/channelz/v1/channelz.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/channelz.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/promise.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/property_list.upbdefs.c \
@@ -1187,6 +1194,8 @@ LIBGRPC_SRC = \
     src/core/filter/auth/client_auth_filter.cc \
     src/core/filter/auth/server_auth_filter.cc \
     src/core/filter/composite/composite_filter.cc \
+    src/core/filter/ext_proc/ext_proc_filter.cc \
+    src/core/filter/ext_proc/ext_proc_messages.cc \
     src/core/filter/fused_filters.cc \
     src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
     src/core/handshaker/handshaker.cc \
@@ -1303,9 +1312,6 @@ LIBGRPC_SRC = \
     src/core/lib/iomgr/pollset_set.cc \
     src/core/lib/iomgr/pollset_set_windows.cc \
     src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
     src/core/lib/iomgr/sockaddr_utils_posix.cc \
     src/core/lib/iomgr/socket_factory_posix.cc \
     src/core/lib/iomgr/socket_mutator.cc \
@@ -1426,16 +1432,8 @@ LIBGRPC_SRC = \
     src/core/net/socket_mutator.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-    src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
-    src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
-    src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
-    src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc \
-    src/core/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
-    src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
-    src/core/resolver/dns/dns_resolver_plugin.cc \
-    src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc \
-    src/core/resolver/dns/event_engine/service_config_helper.cc \
-    src/core/resolver/dns/native/dns_resolver.cc \
+    src/core/resolver/dns/dns_resolver.cc \
+    src/core/resolver/dns/service_config_helper.cc \
     src/core/resolver/endpoint_addresses.cc \
     src/core/resolver/fake/fake_resolver.cc \
     src/core/resolver/google_c2p/google_c2p_resolver.cc \
@@ -1497,8 +1495,10 @@ LIBGRPC_SRC = \
     src/core/tsi/ssl_telemetry_utils.cc \
     src/core/tsi/ssl_transport_security.cc \
     src/core/tsi/ssl_transport_security_utils.cc \
+    src/core/tsi/tls_telemetry.cc \
     src/core/tsi/transport_security.cc \
     src/core/tsi/transport_security_grpc.cc \
+    src/core/util/address_sorting_init.cc \
     src/core/util/alloc.cc \
     src/core/util/backoff.cc \
     src/core/util/crash.cc \
@@ -1523,7 +1523,6 @@ LIBGRPC_SRC = \
     src/core/util/iphone/cpu.cc \
     src/core/util/json/json_object_loader.cc \
     src/core/util/json/json_reader.cc \
-    src/core/util/json/json_util.cc \
     src/core/util/json/json_writer.cc \
     src/core/util/latent_see.cc \
     src/core/util/linux/cpu.cc \
@@ -1577,6 +1576,7 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
     src/core/xds/grpc/xds_audit_logger_registry.cc \
     src/core/xds/grpc/xds_bootstrap_grpc.cc \
+    src/core/xds/grpc/xds_bootstrap_grpc_builder.cc \
     src/core/xds/grpc/xds_certificate_provider.cc \
     src/core/xds/grpc/xds_client_grpc.cc \
     src/core/xds/grpc/xds_cluster.cc \
@@ -1586,8 +1586,10 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/xds_common_types_parser.cc \
     src/core/xds/grpc/xds_endpoint.cc \
     src/core/xds/grpc/xds_endpoint_parser.cc \
+    src/core/xds/grpc/xds_grpc_service_parser.cc \
     src/core/xds/grpc/xds_health_status.cc \
     src/core/xds/grpc/xds_http_composite_filter.cc \
+    src/core/xds/grpc/xds_http_ext_proc_filter.cc \
     src/core/xds/grpc/xds_http_fault_filter.cc \
     src/core/xds/grpc/xds_http_filter.cc \
     src/core/xds/grpc/xds_http_filter_registry.cc \
@@ -1608,6 +1610,8 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/xds_route_config_parser.cc \
     src/core/xds/grpc/xds_routing.cc \
     src/core/xds/grpc/xds_server_grpc.cc \
+    src/core/xds/grpc/xds_tls_context.cc \
+    src/core/xds/grpc/xds_tls_context_parser.cc \
     src/core/xds/grpc/xds_transport_grpc.cc \
     src/core/xds/xds_client/lrs_client.cc \
     src/core/xds/xds_client/xds_api.cc \

data/include/grpc/credentials.h

@@ -60,6 +60,14 @@ grpc_service_account_jwt_access_credentials_create(const char* json_key,
 GRPCAPI grpc_call_credentials* grpc_external_account_credentials_create(
     const char* json_string, const char* scopes_string);
 
+/** Builds Google Distributed Cloud Hosting Service Account credentials.
+- json_string is the JSON string containing the service account key.
+- audience_string is the intended recipient or service.
+  This API is used for experimental purposes for now and may change in the
+ future. */
+GRPCAPI grpc_call_credentials* grpc_gdch_service_account_credentials_create(
+    const char* json_string, const char* audience_string);
+
 /** Creates an Oauth2 Refresh Token credentials object for connecting to Google.
    May return NULL if the input is invalid.
    WARNING: Do NOT use this credentials to connect to a non-google service as
@@ -765,6 +773,8 @@ typedef struct grpc_tls_custom_verification_check_request {
      * This value will only be filled if the cryptographic peer certificate
      * verification was successful */
     const char* verified_root_cert_subject;
+    /* The negotiated key exchange group. */
+    const char* negotiated_key_exchange_group;
   } peer_info;
 } grpc_tls_custom_verification_check_request;
 

data/include/grpc/grpc_security_constants.h

@@ -44,6 +44,8 @@ extern "C" {
 // https://www.openssl.org/docs/man1.1.0/man3/SSL_get_peer_cert_chain.html.
 #define GRPC_X509_PEM_CERT_CHAIN_PROPERTY_NAME "x509_pem_cert_chain"
 #define GRPC_SSL_SESSION_REUSED_PROPERTY "ssl_session_reused"
+#define GRPC_SSL_NEGOTIATED_KEY_EXCHANGE_GROUP_PROPERTY_NAME \
+  "ssl_negotiated_key_exchange_group"
 #define GRPC_TRANSPORT_SECURITY_LEVEL_PROPERTY_NAME "security_level"
 #define GRPC_PEER_DNS_PROPERTY_NAME "peer_dns"
 #define GRPC_PEER_SPIFFE_ID_PROPERTY_NAME "peer_spiffe_id"

data/include/grpc/impl/channel_arg_names.h

@@ -286,6 +286,15 @@
   "grpc.experimental.tcp_min_read_chunk_size"
 #define GRPC_ARG_TCP_MAX_READ_CHUNK_SIZE \
   "grpc.experimental.tcp_max_read_chunk_size"
+/** Channel arg (integer) setting an opt-in upper bound, in bytes, on the
+   adaptive read buffer size that a single TCP endpoint may preallocate for
+   reads. When unset (the default) the read buffer target grows as before,
+   preserving historical behavior. When set, the adaptive read target is
+   clamped to this value so occasional large reads do not leave a permanently
+   high read-buffer high-watermark. Unlike GRPC_ARG_TCP_MAX_READ_CHUNK_SIZE,
+   this does not change per-socket slice sizing. **/
+#define GRPC_ARG_TCP_MAX_READ_BUFFER_SIZE \
+  "grpc.experimental.tcp_max_read_buffer_size"
 /* TCP TX Zerocopy enable state: zero is disabled, non-zero is enabled. By
    default, it is disabled. */
 #define GRPC_ARG_TCP_TX_ZEROCOPY_ENABLED \

data/src/core/call/call_filters.h

@@ -89,7 +89,8 @@
 //   failure (in which case the call will be aborted).
 //   useful for cases where the exact metadata returned needs to be customized.
 // It's also acceptable to return a promise that resolves to the
-// relevant return type listed above.
+// relevant return type listed above (except for OnClientToServerHalfClose
+// and OnServerTrailingMetadata, which must be synchronous).
 //
 // OnFinalize is added to intercept call finalization.
 // It must have one of the signatures:
@@ -1983,7 +1984,8 @@ class CallFilters {
     return flag;
   }
   // Client: Fetch server initial metadata
-  // Returns a promise that resolves to ValueOrFailure<ServerMetadataHandle>
+  // Returns a promise that resolves to
+  // ValueOrFailure<std::optional<ServerMetadataHandle>>
   GRPC_MUST_USE_RESULT auto PullServerInitialMetadata() {
     return Seq(
         [this]() {

data/src/core/call/client_call.cc

@@ -46,6 +46,7 @@
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/surface/call_utils.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
@@ -62,7 +63,9 @@ namespace grpc_core {
 
 namespace {
 
-grpc_call_error ValidateClientBatch(const grpc_op* ops, size_t nops) {
+grpc_call_error ValidateClientBatch(
+    const grpc_op* ops, size_t nops,
+    CallOpInvariantsValidator& call_op_invariants_validator) {
   BitSet<8> got_ops;
   for (size_t op_idx = 0; op_idx < nops; op_idx++) {
     const grpc_op& op = ops[op_idx];
@@ -94,7 +97,7 @@ grpc_call_error ValidateClientBatch(const grpc_op* ops, size_t nops) {
     if (got_ops.is_set(op.op)) return GRPC_CALL_ERROR_TOO_MANY_OPERATIONS;
     got_ops.set(op.op);
   }
-  return GRPC_CALL_OK;
+  return call_op_invariants_validator.ValidateAndCommit(ops, nops);
 }
 
 }  // namespace
@@ -161,7 +164,8 @@ grpc_call_error ClientCall::StartBatch(const grpc_op* ops, size_t nops,
     EndOpImmediately(cq_, notify_tag, is_notify_tag_closure);
     return GRPC_CALL_OK;
   }
-  const grpc_call_error validation_result = ValidateClientBatch(ops, nops);
+  const grpc_call_error validation_result =
+      ValidateClientBatch(ops, nops, call_op_invariants_validator_);
   if (validation_result != GRPC_CALL_OK) {
     return validation_result;
   }
@@ -325,8 +329,12 @@ void ClientCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
   }
   if (!is_notify_tag_closure) grpc_cq_begin_op(cq_, notify_tag);
   BatchOpIndex op_index(ops, nops);
-  auto send_message =
-      op_index.OpHandler<GRPC_OP_SEND_MESSAGE>([this](const grpc_op& op) {
+  uint8_t concurrent_ops_to_reset = 0;
+
+  auto send_message = op_index.OpHandler<GRPC_OP_SEND_MESSAGE>(
+      [this, &concurrent_ops_to_reset](const grpc_op& op) {
+        concurrent_ops_to_reset |=
+            CallOpInvariantsValidator::OpBit(GRPC_OP_SEND_MESSAGE);
         SliceBuffer send;
         grpc_slice_buffer_swap(
             &op.data.send_message.send_message->data.raw.slice_buffer,
@@ -344,8 +352,10 @@ void ClientCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
               return Success{};
             };
           });
-  auto recv_message =
-      op_index.OpHandler<GRPC_OP_RECV_MESSAGE>([this](const grpc_op& op) {
+  auto recv_message = op_index.OpHandler<GRPC_OP_RECV_MESSAGE>(
+      [this, &concurrent_ops_to_reset](const grpc_op& op) {
+        concurrent_ops_to_reset |=
+            CallOpInvariantsValidator::OpBit(GRPC_OP_RECV_MESSAGE);
         return message_receiver_.MakeBatchOp(op, &started_call_initiator_);
       });
   auto recv_initial_metadata =
@@ -382,7 +392,9 @@ void ClientCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
       AllOk<StatusFlag>(
           TrySeq(std::move(send_message), std::move(send_close_from_client)),
           TrySeq(std::move(recv_initial_metadata), std::move(recv_message))),
-      [self = WeakRef()](StatusFlag x) { return x; });
+      [guard = PrimaryOpsCleanup<ClientCall>(WeakRefAsSubclass<ClientCall>(),
+                                             concurrent_ops_to_reset)](
+          StatusFlag x) { return x; });
   Party::WakeupHold wakeup_hold;
   if (const grpc_op* op = op_index.op(GRPC_OP_SEND_INITIAL_METADATA)) {
     wakeup_hold = StartCall(*op);

data/src/core/call/client_call.h

@@ -133,6 +133,9 @@ class ClientCall final
     UnorderedStart* next;
   };
 
+  template <typename T>
+  friend class PrimaryOpsCleanup;
+
   void CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
                    bool is_notify_tag_closure);
   template <typename Batch>
@@ -178,6 +181,7 @@ class ClientCall final
   // otherwise the server trailing metadata from started_call_initiator_ is
   // authoritative.
   SingleSetPtr<absl::Status> cancel_status_;
+  CallOpInvariantsValidator call_op_invariants_validator_;
   MessageReceiver message_receiver_;
   grpc_completion_queue* const cq_;
   const RefCountedPtr<UnstartedCallDestination> call_destination_;

data/src/core/call/interception_chain.cc

@@ -146,9 +146,11 @@ InterceptionChainBuilder::Build(FinalDestination final_destination) {
   }
   Interceptor* previous = top_interceptor_.get();
   while (previous->wrapped_destination_ != nullptr) {
+    previous->Init(args_);
     previous = DownCast<Interceptor*>(previous->wrapped_destination_.get());
   }
   previous->wrapped_destination_ = std::move(terminator);
+  previous->Init(args_);
   return std::move(top_interceptor_);
 }
 

data/src/core/call/interception_chain.h

@@ -93,7 +93,6 @@ class HijackedCall final {
 // preceding filters.  We don't actually have any use-case for seeing
 // the unprocessed initial metadata and deciding to do a PassThrough(),
 // and its presence in this API is confusing.
-
 class Interceptor : public UnstartedCallDestination {
  public:
   using UnstartedCallDestination::UnstartedCallDestination;
@@ -106,6 +105,11 @@ class Interceptor : public UnstartedCallDestination {
   }
 
  protected:
+  // Performs initialization steps after the interception chain has been
+  // constructed.  In particular, wrapped_destination() may be called
+  // from inside this method.
+  virtual void Init(const ChannelArgs& args) {}
+
   virtual void InterceptCall(UnstartedCallHandler unstarted_call_handler) = 0;
 
   // Returns a promise that resolves to a HijackedCall instance.
@@ -141,6 +145,15 @@ class Interceptor : public UnstartedCallDestination {
     wrapped_destination_->StartCall(std::move(unstarted_call_handler));
   }
 
+  // The next call destination in the interception chain.  To be used by
+  // interceptors that need to delegate to their own interception chains.
+  //
+  // Note: This will not return a useful value until Init() has been
+  // called -- do NOT call this from within the ctor.
+  RefCountedPtr<UnstartedCallDestination> wrapped_destination() const {
+    return wrapped_destination_;
+  }
+
  private:
   friend class InterceptionChainBuilder;
 

data/src/core/call/metadata.cc

@@ -44,9 +44,7 @@ absl::Status ServerMetadataToStatus(ServerMetadata& md) {
   absl::string_view message = error_slice != nullptr
                                   ? error_slice->as_string_view()
                                   : absl::string_view();
-  return grpc_error_set_int(
-      absl::Status(static_cast<absl::StatusCode>(grpc_status), message),
-      StatusIntProperty::kRpcStatus, grpc_status);
+  return absl::Status(static_cast<absl::StatusCode>(grpc_status), message);
 }
 
 void SetServerMetadataFromStatus(ServerMetadata& md,

data/src/core/call/metadata_batch.h

@@ -594,6 +594,14 @@ struct GrpcStreamNetworkState {
   static std::string DisplayValue(ValueType x);
 };
 
+// Annotation added to indicate that the LB policy dropped the call.
+struct LbPolicyDrop {
+  static absl::string_view DebugKey() { return "LbPolicyDrop"; }
+  static constexpr bool kRepeatable = false;
+  using ValueType = bool;
+  static absl::string_view DisplayValue(bool x) { return x ? "true" : "false"; }
+};
+
 // Annotation added by a server transport to note the peer making a request.
 struct PeerString {
   static absl::string_view DebugKey() { return "PeerString"; }
@@ -1752,11 +1760,11 @@ using grpc_metadata_batch_base = grpc_core::MetadataMap<
     grpc_core::XEnvoyPeerMetadata, grpc_core::XForwardedForMetadata,
     grpc_core::XForwardedHostMetadata, grpc_core::W3CTraceParentMetadata,
     // Non-encodable things
-    grpc_core::GrpcStreamNetworkState, grpc_core::PeerString,
-    grpc_core::GrpcStatusContext, grpc_core::GrpcStatusFromWire,
-    grpc_core::GrpcCallWasCancelled, grpc_core::WaitForReady,
-    grpc_core::IsTransparentRetry, grpc_core::GrpcTrailersOnly,
-    grpc_core::GrpcTarPit,
+    grpc_core::GrpcStreamNetworkState, grpc_core::LbPolicyDrop,
+    grpc_core::PeerString, grpc_core::GrpcStatusContext,
+    grpc_core::GrpcStatusFromWire, grpc_core::GrpcCallWasCancelled,
+    grpc_core::WaitForReady, grpc_core::IsTransparentRetry,
+    grpc_core::GrpcTrailersOnly, grpc_core::GrpcTarPit,
     grpc_core::GrpcRegisteredMethod GRPC_CUSTOM_CLIENT_METADATA
         GRPC_CUSTOM_SERVER_METADATA>;
 

data/src/core/call/server_call.cc

@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include <atomic>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
@@ -46,6 +47,7 @@
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/surface/call_utils.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/server/server_interface.h"
 #include "src/core/util/bitset.h"
@@ -57,7 +59,9 @@ namespace grpc_core {
 
 namespace {
 
-grpc_call_error ValidateServerBatch(const grpc_op* ops, size_t nops) {
+grpc_call_error ValidateServerBatch(
+    const grpc_op* ops, size_t nops,
+    CallOpInvariantsValidator& call_op_invariants_validator) {
   BitSet<8> got_ops;
   for (size_t op_idx = 0; op_idx < nops; op_idx++) {
     const grpc_op& op = ops[op_idx];
@@ -96,7 +100,7 @@ grpc_call_error ValidateServerBatch(const grpc_op* ops, size_t nops) {
     if (got_ops.is_set(op.op)) return GRPC_CALL_ERROR_TOO_MANY_OPERATIONS;
     got_ops.set(op.op);
   }
-  return GRPC_CALL_OK;
+  return call_op_invariants_validator.ValidateAndCommit(ops, nops);
 }
 
 }  // namespace
@@ -120,7 +124,8 @@ grpc_call_error ServerCall::StartBatch(const grpc_op* ops, size_t nops,
     EndOpImmediately(cq_, notify_tag, is_notify_tag_closure);
     return GRPC_CALL_OK;
   }
-  const grpc_call_error validation_result = ValidateServerBatch(ops, nops);
+  const grpc_call_error validation_result =
+      ValidateServerBatch(ops, nops, call_op_invariants_validator_);
   if (validation_result != GRPC_CALL_OK) {
     return validation_result;
   }
@@ -131,23 +136,33 @@ grpc_call_error ServerCall::StartBatch(const grpc_op* ops, size_t nops,
 void ServerCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
                              bool is_notify_tag_closure) {
   BatchOpIndex op_index(ops, nops);
+  uint8_t concurrent_ops_to_reset = 0;
   if (!is_notify_tag_closure) grpc_cq_begin_op(cq_, notify_tag);
 
   auto commit_with_send_ops = [&](auto send_ops) {
-    auto recv_message =
-        op_index.OpHandler<GRPC_OP_RECV_MESSAGE>([this](const grpc_op& op) {
+    auto recv_message = op_index.OpHandler<GRPC_OP_RECV_MESSAGE>(
+        [this, &concurrent_ops_to_reset](const grpc_op& op) {
+          concurrent_ops_to_reset |=
+              CallOpInvariantsValidator::OpBit(GRPC_OP_RECV_MESSAGE);
           return message_receiver_.MakeBatchOp(op, &call_handler_);
         });
+    auto self = this->template WeakRefAsSubclass<ServerCall>();
     auto primary_ops =
-        AllOk<StatusFlag>(std::move(send_ops), std::move(recv_message));
+        Map(AllOk<StatusFlag>(std::move(send_ops), std::move(recv_message)),
+            [guard = PrimaryOpsCleanup<ServerCall>(
+                 std::move(self), concurrent_ops_to_reset)](StatusFlag x) {
+              return x;
+            });
+
     if (auto* op = op_index.op(GRPC_OP_RECV_CLOSE_ON_SERVER)) {
       auto recv_trailing_metadata = OpHandler<GRPC_OP_RECV_CLOSE_ON_SERVER>(
-          [this, cancelled = op->data.recv_close_on_server.cancelled]() {
-            return Map(call_handler_.WasCancelled(),
-                       [cancelled, this](bool result) -> Success {
-                         saw_was_cancelled_.store(true,
-                                                  std::memory_order_relaxed);
-                         ResetDeadline();
+          [self = WeakRef(),
+           cancelled = op->data.recv_close_on_server.cancelled]() {
+            return Map(self->call_handler_.WasCancelled(),
+                       [cancelled, self](bool result) -> Success {
+                         self->saw_was_cancelled_.store(
+                             true, std::memory_order_relaxed);
+                         self->ResetDeadline();
                          *cancelled = result ? 1 : 0;
                          return Success{};
                        });
@@ -232,8 +247,10 @@ void ServerCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
                     std::move(metadata));
               };
             });
-    auto send_message =
-        op_index.OpHandler<GRPC_OP_SEND_MESSAGE>([this](const grpc_op& op) {
+    auto send_message = op_index.OpHandler<GRPC_OP_SEND_MESSAGE>(
+        [this, &concurrent_ops_to_reset](const grpc_op& op) {
+          concurrent_ops_to_reset |=
+              CallOpInvariantsValidator::OpBit(GRPC_OP_SEND_MESSAGE);
           SliceBuffer send;
           grpc_slice_buffer_swap(
               &op.data.send_message.send_message->data.raw.slice_buffer,

data/src/core/call/server_call.h

@@ -158,12 +158,16 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
   }
 
  private:
+  template <typename T>
+  friend class PrimaryOpsCleanup;
+
   void CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
                    bool is_notify_tag_closure);
 
   std::string DebugTag() { return absl::StrFormat("SERVER_CALL[%p]: ", this); }
 
   CallHandler call_handler_;
+  CallOpInvariantsValidator call_op_invariants_validator_;
   std::atomic<bool> sent_server_initial_metadata_batch_{false};
   Latch<void> server_initial_metadata_scheduled_;
   MessageReceiver message_receiver_;

data/src/core/channelz/text_encode.cc

@@ -56,10 +56,15 @@ std::string TextEncode(upb_Message* message,
   auto* def = getmsgdef(def_pool);
   size_t size = upb_TextEncode(message, def, def_pool, 0, buf, sizeof(buf));
   if (size < sizeof(buf)) return std::string(buf, size);
-  char* new_buf = new char[size];
-  upb_TextEncode(message, def, def_pool, 0, new_buf, size);
-  std::string result(new_buf, size);
-  delete[] new_buf;
+  // upb_TextEncode has snprintf() semantics: it always NUL-terminates
+  // within the given capacity, so writing size content bytes requires
+  // a capacity of size + 1. We allocate size + 1 bytes in the string,
+  // let upb_TextEncode write the content and the NUL terminator, and then
+  // resize the string back to size to remove the NUL terminator from the
+  // string's active length.
+  std::string result(size + 1, '\0');
+  upb_TextEncode(message, def, def_pool, 0, result.data(), result.size());
+  result.resize(size);
   return result;
 }
 

data/src/core/channelz/v2tov1/convert.cc

@@ -22,6 +22,8 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/timestamp.upb.h"
 #include "google/protobuf/wrappers.upb.h"
+#include "grpc/channelz/v1/channelz.upb.h"
+#include "grpc/channelz/v1/channelz.upbdefs.h"
 #include "src/core/channelz/v2tov1/property_list.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
@@ -29,8 +31,6 @@
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/util/uri.h"
-#include "src/proto/grpc/channelz/channelz.upb.h"
-#include "src/proto/grpc/channelz/channelz.upbdefs.h"
 #include "src/proto/grpc/channelz/v2/channelz.upb.h"
 #include "src/proto/grpc/channelz/v2/property_list.upb.h"
 #include "upb/base/status.h"

data/src/core/client_channel/backup_poller.cc

@@ -63,8 +63,7 @@ static bool g_backup_polling_disabled;
 
 void grpc_client_channel_global_init_backup_polling() {
   g_backup_polling_disabled = grpc_core::IsEventEngineClientEnabled() &&
-                              grpc_core::IsEventEngineListenerEnabled() &&
-                              grpc_core::IsEventEngineDnsEnabled();
+                              grpc_core::IsEventEngineListenerEnabled();
   if (g_backup_polling_disabled) {
     return;
   }

data/src/core/client_channel/client_channel.cc

@@ -275,39 +275,6 @@ class ClientChannel::SubchannelWrapper::WatcherWrapper
         << subchannel_wrapper_->subchannel_.get()
         << " watcher=" << watcher_.get()
         << " state=" << ConnectivityStateName(state) << " status=" << status;
-    if (!IsSubchannelConnectionScalingEnabled()) {
-      auto keepalive_throttling = status.GetPayload(kKeepaliveThrottlingKey);
-      if (keepalive_throttling.has_value()) {
-        int new_keepalive_time_ms = -1;
-        if (absl::SimpleAtoi(std::string(keepalive_throttling.value()),
-                             &new_keepalive_time_ms)) {
-          Duration new_keepalive_time =
-              Duration::Milliseconds(new_keepalive_time_ms);
-          if (new_keepalive_time >
-              subchannel_wrapper_->client_channel_->keepalive_time_) {
-            subchannel_wrapper_->client_channel_->keepalive_time_ =
-                new_keepalive_time;
-            GRPC_TRACE_LOG(client_channel, INFO)
-                << "client_channel="
-                << subchannel_wrapper_->client_channel_.get()
-                << ": throttling keepalive time to "
-                << subchannel_wrapper_->client_channel_->keepalive_time_;
-            // Propagate the new keepalive time to all subchannels. This is so
-            // that new transports created by any subchannel (and not just the
-            // subchannel that received the GOAWAY), use the new keepalive time.
-            for (auto& [subchannel, _] :
-                 subchannel_wrapper_->client_channel_->subchannel_map_) {
-              subchannel->ThrottleKeepaliveTime(new_keepalive_time);
-            }
-          }
-        } else {
-          LOG(ERROR) << "client_channel="
-                     << subchannel_wrapper_->client_channel_.get()
-                     << ": Illegal keepalive throttling value "
-                     << std::string(keepalive_throttling.value());
-        }
-      }
-    }
     // Propagate status only in state TF.
     // We specifically want to avoid propagating the status for
     // state IDLE that the real subchannel gave us only for the
@@ -586,6 +553,12 @@ absl::StatusOr<RefCountedPtr<Channel>> ClientChannel::Create(
   if (target.empty()) {
     return absl::InternalError("target URI is empty in client channel");
   }
+  auto channel_args_mutator =
+      grpc_channel_args_get_client_channel_creation_mutator();
+  if (channel_args_mutator != nullptr) {
+    channel_args =
+        channel_args_mutator(target.c_str(), channel_args, GRPC_CLIENT_CHANNEL);
+  }
   std::string uri_to_resolve = CoreConfiguration::Get()
                                    .proxy_mapper_registry()
                                    .MapName(target, &channel_args)