grpc 1.52.0.pre2 → 1.53.0.pre2

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

@@ -18,6 +18,7 @@
 
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 
+#include <initializer_list>
 #include <new>
 
 #include "absl/status/status.h"
@@ -304,7 +305,7 @@ static grpc_error_handle message_size_init_channel_elem(
   channel_data* chand = static_cast<channel_data*>(elem->channel_data);
   new (chand) channel_data();
   chand->limits = grpc_core::MessageSizeParsedConfig::GetFromChannelArgs(
-      grpc_core::ChannelArgs::FromC(args->channel_args));
+      args->channel_args);
   return absl::OkStatus();
 }
 

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

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
-#define GRPC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
+#define GRPC_SRC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -87,4 +87,4 @@ absl::optional<uint32_t> GetMaxSendSizeFromChannelArgs(const ChannelArgs& args);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H

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

@@ -23,6 +23,7 @@
 
 #include "absl/status/status.h"
 
+#include <grpc/grpc_security.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
 
@@ -36,6 +37,7 @@
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/service_config/service_config_call_data.h"
 #include "src/core/lib/transport/transport_fwd.h"
+#include "src/core/lib/transport/transport_impl.h"
 
 namespace grpc_core {
 
@@ -144,12 +146,11 @@ RbacFilter::RbacFilter(size_t index,
 grpc_error_handle RbacFilter::Init(grpc_channel_element* elem,
                                    grpc_channel_element_args* args) {
   GPR_ASSERT(elem->filter == &kFilterVtable);
-  auto* auth_context = grpc_find_auth_context_in_args(args->channel_args);
+  auto* auth_context = args->channel_args.GetObject<grpc_auth_context>();
   if (auth_context == nullptr) {
     return GRPC_ERROR_CREATE("No auth context found");
   }
-  auto* transport = grpc_channel_args_find_pointer<grpc_transport>(
-      args->channel_args, GRPC_ARG_TRANSPORT);
+  auto* transport = args->channel_args.GetObject<grpc_transport>();
   if (transport == nullptr) {
     // This should never happen since the transport is always set on the server
     // side.

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

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
-#define GRPC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
+#define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -81,4 +81,4 @@ class RbacFilter {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H

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

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
-#define GRPC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
+#define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -83,4 +83,4 @@ class RbacServiceConfigParser : public ServiceConfigParser::Parser {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H

data/src/core/ext/filters/server_config_selector/server_config_selector.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
-#define GRPC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
+#define GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -80,4 +80,4 @@ class ServerConfigSelectorProvider
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_H

data/src/core/ext/filters/server_config_selector/server_config_selector_filter.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
-#define GRPC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
+#define GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -30,4 +30,4 @@ extern const grpc_channel_filter kServerConfigSelectorFilter;
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_SERVER_CONFIG_SELECTOR_SERVER_CONFIG_SELECTOR_FILTER_H

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

@@ -27,7 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/status/status.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
@@ -47,10 +46,9 @@
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/promise/context.h"
-#include "src/core/lib/promise/detail/basic_seq.h"
-#include "src/core/lib/promise/latch.h"
-#include "src/core/lib/promise/seq.h"
-#include "src/core/lib/promise/try_concurrently.h"
+#include "src/core/lib/promise/map.h"
+#include "src/core/lib/promise/pipe.h"
+#include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/service_config/service_config_call_data.h"
 #include "src/core/lib/slice/slice.h"
@@ -61,13 +59,14 @@ namespace grpc_core {
 
 TraceFlag grpc_stateful_session_filter_trace(false, "stateful_session_filter");
 
-UniqueTypeName XdsHostOverrideTypeName() {
-  static UniqueTypeName::Factory kFactory("xds_host_override");
+UniqueTypeName XdsOverrideHostTypeName() {
+  static UniqueTypeName::Factory kFactory("xds_override_host");
   return kFactory.Create();
 }
 
 const grpc_channel_filter StatefulSessionFilter::kFilter =
-    MakePromiseBasedFilter<StatefulSessionFilter, FilterEndpoint::kClient>(
+    MakePromiseBasedFilter<StatefulSessionFilter, FilterEndpoint::kClient,
+                           kFilterExaminesServerInitialMetadata>(
         "stateful_session_filter");
 
 absl::StatusOr<StatefulSessionFilter> StatefulSessionFilter::Create(
@@ -149,7 +148,7 @@ ArenaPromise<ServerMetadataHandle> StatefulSessionFilter::MakeCallPromise(
     }
   }
   // Check to see if we have a host override cookie.
-  auto cookie_value = GetHostOverrideFromCookie(
+  auto cookie_value = GetOverrideHostFromCookie(
       call_args.client_initial_metadata, *cookie_config->name);
   if (cookie_value.has_value()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_stateful_session_filter_trace)) {
@@ -160,40 +159,31 @@ ArenaPromise<ServerMetadataHandle> StatefulSessionFilter::MakeCallPromise(
     }
     // We have a valid cookie, so add the call attribute to be used by the
     // xds_override_host LB policy.
-    service_config_call_data->SetCallAttribute(XdsHostOverrideTypeName(),
+    service_config_call_data->SetCallAttribute(XdsOverrideHostTypeName(),
                                                *cookie_value);
   }
   // Intercept server initial metadata.
-  auto* read_latch = GetContext<Arena>()->New<Latch<ServerMetadata*>>();
-  auto* write_latch =
-      std::exchange(call_args.server_initial_metadata, read_latch);
-  return TryConcurrently(
-             Seq(next_promise_factory(std::move(call_args)),
-                 [cookie_config, cookie_value](ServerMetadataHandle md) {
-                   // If we got a Trailers-Only response, then add the
-                   // cookie to the trailing metadata instead of the
-                   // initial metadata.
-                   if (md->get(GrpcTrailersOnly()).value_or(false)) {
-                     MaybeUpdateServerInitialMetadata(cookie_config,
-                                                      cookie_value, md.get());
-                   }
-                   return md;
-                 }))
-      .NecessaryPull(Seq(read_latch->Wait(),
-                         [write_latch, cookie_config,
-                          cookie_value](ServerMetadata** md) -> absl::Status {
-                           if (*md != nullptr) {
-                             // Add cookie to server initial metadata if needed.
-                             MaybeUpdateServerInitialMetadata(
-                                 cookie_config, cookie_value, *md);
-                           }
-                           write_latch->Set(*md);
-                           return absl::OkStatus();
-                         }));
+  call_args.server_initial_metadata->InterceptAndMap(
+      [cookie_config, cookie_value](ServerMetadataHandle md) {
+        // Add cookie to server initial metadata if needed.
+        MaybeUpdateServerInitialMetadata(cookie_config, cookie_value, md.get());
+        return md;
+      });
+  return Map(next_promise_factory(std::move(call_args)),
+             [cookie_config, cookie_value](ServerMetadataHandle md) {
+               // If we got a Trailers-Only response, then add the
+               // cookie to the trailing metadata instead of the
+               // initial metadata.
+               if (md->get(GrpcTrailersOnly()).value_or(false)) {
+                 MaybeUpdateServerInitialMetadata(cookie_config, cookie_value,
+                                                  md.get());
+               }
+               return md;
+             });
 }
 
 absl::optional<absl::string_view>
-StatefulSessionFilter::GetHostOverrideFromCookie(
+StatefulSessionFilter::GetOverrideHostFromCookie(
     const ClientMetadataHandle& client_initial_metadata,
     absl::string_view cookie_name) {
   // Check to see if the cookie header is present.

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

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
-#define GRPC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
+#define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -34,7 +34,7 @@
 
 namespace grpc_core {
 
-UniqueTypeName XdsHostOverrideTypeName();
+UniqueTypeName XdsOverrideHostTypeName();
 
 // A filter to provide cookie-based stateful session affinity.
 class StatefulSessionFilter : public ChannelFilter {
@@ -51,7 +51,7 @@ class StatefulSessionFilter : public ChannelFilter {
  private:
   explicit StatefulSessionFilter(ChannelFilter::Args filter_args);
 
-  absl::optional<absl::string_view> GetHostOverrideFromCookie(
+  absl::optional<absl::string_view> GetOverrideHostFromCookie(
       const ClientMetadataHandle& initial_metadata,
       absl::string_view cookie_name);
 
@@ -63,4 +63,4 @@ class StatefulSessionFilter : public ChannelFilter {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H

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

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
-#define GRPC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
+#ifndef GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
+#define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -90,4 +90,4 @@ class StatefulSessionServiceConfigParser final
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
+#endif  // GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H

data/src/core/ext/transport/chttp2/alpn/alpn.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
-#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
 
 #include <grpc/support/port_platform.h>
 
@@ -33,4 +33,4 @@ size_t grpc_chttp2_num_alpn_versions(void);
 // grpc_chttp2_num_alpn_versions())
 const char* grpc_chttp2_get_alpn_version_index(size_t i);
 
-#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H

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

@@ -22,6 +22,7 @@
 
 #include <stdint.h>
 
+#include <initializer_list>
 #include <string>
 #include <type_traits>
 #include <utility>
@@ -167,10 +168,10 @@ void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error_handle error) {
     } else if (args->endpoint != nullptr) {
       self->result_->transport =
           grpc_create_chttp2_transport(args->args, args->endpoint, true);
+      GPR_ASSERT(self->result_->transport != nullptr);
       self->result_->socket_node =
           grpc_chttp2_transport_get_socket_node(self->result_->transport);
       self->result_->channel_args = args->args;
-      GPR_ASSERT(self->result_->transport != nullptr);
       self->endpoint_ = args->endpoint;
       self->Ref().release();  // Ref held by OnReceiveSettings()
       GRPC_CLOSURE_INIT(&self->on_receive_settings_, OnReceiveSettings, self,
@@ -206,9 +207,6 @@ void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error_handle error) {
                                             self->args_.interested_parties);
       if (!error.ok()) {
         // Transport got an error while waiting on SETTINGS frame.
-        // TODO(yashykt): The following two lines should be moved to
-        // SubchannelConnector::Result::Reset()
-        grpc_transport_destroy(self->result_->transport);
         self->result_->Reset();
       }
       self->MaybeNotify(error);
@@ -236,9 +234,6 @@ void Chttp2Connector::OnTimeout() {
     // The transport did not receive the settings frame in time. Destroy the
     // transport.
     grpc_endpoint_delete_from_pollset_set(endpoint_, args_.interested_parties);
-    // TODO(yashykt): The following two lines should be moved to
-    // SubchannelConnector::Result::Reset()
-    grpc_transport_destroy(result_->transport);
     result_->Reset();
     MaybeNotify(GRPC_ERROR_CREATE(
         "connection attempt timed out before receiving SETTINGS frame"));

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
-#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -80,4 +80,4 @@ class Chttp2Connector : public SubchannelConnector {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H

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

@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <memory>
 #include <string>

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
-#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -44,4 +44,4 @@ grpc_error_handle Chttp2ServerAddPort(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H

data/src/core/ext/transport/chttp2/transport/bin_decoder.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
-#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -55,4 +55,4 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input,
 // Infer the length of decoded data from encoded data.
 size_t grpc_chttp2_base64_infer_length_after_decode(const grpc_slice& slice);
 
-#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H

data/src/core/ext/transport/chttp2/transport/bin_encoder.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
-#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -39,4 +39,4 @@ grpc_slice grpc_chttp2_huffman_compress(const grpc_slice& input);
 grpc_slice grpc_chttp2_base64_encode_and_huffman_compress(
     const grpc_slice& input);
 
-#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H