grpc 1.64.0 → 1.65.2

data/src/core/client_channel/client_channel_filter.h

@@ -43,12 +43,9 @@
 #include "src/core/client_channel/dynamic_filters.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
-#include "src/core/lib/channel/call_tracer.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"
-#include "src/core/lib/channel/context.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -60,8 +57,6 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/promise/activity.h"
-#include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/connectivity_state.h"
@@ -71,6 +66,8 @@
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/service_config/service_config.h"
+#include "src/core/telemetry/call_tracer.h"
+#include "src/core/util/time_precise.h"
 
 //
 // Client channel filter
@@ -86,9 +83,6 @@
 // Channel arg key for server URI string.
 #define GRPC_ARG_SERVER_URI "grpc.server_uri"
 
-// Channel arg containing a pointer to the ClientChannelFilter object.
-#define GRPC_ARG_CLIENT_CHANNEL "grpc.internal.client_channel_filter"
-
 // Max number of batches that can be pending on a call at any given
 // time.  This includes one batch for each of the following ops:
 //   recv_initial_metadata
@@ -103,20 +97,16 @@ namespace grpc_core {
 
 class ClientChannelFilter final {
  public:
-  static const grpc_channel_filter kFilterVtableWithPromises;
-  static const grpc_channel_filter kFilterVtableWithoutPromises;
+  static const grpc_channel_filter kFilter;
 
   class LoadBalancedCall;
   class FilterBasedLoadBalancedCall;
-  class PromiseBasedLoadBalancedCall;
 
   // Flag that this object gets stored in channel args as a raw pointer.
   struct RawPointerChannelArgTag {};
-  static absl::string_view ChannelArgName() { return GRPC_ARG_CLIENT_CHANNEL; }
-
-  static ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      grpc_channel_element* elem, CallArgs call_args,
-      NextPromiseFactory next_promise_factory);
+  static absl::string_view ChannelArgName() {
+    return "grpc.internal.client_channel_filter";
+  }
 
   grpc_connectivity_state CheckConnectivityState(bool try_to_connect);
 
@@ -162,20 +152,9 @@ class ClientChannelFilter final {
       grpc_closure* on_call_destruction_complete,
       absl::AnyInvocable<void()> on_commit, bool is_transparent_retry);
 
-  ArenaPromise<ServerMetadataHandle> CreateLoadBalancedCallPromise(
-      CallArgs call_args, absl::AnyInvocable<void()> on_commit,
-      bool is_transparent_retry);
-
-  // Exposed for testing only.
-  static ChannelArgs MakeSubchannelArgs(
-      const ChannelArgs& channel_args, const ChannelArgs& address_args,
-      const RefCountedPtr<SubchannelPoolInterface>& subchannel_pool,
-      const std::string& channel_default_authority);
-
  private:
   class CallData;
   class FilterBasedCallData;
-  class PromiseBasedCallData;
   class ResolverResultHandler;
   class SubchannelWrapper;
   class ClientChannelControlHelper;
@@ -378,8 +357,7 @@ class ClientChannelFilter final {
 class ClientChannelFilter::LoadBalancedCall
     : public InternallyRefCounted<LoadBalancedCall, UnrefCallDtor> {
  public:
-  LoadBalancedCall(ClientChannelFilter* chand,
-                   grpc_call_context_element* call_context,
+  LoadBalancedCall(ClientChannelFilter* chand, Arena* arena,
                    absl::AnyInvocable<void()> on_commit,
                    bool is_transparent_retry);
   ~LoadBalancedCall() override;
@@ -398,8 +376,8 @@ class ClientChannelFilter::LoadBalancedCall
  protected:
   ClientChannelFilter* chand() const { return chand_; }
   ClientCallTracer::CallAttemptTracer* call_attempt_tracer() const {
-    return static_cast<ClientCallTracer::CallAttemptTracer*>(
-        call_context_[GRPC_CONTEXT_CALL_TRACER].value);
+    return DownCast<ClientCallTracer::CallAttemptTracer*>(
+        arena_->GetContext<CallTracerInterface>());
   }
   ConnectedSubchannel* connected_subchannel() const {
     return connected_subchannel_.get();
@@ -408,6 +386,7 @@ class ClientChannelFilter::LoadBalancedCall
   lb_subchannel_call_tracker() const {
     return lb_subchannel_call_tracker_.get();
   }
+  Arena* arena() const { return arena_; }
 
   void Commit() {
     auto on_commit = std::move(on_commit_);
@@ -433,14 +412,11 @@ class ClientChannelFilter::LoadBalancedCall
 
   void RecordLatency();
 
-  grpc_call_context_element* call_context() const { return call_context_; }
-
  private:
   class LbCallState;
   class Metadata;
   class BackendMetricAccessor;
 
-  virtual Arena* arena() const = 0;
   virtual grpc_polling_entity* pollent() = 0;
   virtual grpc_metadata_batch* send_initial_metadata() const = 0;
 
@@ -466,7 +442,7 @@ class ClientChannelFilter::LoadBalancedCall
   const BackendMetricData* backend_metric_data_ = nullptr;
   std::unique_ptr<LoadBalancingPolicy::SubchannelCallTrackerInterface>
       lb_subchannel_call_tracker_;
-  grpc_call_context_element* const call_context_;
+  Arena* const arena_;
 };
 
 class ClientChannelFilter::FilterBasedLoadBalancedCall final
@@ -502,7 +478,6 @@ class ClientChannelFilter::FilterBasedLoadBalancedCall final
   using LoadBalancedCall::chand;
   using LoadBalancedCall::Commit;
 
-  Arena* arena() const override { return arena_; }
   grpc_polling_entity* pollent() override { return pollent_; }
   grpc_metadata_batch* send_initial_metadata() const override {
     return pending_batches_[0]
@@ -557,7 +532,6 @@ class ClientChannelFilter::FilterBasedLoadBalancedCall final
   // TODO(roth): Instead of duplicating these fields in every filter
   // that uses any one of them, we should store them in the call
   // context.  This will save per-call memory overhead.
-  Arena* arena_;
   grpc_call_stack* owning_call_;
   CallCombiner* call_combiner_;
   grpc_polling_entity* pollent_;
@@ -594,33 +568,6 @@ class ClientChannelFilter::FilterBasedLoadBalancedCall final
   grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {};
 };
 
-class ClientChannelFilter::PromiseBasedLoadBalancedCall final
-    : public ClientChannelFilter::LoadBalancedCall {
- public:
-  PromiseBasedLoadBalancedCall(ClientChannelFilter* chand,
-                               absl::AnyInvocable<void()> on_commit,
-                               bool is_transparent_retry);
-
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, OrphanablePtr<PromiseBasedLoadBalancedCall> lb_call);
-
- private:
-  Arena* arena() const override;
-  grpc_polling_entity* pollent() override { return &pollent_; }
-  grpc_metadata_batch* send_initial_metadata() const override;
-
-  void RetryPickLocked() override;
-
-  void OnAddToQueueLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
-
-  grpc_polling_entity pollent_;
-  ClientMetadataHandle client_initial_metadata_;
-  Waker waker_;
-  bool was_queued_ = false;
-  Slice peer_string_;
-};
-
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H

data/src/core/client_channel/client_channel_internal.h

@@ -26,12 +26,12 @@
 
 #include <grpc/support/log.h>
 
-#include "src/core/lib/channel/call_tracer.h"
-#include "src/core/lib/channel/context.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/transport/call_destination.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/service_config/service_config_call_data.h"
+#include "src/core/telemetry/call_tracer.h"
 
 //
 // This file contains internal interfaces used to allow various plugins
@@ -57,9 +57,8 @@ class ClientChannelLbCallState : public LoadBalancingPolicy::CallState {
 // Internal type for ServiceConfigCallData.  Handles call commits.
 class ClientChannelServiceConfigCallData final : public ServiceConfigCallData {
  public:
-  ClientChannelServiceConfigCallData(Arena* arena,
-                                     grpc_call_context_element* call_context)
-      : ServiceConfigCallData(arena, call_context) {}
+  explicit ClientChannelServiceConfigCallData(Arena* arena)
+      : ServiceConfigCallData(arena) {}
 
   void SetOnCommit(absl::AnyInvocable<void()> on_commit) {
     CHECK(on_commit_ == nullptr);
@@ -75,6 +74,18 @@ class ClientChannelServiceConfigCallData final : public ServiceConfigCallData {
   absl::AnyInvocable<void()> on_commit_;
 };
 
+template <>
+struct ContextSubclass<ClientChannelServiceConfigCallData> {
+  using Base = ServiceConfigCallData;
+};
+
+class SubchannelInterfaceWithCallDestination : public SubchannelInterface {
+ public:
+  using SubchannelInterface::SubchannelInterface;
+  // Obtain the call destination for this subchannel.
+  virtual RefCountedPtr<UnstartedCallDestination> call_destination() = 0;
+};
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H

data/src/core/client_channel/client_channel_plugin.cc

@@ -31,24 +31,11 @@
 
 namespace grpc_core {
 
-namespace {
-bool IsEverythingBelowClientChannelPromiseSafe(const ChannelArgs& args) {
-  return !args.GetBool(GRPC_ARG_ENABLE_RETRIES).value_or(true);
-}
-}  // namespace
-
 void BuildClientChannelConfiguration(CoreConfiguration::Builder* builder) {
   internal::ClientChannelServiceConfigParser::Register(builder);
   internal::RetryServiceConfigParser::Register(builder);
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                       &ClientChannelFilter::kFilterVtableWithPromises)
-      .If(IsEverythingBelowClientChannelPromiseSafe)
-      .Terminal();
-  builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                       &ClientChannelFilter::kFilterVtableWithoutPromises)
-      .IfNot(IsEverythingBelowClientChannelPromiseSafe)
+      ->RegisterV2Filter<ClientChannelFilter>(GRPC_CLIENT_CHANNEL)
       .Terminal();
 }
 

data/src/core/client_channel/client_channel_service_config.h

@@ -32,11 +32,11 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_args.h"
-#include "src/core/lib/json/json_object_loader.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_args.h"
+#include "src/core/util/json/json_object_loader.h"
 
 namespace grpc_core {
 namespace internal {

data/src/core/client_channel/config_selector.cc

@@ -19,7 +19,7 @@
 #include "src/core/client_channel/config_selector.h"
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

data/src/core/client_channel/config_selector.h

@@ -33,13 +33,13 @@
 
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/service_config/service_config.h"
+#include "src/core/util/useful.h"
 
 // Channel arg key for ConfigSelector.
 #define GRPC_ARG_CONFIG_SELECTOR "grpc.internal.config_selector"

data/src/core/client_channel/dynamic_filters.cc

@@ -24,6 +24,7 @@
 #include <utility>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/statusor.h"
 
 #include <grpc/support/log.h>
@@ -32,10 +33,10 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/alloc.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/lame_client.h"
+#include "src/core/util/alloc.h"
 
 // Conversion between call and call stack.
 #define CALL_TO_CALL_STACK(call)                                     \
@@ -58,7 +59,6 @@ DynamicFilters::Call::Call(Args args, grpc_error_handle* error)
   const grpc_call_element_args call_args = {
       call_stack,         // call_stack
       nullptr,            // server_transport_data
-      args.context,       // context
       args.path,          // path
       args.start_time,    // start_time
       args.deadline,      // deadline
@@ -68,7 +68,7 @@ DynamicFilters::Call::Call(Args args, grpc_error_handle* error)
   *error = grpc_call_stack_init(channel_stack_->channel_stack_.get(), 1,
                                 Destroy, this, &call_args);
   if (GPR_UNLIKELY(!error->ok())) {
-    gpr_log(GPR_ERROR, "error: %s", StatusToString(*error).c_str());
+    LOG(ERROR) << "error: " << StatusToString(*error);
     return;
   }
   grpc_call_stack_set_pollset_or_pollset_set(call_stack, args.pollent);

data/src/core/client_channel/dynamic_filters.h

@@ -27,8 +27,6 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/context.h"
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -39,6 +37,7 @@
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/time_precise.h"
 
 namespace grpc_core {
 
@@ -54,7 +53,6 @@ class DynamicFilters final : public RefCounted<DynamicFilters> {
       gpr_cycle_counter start_time;
       Timestamp deadline;
       Arena* arena;
-      grpc_call_context_element* context;
       CallCombiner* call_combiner;
     };