grpc 1.81.1 → 1.82.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d58a5e67d6cf05b54114dfb7095355290f69a459391657279caa301d555307
-  data.tar.gz: eeb373b6a4246f149c24631ace8bfc1e78c7a666774982b8f7556abaeb15b0f2
+  metadata.gz: c5deea4f73a1f2b92f9315c9ba5b38af388bc9332736e53b43471c8c1da808b3
+  data.tar.gz: 5c1faf4887997ed5e9d58ac7702a848f9bdfebc6d232a5ddf450da328a6a7f34
 SHA512:
-  metadata.gz: ab1c195595f71ef70b138dcc6e414f2875d07b909cd9e53af25e26239032c7b04a62e9c22e9cc47766c818d003fe05233f92dca8b9697c65002b5c70c860252a
-  data.tar.gz: de0b49f50de44bd93ced0a5277ecf183314613663ea96c3cd44fed086666c71d68aa7587954412e202bca101798e8e34ffd9c69a9132adfbce154d42943518f8
+  metadata.gz: 004a1338bf87c6fd83953518107bfaa1b5cc7941f815ad34d7322eaf544d80414767e15dbeb99264a6b94438e0ade9848a354d6b4343d7bdb7899a56baafac2c
+  data.tar.gz: 875c9c85467b51d2b496ece0d2f76e531edf59c7ac7ba57407255e539fd36abf500d841887274de8ba66affa252007a8bb3bd3a9c892d5a5d0ffc90c461f9a28

data/Makefile

@@ -367,8 +367,8 @@ E = @echo
 Q = @
 endif
 
-CORE_VERSION = 54.0.0
-CPP_VERSION = 1.81.1
+CORE_VERSION = 55.0.0
+CPP_VERSION = 1.82.0-pre1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -404,7 +404,7 @@ SHARED_EXT_CORE = dll
 SHARED_EXT_CPP = dll
 
 SHARED_PREFIX =
-SHARED_VERSION_CORE = -54
+SHARED_VERSION_CORE = -55
 SHARED_VERSION_CPP = -1
 else ifeq ($(SYSTEM),Darwin)
 EXECUTABLE_SUFFIX =
@@ -733,6 +733,7 @@ LIBGRPC_SRC = \
     src/core/credentials/call/jwt_util.cc \
     src/core/credentials/call/oauth2/oauth2_credentials.cc \
     src/core/credentials/call/plugin/plugin_credentials.cc \
+    src/core/credentials/call/regional_access_boundary_fetcher.cc \
     src/core/credentials/call/token_fetcher/token_fetcher_credentials.cc \
     src/core/credentials/transport/alts/alts_credentials.cc \
     src/core/credentials/transport/alts/alts_security_connector.cc \
@@ -778,9 +779,7 @@ LIBGRPC_SRC = \
     src/core/ext/filters/channel_idle/idle_filter_state.cc \
     src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
     src/core/ext/filters/fault_injection/fault_injection_filter.cc \
-    src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \
     src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc \
-    src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc \
     src/core/ext/filters/http/client/http_client_filter.cc \
     src/core/ext/filters/http/client_authority_filter.cc \
     src/core/ext/filters/http/http_filters_plugin.cc \
@@ -790,7 +789,6 @@ LIBGRPC_SRC = \
     src/core/ext/filters/rbac/rbac_filter.cc \
     src/core/ext/filters/rbac/rbac_service_config_parser.cc \
     src/core/ext/filters/stateful_session/stateful_session_filter.cc \
-    src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
     src/core/ext/transport/chttp2/alpn/alpn.cc \
     src/core/ext/transport/chttp2/chttp2_plugin.cc \
     src/core/ext/transport/chttp2/client/chttp2_connector.cc \
@@ -816,6 +814,7 @@ LIBGRPC_SRC = \
     src/core/ext/transport/chttp2/transport/hpack_parser.cc \
     src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \
     src/core/ext/transport/chttp2/transport/http2_client_transport.cc \
+    src/core/ext/transport/chttp2/transport/http2_server_transport.cc \
     src/core/ext/transport/chttp2/transport/http2_settings.cc \
     src/core/ext/transport/chttp2/transport/http2_settings_manager.cc \
     src/core/ext/transport/chttp2/transport/http2_stats_collector.cc \
@@ -1185,7 +1184,6 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
     src/core/filter/auth/client_auth_filter.cc \
     src/core/filter/auth/server_auth_filter.cc \
-    src/core/filter/blackboard.cc \
     src/core/filter/composite/composite_filter.cc \
     src/core/filter/fused_filters.cc \
     src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
@@ -1350,6 +1348,7 @@ LIBGRPC_SRC = \
     src/core/lib/resource_quota/periodic_update.cc \
     src/core/lib/resource_quota/resource_quota.cc \
     src/core/lib/resource_quota/stream_quota.cc \
+    src/core/lib/resource_quota/telemetry.cc \
     src/core/lib/resource_quota/thread_quota.cc \
     src/core/lib/resource_tracker/resource_tracker.cc \
     src/core/lib/security/authorization/audit_logging.cc \
@@ -1451,6 +1450,7 @@ LIBGRPC_SRC = \
     src/core/server/server_config_selector_filter.cc \
     src/core/server/xds_channel_stack_modifier.cc \
     src/core/server/xds_server_config_fetcher.cc \
+    src/core/server/xds_server_config_fetcher_legacy.cc \
     src/core/service_config/service_config_channel_arg_filter.cc \
     src/core/service_config/service_config_impl.cc \
     src/core/service_config/service_config_parser.cc \
@@ -1465,6 +1465,7 @@ LIBGRPC_SRC = \
     src/core/telemetry/tcp_tracer.cc \
     src/core/transport/auth_context.cc \
     src/core/transport/endpoint_transport_client_channel_factory.cc \
+    src/core/transport/message_size_service_config.cc \
     src/core/transport/session_endpoint.cc \
     src/core/tsi/alts/crypt/aes_gcm.cc \
     src/core/tsi/alts/crypt/gsec.cc \
@@ -1568,6 +1569,7 @@ LIBGRPC_SRC = \
     src/core/util/windows/time.cc \
     src/core/util/windows/tmpfile.cc \
     src/core/util/work_serializer.cc \
+    src/core/xds/grpc/blackboard.cc \
     src/core/xds/grpc/certificate_provider_store.cc \
     src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
     src/core/xds/grpc/xds_audit_logger_registry.cc \
@@ -1800,6 +1802,7 @@ LIBGRPC_SRC = \
     third_party/upb/upb/mini_descriptor/internal/encode.c \
     third_party/upb/upb/mini_descriptor/link.c \
     third_party/upb/upb/mini_table/extension_registry.c \
+    third_party/upb/upb/mini_table/generated_registry.c \
     third_party/upb/upb/mini_table/internal/message.c \
     third_party/upb/upb/mini_table/message.c \
     third_party/upb/upb/reflection/def_pool.c \
@@ -1916,8 +1919,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.54 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.54
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.55 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.55
 	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
 endif
 endif

data/include/grpc/grpc.h

@@ -446,19 +446,18 @@ typedef struct {
 
 typedef struct grpc_server_config_fetcher grpc_server_config_fetcher;
 
+/** EXPERIMENTAL.  Channel arg vtable for server config fetcher. */
+GRPCAPI const grpc_arg_pointer_vtable* grpc_server_config_fetcher_arg_vtable(
+    void);
+
 /** EXPERIMENTAL.  Creates an xDS config fetcher. */
 GRPCAPI grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create(
     grpc_server_xds_status_notifier notifier, const grpc_channel_args* args);
 
-/** EXPERIMENTAL.  Destroys a config fetcher. */
-GRPCAPI void grpc_server_config_fetcher_destroy(
+/** EXPERIMENTAL.  Unrefs a config fetcher. */
+GRPCAPI void grpc_server_config_fetcher_unref(
     grpc_server_config_fetcher* config_fetcher);
 
-/** EXPERIMENTAL.  Sets the server's config fetcher.  Takes ownership.
-    Must be called before adding ports */
-GRPCAPI void grpc_server_set_config_fetcher(
-    grpc_server* server, grpc_server_config_fetcher* config_fetcher);
-
 /** Add a HTTP2 over an encrypted link over tcp listener.
    Returns bound port number on success, 0 on failure.
    REQUIRES: server not started */

data/include/grpc/impl/channel_arg_names.h

@@ -35,7 +35,7 @@
     Boolean valued. Defaults to false. */
 #define GRPC_ARG_MINIMAL_STACK "grpc.minimal_stack"
 /** Maximum number of concurrent incoming streams to allow on a http2
-    connection. Int valued. Deafult to -1(indicating no explicit limit).*/
+    connection. Int valued. Default to -1(indicating no explicit limit).*/
 #define GRPC_ARG_MAX_CONCURRENT_STREAMS "grpc.max_concurrent_streams"
 /** Maximum message length that the channel can receive. Int valued, bytes.
     -1 means unlimited. Defaults to 4MB(4*1024*1024 bytes). -1 means unlimited.
@@ -441,5 +441,7 @@
 /** \} */
 /** If non-zero, enable TCP tracing and stats collection. */
 #define GRPC_ARG_TCP_TRACING_ENABLED "grpc.tcp_tracing_enabled"
+/** Server config fetcher. */
+#define GRPC_ARG_SERVER_CONFIG_FETCHER "grpc.server_config_fetcher"
 
 #endif /* GRPC_IMPL_CHANNEL_ARG_NAMES_H */

data/src/core/call/call_filters.h

@@ -91,7 +91,7 @@
 // It's also acceptable to return a promise that resolves to the
 // relevant return type listed above.
 //
-// OnFinalize is added to intecept call finalization.
+// OnFinalize is added to intercept call finalization.
 // It must have one of the signatures:
 // - static inline const NoInterceptor OnFinalize:
 //   the filter does not intercept call finalization.
@@ -276,7 +276,7 @@ struct CallConstructor {
 
 template <typename FilterType>
 struct CallConstructor<FilterType,
-                       absl::void_t<decltype(typename FilterType::Call(
+                       std::void_t<decltype(typename FilterType::Call(
                            static_cast<FilterType*>(nullptr)))>> {
   static void Construct(void* call_data, FilterType* channel) {
     new (call_data) typename FilterType::Call(channel);

data/src/core/call/client_call.cc

@@ -257,7 +257,7 @@ Party::WakeupHold ClientCall::StartCall(
     const grpc_op& send_initial_metadata_op) {
   GRPC_LATENT_SEE_SCOPE("ClientCall::StartCall");
   auto cur_state = call_state_.load(std::memory_order_acquire);
-  // TODO(akshitpatel): [PH2][P3]: Might need to invoke
+  // TODO(akshitpatel): [PH2][P1]: Might need to invoke
   // PrepareApplicationMetadata here.
   CToMetadata(send_initial_metadata_op.data.send_initial_metadata.metadata,
               send_initial_metadata_op.data.send_initial_metadata.count,

data/src/core/call/interception_chain.h

@@ -29,7 +29,6 @@
 
 namespace grpc_core {
 
-class Blackboard;
 class InterceptionChainBuilder;
 
 // One hijacked call. Using this we can get access to the CallHandler for the
@@ -174,9 +173,8 @@ class InterceptionChainBuilder final {
   using FinalDestination = std::variant<RefCountedPtr<UnstartedCallDestination>,
                                         RefCountedPtr<CallDestination>>;
 
-  explicit InterceptionChainBuilder(ChannelArgs args,
-                                    const Blackboard* blackboard = nullptr)
-      : args_(std::move(args)), blackboard_(blackboard) {}
+  explicit InterceptionChainBuilder(ChannelArgs args)
+      : args_(std::move(args)) {}
 
   // Add a filter with a `Call` class as an inner member.
   // Call class must be one compatible with the filters described in
@@ -185,8 +183,8 @@ class InterceptionChainBuilder final {
   absl::enable_if_t<sizeof(typename T::Call) != 0, InterceptionChainBuilder&>
   Add(RefCountedPtr<const FilterConfig> config) {
     if (!status_.ok()) return *this;
-    auto filter = T::Create(args_, {FilterInstanceId(FilterTypeId<T>()),
-                                    std::move(config), blackboard_});
+    auto filter = T::Create(
+        args_, {FilterInstanceId(FilterTypeId<T>()), std::move(config)});
     if (!filter.ok()) {
       status_ = filter.status();
       return *this;
@@ -202,8 +200,8 @@ class InterceptionChainBuilder final {
   absl::enable_if_t<std::is_base_of<Interceptor, T>::value,
                     InterceptionChainBuilder&>
   Add(RefCountedPtr<const FilterConfig> config) {
-    AddInterceptor(T::Create(args_, {FilterInstanceId(FilterTypeId<T>()),
-                                     std::move(config), blackboard_}));
+    AddInterceptor(T::Create(
+        args_, {FilterInstanceId(FilterTypeId<T>()), std::move(config)}));
     return *this;
   };
 
@@ -282,7 +280,6 @@ class InterceptionChainBuilder final {
   absl::Status status_;
   std::map<size_t, size_t> filter_type_counts_;
   static std::atomic<size_t> next_filter_id_;
-  const Blackboard* blackboard_ = nullptr;
 };
 
 }  // namespace grpc_core

data/src/core/call/metadata.h

@@ -229,7 +229,7 @@ struct StatusCastImpl<ServerMetadataHandle, absl::Status&> {
 template <typename T>
 struct StatusCastImpl<
     ServerMetadataHandle, T,
-    absl::void_t<decltype(&StatusCastImpl<absl::Status, T>::Cast)>> {
+    std::void_t<decltype(&StatusCastImpl<absl::Status, T>::Cast)>> {
   static ServerMetadataHandle Cast(const T& m) {
     return ServerMetadataFromStatus(StatusCast<absl::Status>(m));
   }

data/src/core/call/metadata_batch.cc

@@ -90,7 +90,7 @@ void DebugStringBuilder::AddAfterRedaction(absl::string_view key,
   } else {
     // If the type of metadata is not in the allow list, we want to prevent it
     // from getting logged. Custom metadata types may have sensitive information
-    // that should never be logged. Programatically, we have no way to know
+    // that should never be logged. Programmatically, we have no way to know
     // which data is sensitive and which is not. So we redact all values which
     // are not in the allow list.
     Add(key,

data/src/core/call/metadata_batch.h

@@ -706,7 +706,7 @@ struct IsEncodableTrait {
 };
 
 template <typename Trait>
-struct IsEncodableTrait<Trait, absl::void_t<decltype(Trait::key())>> {
+struct IsEncodableTrait<Trait, std::void_t<decltype(Trait::key())>> {
   static const bool value = true;
 };
 
@@ -885,6 +885,22 @@ class GetStringValueHelper {
     return value->as_string_view();
   }
 
+  template <typename Trait>
+  GPR_ATTRIBUTE_NOINLINE absl::enable_if_t<
+      Trait::kRepeatable == true &&
+          std::is_same<Slice, typename Trait::ValueType>::value,
+      std::optional<absl::string_view>>
+  Found(Trait) {
+    const auto* value = container_->get_pointer(Trait());
+    if (value == nullptr) return std::nullopt;
+    backing_->clear();
+    for (const auto& v : *value) {
+      if (!backing_->empty()) backing_->push_back(',');
+      backing_->append(v.as_string_view());
+    }
+    return *backing_;
+  }
+
   template <typename Trait>
   GPR_ATTRIBUTE_NOINLINE absl::enable_if_t<
       Trait::kRepeatable == true &&

data/src/core/call/parsed_metadata.h

@@ -365,8 +365,13 @@ ParsedMetadata<MetadataContainer>::SliceTraitVTable() {
       metadata_detail::DestroySliceValue,
       // set
       [](const Buffer& value, MetadataContainer* map) {
-        metadata_detail::SetSliceValue<Which::MementoToValue>(
-            map->GetOrCreatePointer(Which()), value);
+        if constexpr (Which::kRepeatable) {
+          map->GetOrCreatePointer(Which())->emplace_back(
+              Which::MementoToValue(metadata_detail::SliceFromBuffer(value)));
+        } else {
+          metadata_detail::SetSliceValue<Which::MementoToValue>(
+              map->GetOrCreatePointer(Which()), value);
+        }
       },
       // with_new_value
       WithNewValueSetSlice<Which::ParseMemento>,

data/src/core/call/server_call.cc

@@ -244,7 +244,8 @@ void ServerCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
 grpc_call* MakeServerCall(CallHandler call_handler,
                           ClientMetadataHandle client_initial_metadata,
                           ServerInterface* server, grpc_completion_queue* cq,
-                          grpc_metadata_array* publish_initial_metadata) {
+                          grpc_metadata_array* publish_initial_metadata,
+                          RefCountedPtr<Arena> parent_arena) {
   PublishMetadataArray(client_initial_metadata.get(), publish_initial_metadata,
                        false);
   // TODO(ctiller): ideally we'd put this in the arena with the CallHandler,
@@ -252,7 +253,8 @@ grpc_call* MakeServerCall(CallHandler call_handler,
   // get destroyed before the base class Call destructor runs, leading to
   // UB/crash. Investigate another path.
   return (new ServerCall(std::move(client_initial_metadata),
-                         std::move(call_handler), server, cq))
+                         std::move(call_handler), server, cq,
+                         std::move(parent_arena)))
       ->c_ptr();
 }
 

data/src/core/call/server_call.h

@@ -62,7 +62,8 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
  public:
   ServerCall(ClientMetadataHandle client_initial_metadata,
              CallHandler call_handler, ServerInterface* server,
-             grpc_completion_queue* cq)
+             grpc_completion_queue* cq,
+             RefCountedPtr<Arena> parent_arena = nullptr)
       : Call(false,
              client_initial_metadata->get(GrpcTimeoutMetadata())
                  .value_or(Timestamp::InfFuture()),
@@ -72,6 +73,11 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
         cq_(cq),
         server_(server) {
     global_stats().IncrementServerCallsCreated();
+    if (parent_arena != nullptr) {
+      auto* parent_ctx = arena()->New<ParentCallContext>();
+      parent_ctx->arena = std::move(parent_arena);
+      arena()->SetContext<ParentCallContext>(parent_ctx);
+    }
     SourceConstructed();
   }
 
@@ -168,7 +174,8 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
 grpc_call* MakeServerCall(CallHandler call_handler,
                           ClientMetadataHandle client_initial_metadata,
                           ServerInterface* server, grpc_completion_queue* cq,
-                          grpc_metadata_array* publish_initial_metadata);
+                          grpc_metadata_array* publish_initial_metadata,
+                          RefCountedPtr<Arena> parent_arena);
 
 }  // namespace grpc_core
 

data/src/core/call/status_util.cc

@@ -115,8 +115,6 @@ bool grpc_status_code_from_int(int status_int, grpc_status_code* status) {
 
 namespace grpc_core {
 
-namespace internal {
-
 std::string StatusCodeSet::ToString() const {
   std::vector<absl::string_view> codes;
   for (size_t i = 0; i < GPR_ARRAY_SIZE(g_status_string_entries); ++i) {
@@ -127,8 +125,6 @@ std::string StatusCodeSet::ToString() const {
   return absl::StrCat("{", absl::StrJoin(codes, ","), "}");
 }
 
-}  // namespace internal
-
 absl::Status MaybeRewriteIllegalStatusCode(absl::Status status,
                                            absl::string_view source) {
   switch (status.code()) {

data/src/core/call/status_util.h

@@ -41,7 +41,6 @@ const char* grpc_status_code_to_string(grpc_status_code status);
 bool grpc_status_code_from_int(int status_int, grpc_status_code* status);
 
 namespace grpc_core {
-namespace internal {
 
 /// A set of grpc_status_code values.
 class StatusCodeSet {
@@ -67,8 +66,6 @@ class StatusCodeSet {
   int status_code_mask_ = 0;  // A bitfield of status codes in the set.
 };
 
-}  // namespace internal
-
 // Optionally rewrites a status as per
 // https://github.com/grpc/proposal/blob/master/A54-restrict-control-plane-status-codes.md.
 // The source parameter indicates where the status came from.

data/src/core/channelz/channel_trace.cc

@@ -269,7 +269,9 @@ void ChannelTrace::RenderEntry(const Entry& entry,
     RenderEntry(entries_[id], child, arena);
     size_t length;
     auto* bytes = grpc_channelz_v2_TraceEvent_serialize(child, arena, &length);
-    auto* data = grpc_channelz_v2_Data_new(arena);
+    // Allocate and attach the Data object directly to the trace_event
+    auto* data = grpc_channelz_v2_TraceEvent_add_data(trace_event, arena);
+    // Set the name and value of the fields in the Data object
     grpc_channelz_v2_Data_set_name(data, StdStringToUpbString("child_trace"));
     auto* any = grpc_channelz_v2_Data_mutable_value(data, arena);
     google_protobuf_Any_set_value(

data/src/core/client_channel/backup_poller.cc

@@ -164,7 +164,7 @@ static bool g_can_poll_in_background() {
   return grpc_iomgr_run_in_background();
 #else
   // No iomgr "event_engines" (not to be confused with the new EventEngine)
-  // are able to run in backgroung.
+  // are able to run in background.
   return false;
 #endif
 }

data/src/core/client_channel/client_channel.cc

@@ -924,12 +924,10 @@ class FilterChainBuilderImpl final : public FilterChainBuilder {
  public:
   FilterChainBuilderImpl(
       bool enable_retries, const ChannelArgs& channel_args,
-      Blackboard* blackboard,
       std::function<void(ServerMetadata&)> on_server_trailing_metadata,
       RefCountedPtr<UnstartedCallDestination> destination)
       : enable_retries_(enable_retries),
         channel_args_(channel_args),
-        blackboard_(blackboard),
         on_server_trailing_metadata_(std::move(on_server_trailing_metadata)),
         destination_(std::move(destination)) {}
 
@@ -954,8 +952,7 @@ class FilterChainBuilderImpl final : public FilterChainBuilder {
   }
 
   void InitBuilder() {
-    builder_ =
-        std::make_unique<InterceptionChainBuilder>(channel_args_, blackboard_);
+    builder_ = std::make_unique<InterceptionChainBuilder>(channel_args_);
     if (on_server_trailing_metadata_ != nullptr) {
       builder_->AddOnServerTrailingMetadata(on_server_trailing_metadata_);
     }
@@ -965,7 +962,6 @@ class FilterChainBuilderImpl final : public FilterChainBuilder {
 
   const bool enable_retries_;
   const ChannelArgs channel_args_;
-  const Blackboard* blackboard_;
   const std::function<void(ServerMetadata&)> on_server_trailing_metadata_;
   const RefCountedPtr<UnstartedCallDestination> destination_;
   std::unique_ptr<InterceptionChainBuilder> builder_;
@@ -1392,15 +1388,13 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked(
   }
   // Modify channel args.
   ChannelArgs new_args = args.SetObject(this).SetObject(saved_service_config_);
-  // Construct filter stack.
-  auto new_blackboard = MakeRefCounted<Blackboard>();
   const bool enable_retries =
       !channel_args_.WantMinimalStack() &&
       channel_args_.GetBool(GRPC_ARG_ENABLE_RETRIES).value_or(true);
   if (enable_retries) {
-    RetryInterceptor::UpdateBlackboard(*saved_service_config_,
-                                       blackboard_.get(), new_blackboard.get());
+    retry_throttler_updater_.Update(*saved_service_config_, new_args);
   }
+  // Construct filter stack.
   std::function<void(ServerMetadata&)> on_server_trailing_metadata;
   if (idle_timeout_ != Duration::Zero()) {
     on_server_trailing_metadata = [this](ServerMetadata&) {
@@ -1408,11 +1402,9 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked(
     };
   }
   FilterChainBuilderImpl filter_chain_builder(
-      enable_retries, new_args, new_blackboard.get(),
-      std::move(on_server_trailing_metadata), call_destination_);
-  config_selector->BuildFilterChains(filter_chain_builder, blackboard_.get(),
-                                     new_blackboard.get());
-  blackboard_ = std::move(new_blackboard);
+      enable_retries, new_args, std::move(on_server_trailing_metadata),
+      call_destination_);
+  config_selector->BuildFilterChains(filter_chain_builder);
   resolver_data_for_calls_.Set(std::move(config_selector));
 }
 

data/src/core/client_channel/client_channel.h

@@ -22,9 +22,9 @@
 #include "src/core/call/metadata.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
+#include "src/core/client_channel/retry_throttle.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
-#include "src/core/filter/blackboard.h"
 #include "src/core/lib/promise/observable.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/load_balancing/lb_policy.h"
@@ -213,7 +213,7 @@ class ClientChannel : public Channel {
       ABSL_GUARDED_BY(*work_serializer_);
   RefCountedPtr<ConfigSelector> saved_config_selector_
       ABSL_GUARDED_BY(*work_serializer_);
-  RefCountedPtr<const Blackboard> blackboard_
+  RetryThrottlerChannelArgsUpdater retry_throttler_updater_
       ABSL_GUARDED_BY(*work_serializer_);
   OrphanablePtr<LoadBalancingPolicy> lb_policy_
       ABSL_GUARDED_BY(*work_serializer_);

data/src/core/client_channel/client_channel_filter.cc

@@ -1422,11 +1422,8 @@ namespace {
 // Filter chain builder impl to inject into ConfigSelector.
 class LegacyFilterChainBuilder final : public FilterChainBuilder {
  public:
-  LegacyFilterChainBuilder(bool enable_retries, const ChannelArgs& channel_args,
-                           const Blackboard* blackboard)
-      : enable_retries_(enable_retries),
-        channel_args_(channel_args),
-        blackboard_(blackboard) {}
+  LegacyFilterChainBuilder(bool enable_retries, const ChannelArgs& channel_args)
+      : enable_retries_(enable_retries), channel_args_(channel_args) {}
 
   absl::StatusOr<RefCountedPtr<FilterChain>> Build() override {
     if (enable_retries_) {
@@ -1435,7 +1432,7 @@ class LegacyFilterChainBuilder final : public FilterChainBuilder {
       filters_.push_back({&DynamicTerminationFilter::kFilterVtable, nullptr});
     }
     RefCountedPtr<DynamicFilters> dynamic_filters =
-        DynamicFilters::Create(channel_args_, std::move(filters_), blackboard_);
+        DynamicFilters::Create(channel_args_, std::move(filters_));
     if (dynamic_filters == nullptr) {
       return absl::InternalError("error constructing dynamic filter stack");
     }
@@ -1451,7 +1448,6 @@ class LegacyFilterChainBuilder final : public FilterChainBuilder {
 
   const bool enable_retries_;
   const ChannelArgs channel_args_;
-  const Blackboard* blackboard_;
   std::vector<FilterAndConfig> filters_;
 };
 
@@ -1475,17 +1471,12 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked(
   bool enable_retries =
       !new_args.WantMinimalStack() &&
       new_args.GetBool(GRPC_ARG_ENABLE_RETRIES).value_or(true);
-  // Construct dynamic filter stack.
-  auto new_blackboard = MakeRefCounted<Blackboard>();
   if (enable_retries) {
-    RetryFilter::UpdateBlackboard(*service_config, blackboard_.get(),
-                                  new_blackboard.get());
-  }
-  LegacyFilterChainBuilder filter_chain_builder(enable_retries, new_args,
-                                                new_blackboard.get());
-  config_selector->BuildFilterChains(filter_chain_builder, blackboard_.get(),
-                                     new_blackboard.get());
-  blackboard_ = std::move(new_blackboard);
+    retry_throttler_updater_.Update(*service_config, new_args);
+  }
+  // Construct dynamic filter stack.
+  LegacyFilterChainBuilder filter_chain_builder(enable_retries, new_args);
+  config_selector->BuildFilterChains(filter_chain_builder);
   // Grab data plane lock to update service config.
   //
   // We defer unreffing the old values (and deallocating memory) until

data/src/core/client_channel/client_channel_filter.h

@@ -36,9 +36,9 @@
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/dynamic_filters.h"
+#include "src/core/client_channel/retry_throttle.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
-#include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -300,7 +300,7 @@ class ClientChannelFilter final {
       ABSL_GUARDED_BY(*work_serializer_);
   RefCountedPtr<ConfigSelector> saved_config_selector_
       ABSL_GUARDED_BY(*work_serializer_);
-  RefCountedPtr<const Blackboard> blackboard_
+  RetryThrottlerChannelArgsUpdater retry_throttler_updater_
       ABSL_GUARDED_BY(*work_serializer_);
   OrphanablePtr<LoadBalancingPolicy> lb_policy_
       ABSL_GUARDED_BY(*work_serializer_);

data/src/core/client_channel/client_channel_plugin.cc

@@ -32,7 +32,7 @@ namespace grpc_core {
 
 void BuildClientChannelConfiguration(CoreConfiguration::Builder* builder) {
   internal::ClientChannelServiceConfigParser::Register(builder);
-  internal::RetryServiceConfigParser::Register(builder);
+  RetryServiceConfigParser::Register(builder);
   builder->channel_init()
       ->RegisterV2Filter<ClientChannelFilter>(GRPC_CLIENT_CHANNEL)
       .Terminal();

data/src/core/client_channel/config_selector.h

@@ -27,7 +27,6 @@
 #include "src/core/call/interception_chain.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/client_channel/client_channel_internal.h"
-#include "src/core/filter/blackboard.h"
 #include "src/core/filter/filter_chain.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/resource_quota/arena.h"
@@ -63,9 +62,7 @@ class ConfigSelector : public RefCounted<ConfigSelector> {
 
   // The channel will call this when the resolver returns a new ConfigSelector
   // to initialize the filter chains that the ConfigSelector may need.
-  virtual void BuildFilterChains(FilterChainBuilder& builder,
-                                 const Blackboard* old_blackboard,
-                                 Blackboard* new_blackboard) = 0;
+  virtual void BuildFilterChains(FilterChainBuilder& builder) = 0;
 
   // Gets the configuration for the call and stores it in service config
   // call data.
@@ -105,9 +102,7 @@ class DefaultConfigSelector final : public ConfigSelector {
     return kFactory.Create();
   }
 
-  void BuildFilterChains(FilterChainBuilder& builder,
-                         const Blackboard* /*old_blackboard*/,
-                         Blackboard* /*new_blackboard*/) override {
+  void BuildFilterChains(FilterChainBuilder& builder) override {
     filter_chain_ = builder.Build();
   }