grpc 1.76.0 → 1.78.0.pre1

data/src/core/ext/filters/http/client_authority_filter.cc

@@ -25,14 +25,14 @@
 #include <memory>
 #include <optional>
 
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/filter/auth/auth_filters.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/util/latent_see.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/http/client_authority_filter.h

@@ -23,13 +23,13 @@
 
 #include <utility>
 
-#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/transport.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_core {
 
@@ -56,6 +56,9 @@ class ClientAuthorityFilter final
     static inline const NoInterceptor OnClientToServerHalfClose;
     static inline const NoInterceptor OnServerToClientMessage;
     static inline const NoInterceptor OnFinalize;
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList();
+    }
   };
 
  private:

data/src/core/ext/filters/http/http_filters_plugin.cc

@@ -18,7 +18,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/strings/match.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/ext/filters/http/message_compress/compression_filter.h"
@@ -28,6 +27,7 @@
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/transport.h"
+#include "absl/strings/match.h"
 
 namespace grpc_core {
 namespace {

data/src/core/ext/filters/http/message_compress/compression_filter.cc

@@ -26,9 +26,6 @@
 #include <optional>
 #include <utility>
 
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -49,6 +46,9 @@
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/latent_see.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/http/message_compress/compression_filter.h

@@ -27,8 +27,6 @@
 #include <cstddef>
 #include <optional>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/channelz/property_list.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -37,6 +35,8 @@
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/transport/transport.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -157,6 +157,15 @@ class ClientCompressionFilter final
     static inline const NoInterceptor OnClientToServerHalfClose;
     static inline const NoInterceptor OnServerTrailingMetadata;
     static inline const NoInterceptor OnFinalize;
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList()
+          .Set("compression_algorithm",
+               CompressionAlgorithmAsString(compression_algorithm_))
+          .Set("max_recv_message_length",
+               decompress_args_.max_recv_message_length.value_or(0))
+          .Set("decompression_algorithm",
+               CompressionAlgorithmAsString(decompress_args_.algorithm));
+    }
 
    private:
     grpc_compression_algorithm compression_algorithm_;
@@ -210,6 +219,16 @@ class ServerCompressionFilter final
     static inline const NoInterceptor OnServerTrailingMetadata;
     static inline const NoInterceptor OnFinalize;
 
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList()
+          .Set("compression_algorithm",
+               CompressionAlgorithmAsString(compression_algorithm_))
+          .Set("max_recv_message_length",
+               decompress_args_.max_recv_message_length.value_or(0))
+          .Set("decompression_algorithm",
+               CompressionAlgorithmAsString(decompress_args_.algorithm));
+    }
+
    private:
     ChannelCompression::DecompressArgs decompress_args_;
     grpc_compression_algorithm compression_algorithm_;

data/src/core/ext/filters/http/server/http_server_filter.cc

@@ -27,9 +27,6 @@
 #include <optional>
 #include <utility>
 
-#include "absl/base/attributes.h"
-#include "absl/log/log.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -44,6 +41,9 @@
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/latent_see.h"
+#include "absl/base/attributes.h"
+#include "absl/log/log.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/http/server/http_server_filter.h

@@ -21,11 +21,11 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/status/statusor.h"
 #include "src/core/channelz/property_list.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_core {
 
@@ -66,6 +66,9 @@ class HttpServerFilter final : public ImplementChannelFilter<HttpServerFilter>,
     static inline const NoInterceptor OnClientToServerHalfClose;
     static inline const NoInterceptor OnServerToClientMessage;
     static inline const NoInterceptor OnFinalize;
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList();
+    }
   };
 
  private:

data/src/core/ext/filters/message_size/message_size_filter.cc

@@ -24,8 +24,6 @@
 #include <functional>
 #include <utility>
 
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -42,6 +40,8 @@
 #include "src/core/lib/transport/transport.h"
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/latent_see.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/message_size/message_size_filter.h

@@ -24,8 +24,6 @@
 #include <memory>
 #include <optional>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
@@ -37,6 +35,8 @@
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -106,6 +106,9 @@ class ServerMessageSizeFilter final
     static inline const NoInterceptor OnClientToServerHalfClose;
     ServerMetadataHandle OnServerToClientMessage(
         const Message& message, ServerMessageSizeFilter* filter);
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList();
+    }
   };
 
  private:
@@ -135,6 +138,9 @@ class ClientMessageSizeFilter final
     ServerMetadataHandle OnClientToServerMessage(const Message& message);
     static inline const NoInterceptor OnClientToServerHalfClose;
     ServerMetadataHandle OnServerToClientMessage(const Message& message);
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList();
+    }
 
    private:
     MessageSizeParsedConfig limits_;

data/src/core/ext/filters/rbac/rbac_filter.cc

@@ -23,7 +23,6 @@
 #include <memory>
 #include <utility>
 
-#include "absl/status/status.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
@@ -38,6 +37,7 @@
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/transport/auth_context.h"
 #include "src/core/util/latent_see.h"
+#include "absl/status/status.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/rbac/rbac_filter.h

@@ -20,13 +20,13 @@
 #include <grpc/support/port_platform.h>
 #include <stddef.h>
 
-#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/transport/transport.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_core {
 
@@ -58,6 +58,9 @@ class RbacFilter : public ImplementChannelFilter<RbacFilter> {
     static inline const NoInterceptor OnClientToServerHalfClose;
     static inline const NoInterceptor OnServerToClientMessage;
     static inline const NoInterceptor OnFinalize;
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList();
+    }
   };
 
  private:

data/src/core/ext/filters/rbac/rbac_service_config_parser.cc

@@ -25,14 +25,14 @@
 #include <optional>
 #include <string>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/matchers.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/rbac/rbac_service_config_parser.h

@@ -25,7 +25,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
@@ -33,6 +32,7 @@
 #include "src/core/service_config/service_config_parser.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/stateful_session/stateful_session_filter.cc

@@ -27,13 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/escaping.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/str_split.h"
-#include "absl/strings/string_view.h"
-#include "absl/strings/strip.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
@@ -51,6 +44,13 @@
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/latent_see.h"
 #include "src/core/util/time.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_split.h"
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 
 namespace grpc_core {
 

data/src/core/ext/filters/stateful_session/stateful_session_filter.h

@@ -22,8 +22,6 @@
 
 #include <utility>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
@@ -33,6 +31,8 @@
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/ref_counted_string.h"
 #include "src/core/util/unique_type_name.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -89,6 +89,17 @@ class StatefulSessionFilter
     static inline const NoInterceptor OnClientToServerHalfClose;
     static inline const NoInterceptor OnServerToClientMessage;
     static inline const NoInterceptor OnFinalize;
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList()
+          .Set("cluster_name", cluster_name_)
+          .Set("override_host_attribute_cookie_address_list",
+               override_host_attribute_->cookie_address_list())
+          .Set("override_host_attribute_actual_address_list",
+               override_host_attribute_->actual_address_list())
+          .Set("cookie_address_list", cookie_address_list_)
+          .Set("cluster_changed", cluster_changed_)
+          .Set("perform_filtering", perform_filtering_);
+    }
 
    private:
     const StatefulSessionMethodParsedConfig::CookieConfig* cookie_config_;

data/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h

@@ -25,7 +25,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config_parser.h"
@@ -34,6 +33,7 @@
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/strings/string_view.h"
 
 // Channel arg key for enabling parsing fault injection via method config.
 #define GRPC_ARG_PARSE_STATEFUL_SESSION_METHOD_CONFIG \

data/src/core/ext/transport/chttp2/client/chttp2_connector.cc

@@ -34,10 +34,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
@@ -48,6 +44,10 @@
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
 #ifndef GRPC_EXPERIMENTAL_TEMPORARILY_DISABLE_PH2
 // GRPC_EXPERIMENTAL_TEMPORARILY_DISABLE_PH2 is a temporary fix to help
 // some customers who are having severe memory constraints. This macro
@@ -93,6 +93,9 @@
 
 namespace grpc_core {
 
+#define GRPC_HTTP2_CONNECTOR_DLOG \
+  DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))
+
 using ::grpc_event_engine::experimental::EventEngine;
 
 namespace {
@@ -169,19 +172,24 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
     result_->Reset();
     NullThenSchedClosure(DEBUG_LOCATION, &notify_, result.status());
   } else if ((*result)->endpoint != nullptr) {
+    GRPC_HTTP2_CONNECTOR_DLOG
+        << "Chttp2Connector::OnHandshakeDone handshake succeeded with endpoint";
     const bool is_callv1 =
         !((*result)->args.GetBool(GRPC_ARG_USE_V3_STACK).value_or(false));
     if (is_callv1) {
+      GRPC_HTTP2_CONNECTOR_DLOG
+          << "Chttp2Connector::OnHandshakeDone creating chttp2 transport";
       result_->transport = grpc_create_chttp2_transport(
           (*result)->args, std::move((*result)->endpoint), true);
       GRPC_CHECK_NE(result_->transport, nullptr);
       result_->channel_args = std::move((*result)->args);
-      Ref().release();  // Ref held by OnReceiveSettings()
-      GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this,
-                        grpc_schedule_on_exec_ctx);
       grpc_chttp2_transport_start_reading(
           result_->transport, (*result)->read_buffer.c_slice_buffer(),
-          &on_receive_settings_, args_.interested_parties, nullptr);
+          [self = RefAsSubclass<Chttp2Connector>()](
+              absl::StatusOr<uint32_t> max_concurrent_streams) {
+            self->OnReceiveSettings(max_concurrent_streams);
+          },
+          args_.interested_parties, nullptr);
       timer_handle_ = event_engine_->RunAfter(
           args_.deadline - Timestamp::Now(),
           [self = RefAsSubclass<Chttp2Connector>()]() mutable {
@@ -199,6 +207,8 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
     }
 #else
     } else {
+      GRPC_HTTP2_CONNECTOR_DLOG
+          << "Chttp2Connector::OnHandshakeDone creating PH2 transport";
       // TODO(tjagtap) : [PH2][P1] : Validate this code block thoroughly once
       // the ping pong test is in place.
       std::unique_ptr<grpc_event_engine::experimental::EventEngine::Endpoint>
@@ -217,15 +227,18 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
               (*result)
                   ->args
                   .GetObjectRef<grpc_event_engine::experimental::EventEngine>();
-      Ref().release();  // Ref held by OnReceiveSettings()
-      GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this,
-                        grpc_schedule_on_exec_ctx);
       // Http2ClientTransport does not take ownership of the channel args.
-      result_->transport = new http2::Http2ClientTransport(
-          std::move(promise_endpoint), (*result)->args, event_engine_ptr,
-          &on_receive_settings_);
+      http2::Http2ClientTransport* client_transport =
+          new http2::Http2ClientTransport(
+              std::move(promise_endpoint), (*result)->args, event_engine_ptr,
+              [self = RefAsSubclass<Chttp2Connector>()](
+                  absl::StatusOr<uint32_t> max_concurrent_streams) {
+                self->OnReceiveSettings(max_concurrent_streams);
+              });
+      GRPC_DCHECK_NE(client_transport, nullptr);
+      result_->transport = client_transport;
       result_->channel_args = std::move((*result)->args);
-      GRPC_DCHECK_NE(result_->transport, nullptr);
+      client_transport->SpawnTransportLoops();
       timer_handle_ = event_engine_->RunAfter(
           args_.deadline - Timestamp::Now(),
           [self = RefAsSubclass<Chttp2Connector>()]() mutable {
@@ -246,31 +259,31 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
   handshake_mgr_.reset();
 }
 
-void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error_handle error) {
-  Chttp2Connector* self = static_cast<Chttp2Connector*>(arg);
-  {
-    MutexLock lock(&self->mu_);
-    if (!self->notify_error_.has_value()) {
-      if (!error.ok()) {
-        // Transport got an error while waiting on SETTINGS frame.
-        self->result_->Reset();
-      }
-      self->MaybeNotify(error);
-      if (self->timer_handle_.has_value()) {
-        if (self->event_engine_->Cancel(*self->timer_handle_)) {
-          // If we have cancelled the timer successfully, call Notify() again
-          // since the timer callback will not be called now.
-          self->MaybeNotify(absl::OkStatus());
-        }
-        self->timer_handle_.reset();
+void Chttp2Connector::OnReceiveSettings(
+    absl::StatusOr<uint32_t> max_concurrent_streams) {
+  MutexLock lock(&mu_);
+  if (max_concurrent_streams.ok()) {
+    result_->max_concurrent_streams = *max_concurrent_streams;
+  }
+  if (!notify_error_.has_value()) {
+    if (!max_concurrent_streams.ok()) {
+      // Transport got an error while waiting on SETTINGS frame.
+      result_->Reset();
+    }
+    MaybeNotify(max_concurrent_streams.status());
+    if (timer_handle_.has_value()) {
+      if (event_engine_->Cancel(*timer_handle_)) {
+        // If we have cancelled the timer successfully, call Notify() again
+        // since the timer callback will not be called now.
+        MaybeNotify(absl::OkStatus());
       }
-    } else {
-      // OnTimeout() was already invoked. Call Notify() again so that notify_
-      // can be invoked.
-      self->MaybeNotify(absl::OkStatus());
+      timer_handle_.reset();
     }
+  } else {
+    // OnTimeout() was already invoked. Call Notify() again so that notify_
+    // can be invoked.
+    MaybeNotify(absl::OkStatus());
   }
-  self->Unref();
 }
 
 void Chttp2Connector::OnTimeout() {

data/src/core/ext/transport/chttp2/client/chttp2_connector.h

@@ -24,7 +24,6 @@
 
 #include <optional>
 
-#include "absl/base/thread_annotations.h"
 #include "src/core/client_channel/connector.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -32,6 +31,7 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
+#include "absl/base/thread_annotations.h"
 
 namespace grpc_core {
 
@@ -42,7 +42,7 @@ class Chttp2Connector : public SubchannelConnector {
 
  private:
   void OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result);
-  static void OnReceiveSettings(void* arg, grpc_error_handle error);
+  void OnReceiveSettings(absl::StatusOr<uint32_t> max_concurrent_streams);
   void OnTimeout() ABSL_LOCKS_EXCLUDED(mu_);
 
   // We cannot invoke notify_ until both OnTimeout() and OnReceiveSettings()
@@ -61,7 +61,6 @@ class Chttp2Connector : public SubchannelConnector {
   Result* result_ = nullptr;
   grpc_closure* notify_ = nullptr;
   bool shutdown_ = false;
-  grpc_closure on_receive_settings_;
   std::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
       timer_handle_ ABSL_GUARDED_BY(mu_);
   // A raw pointer will suffice since args_ holds a copy of the ChannelArgs

data/src/core/ext/transport/chttp2/server/chttp2_server.cc

@@ -37,14 +37,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-#include "absl/strings/strip.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/credentials/transport/insecure/insecure_credentials.h"
@@ -91,6 +83,14 @@
 #include "src/core/util/time.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/uri.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 #include "src/core/lib/iomgr/ev_posix.h"
@@ -207,16 +207,14 @@ void NewChttp2ServerListener::ActiveConnection::HandshakingState::
 }
 
 void NewChttp2ServerListener::ActiveConnection::HandshakingState::
-    OnReceiveSettings(void* arg, grpc_error_handle /* error */) {
-  HandshakingState* self = static_cast<HandshakingState*>(arg);
-  self->connection_->work_serializer_.Run(
-      [self] {
+    OnReceiveSettings() {
+  connection_->work_serializer_.Run(
+      [self = Ref()] {
         if (self->timer_handle_.has_value()) {
           self->connection_->listener_state_->event_engine()->Cancel(
               *self->timer_handle_);
           self->timer_handle_.reset();
         }
-        self->Unref();
       },
       DEBUG_LOCATION);
 }
@@ -240,15 +238,15 @@ void NewChttp2ServerListener::ActiveConnection::HandshakingState::
       // handshake deadline.
       connection_->state_ =
           DownCast<grpc_chttp2_transport*>(transport.get())->Ref();
-      Ref().release();  // Held by OnReceiveSettings().
-      GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this,
-                        grpc_schedule_on_exec_ctx);
       grpc_closure* on_close = &connection_->on_close_;
       // Refs held by OnClose()
       connection_->Ref().release();
       grpc_chttp2_transport_start_reading(
           transport.get(), (*result)->read_buffer.c_slice_buffer(),
-          &on_receive_settings_, nullptr, on_close);
+          [self = Ref()](absl::StatusOr<uint32_t>) {
+            self->OnReceiveSettings();
+          },
+          nullptr, on_close);
       timer_handle_ = connection_->listener_state_->event_engine()->RunAfter(
           deadline_ - Timestamp::Now(), [self = Ref()]() mutable {
             // HandshakingState deletion might require an active ExecCtx.

data/src/core/ext/transport/chttp2/server/chttp2_server.h

@@ -83,7 +83,7 @@ class NewChttp2ServerListener : public Server::ListenerInterface {
       friend class grpc_core::testing::HandshakingStateTestPeer;
 
       void OnTimeoutLocked();
-      static void OnReceiveSettings(void* arg, grpc_error_handle /* error */);
+      void OnReceiveSettings();
       void OnHandshakeDoneLocked(absl::StatusOr<HandshakerArgs*> result);
 
       RefCountedPtr<ActiveConnection> const connection_;
@@ -98,7 +98,6 @@ class NewChttp2ServerListener : public Server::ListenerInterface {
       // State for enforcing handshake timeout on receiving HTTP/2 settings.
       std::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
           timer_handle_;
-      grpc_closure on_receive_settings_;
     };
 
     ActiveConnection(RefCountedPtr<Server::ListenerState> listener_state,