grpc 1.60.0 → 1.62.0

data/src/core/{ext/filters/client_channel/client_channel.h → client_channel/client_channel_filter.h}

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -37,12 +37,11 @@
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 
-#include "src/core/ext/filters/client_channel/client_channel_factory.h"
-#include "src/core/ext/filters/client_channel/config_selector.h"
-#include "src/core/ext/filters/client_channel/dynamic_filters.h"
-#include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h"
-#include "src/core/ext/filters/client_channel/subchannel.h"
-#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
+#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/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"
@@ -61,17 +60,18 @@
 #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/load_balancing/lb_policy.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/arena_promise.h"
-#include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/service_config/service_config.h"
+#include "src/core/service_config/service_config.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/load_balancing/backend_metric_data.h"
+#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/resolver/resolver.h"
 
 //
 // Client channel filter
@@ -87,8 +87,8 @@
 // Channel arg key for server URI string.
 #define GRPC_ARG_SERVER_URI "grpc.server_uri"
 
-// Channel arg containing a pointer to the ClientChannel object.
-#define GRPC_ARG_CLIENT_CHANNEL "grpc.internal.client_channel"
+// 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:
@@ -102,7 +102,7 @@
 
 namespace grpc_core {
 
-class ClientChannel {
+class ClientChannelFilter {
  public:
   static const grpc_channel_filter kFilterVtableWithPromises;
   static const grpc_channel_filter kFilterVtableWithoutPromises;
@@ -115,9 +115,9 @@ class ClientChannel {
   struct RawPointerChannelArgTag {};
   static absl::string_view ChannelArgName() { return GRPC_ARG_CLIENT_CHANNEL; }
 
-  // Returns the ClientChannel object from channel, or null if channel
+  // Returns the ClientChannelFilter object from channel, or null if channel
   // is not a client channel.
-  static ClientChannel* GetFromChannel(Channel* channel);
+  static ClientChannelFilter* GetFromChannel(Channel* channel);
 
   static ArenaPromise<ServerMetadataHandle> MakeCallPromise(
       grpc_channel_element* elem, CallArgs call_args,
@@ -196,7 +196,7 @@ class ClientChannel {
   // via grpc_client_channel_watch_connectivity_state().
   class ExternalConnectivityWatcher : public ConnectivityStateWatcherInterface {
    public:
-    ExternalConnectivityWatcher(ClientChannel* chand,
+    ExternalConnectivityWatcher(ClientChannelFilter* chand,
                                 grpc_polling_entity pollent,
                                 grpc_connectivity_state* state,
                                 grpc_closure* on_complete,
@@ -205,7 +205,7 @@ class ClientChannel {
     ~ExternalConnectivityWatcher() override;
 
     // Removes the watcher from the external_watchers_ map.
-    static void RemoveWatcherFromExternalWatchersMap(ClientChannel* chand,
+    static void RemoveWatcherFromExternalWatchersMap(ClientChannelFilter* chand,
                                                      grpc_closure* on_complete,
                                                      bool cancel);
 
@@ -222,7 +222,7 @@ class ClientChannel {
     void RemoveWatcherLocked()
         ABSL_EXCLUSIVE_LOCKS_REQUIRED(*chand_->work_serializer_);
 
-    ClientChannel* chand_;
+    ClientChannelFilter* chand_;
     grpc_polling_entity pollent_;
     grpc_connectivity_state initial_state_;
     grpc_connectivity_state* state_;
@@ -231,8 +231,9 @@ class ClientChannel {
     std::atomic<bool> done_{false};
   };
 
-  ClientChannel(grpc_channel_element_args* args, grpc_error_handle* error);
-  ~ClientChannel();
+  ClientChannelFilter(grpc_channel_element_args* args,
+                      grpc_error_handle* error);
+  ~ClientChannelFilter();
 
   // Filter vtable functions.
   static grpc_error_handle Init(grpc_channel_element* elem,
@@ -378,15 +379,15 @@ class ClientChannel {
 };
 
 //
-// ClientChannel::LoadBalancedCall
+// ClientChannelFilter::LoadBalancedCall
 //
 
 // TODO(roth): As part of simplifying cancellation in the filter stack,
 // this should no longer need to be ref-counted.
-class ClientChannel::LoadBalancedCall
+class ClientChannelFilter::LoadBalancedCall
     : public InternallyRefCounted<LoadBalancedCall, UnrefCallDtor> {
  public:
-  LoadBalancedCall(ClientChannel* chand,
+  LoadBalancedCall(ClientChannelFilter* chand,
                    grpc_call_context_element* call_context,
                    absl::AnyInvocable<void()> on_commit,
                    bool is_transparent_retry);
@@ -396,15 +397,15 @@ class ClientChannel::LoadBalancedCall
 
   // Called by channel when removing a call from the list of queued calls.
   void RemoveCallFromLbQueuedCallsLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   // Called by the channel for each queued call when a new picker
   // becomes available.
   virtual void RetryPickLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_) = 0;
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_) = 0;
 
  protected:
-  ClientChannel* chand() const { return chand_; }
+  ClientChannelFilter* chand() const { return chand_; }
   ClientCallTracer::CallAttemptTracer* call_attempt_tracer() const {
     return static_cast<ClientCallTracer::CallAttemptTracer*>(
         call_context_[GRPC_CONTEXT_CALL_TRACER].value);
@@ -458,13 +459,13 @@ class ClientChannel::LoadBalancedCall
                           grpc_error_handle* error);
   // Adds the call to the channel's list of queued picks if not already present.
   void AddCallToLbQueuedCallsLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   // Called when adding the call to the LB queue.
   virtual void OnAddToQueueLocked()
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_) = 0;
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_) = 0;
 
-  ClientChannel* chand_;
+  ClientChannelFilter* chand_;
 
   absl::AnyInvocable<void()> on_commit_;
 
@@ -477,8 +478,8 @@ class ClientChannel::LoadBalancedCall
   grpc_call_context_element* const call_context_;
 };
 
-class ClientChannel::FilterBasedLoadBalancedCall
-    : public ClientChannel::LoadBalancedCall {
+class ClientChannelFilter::FilterBasedLoadBalancedCall
+    : public ClientChannelFilter::LoadBalancedCall {
  public:
   // If on_call_destruction_complete is non-null, then it will be
   // invoked once the LoadBalancedCall is completely destroyed.
@@ -486,7 +487,7 @@ class ClientChannel::FilterBasedLoadBalancedCall
   // the LB call has a subchannel call and ensuring that the
   // on_call_destruction_complete closure passed down from the surface
   // is not invoked until after the subchannel call stack is destroyed.
-  FilterBasedLoadBalancedCall(ClientChannel* chand,
+  FilterBasedLoadBalancedCall(ClientChannelFilter* chand,
                               const grpc_call_element_args& args,
                               grpc_polling_entity* pollent,
                               grpc_closure* on_call_destruction_complete,
@@ -555,10 +556,10 @@ class ClientChannel::FilterBasedLoadBalancedCall
   void TryPick(bool was_queued);
 
   void OnAddToQueueLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   void RetryPickLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   void CreateSubchannelCall();
 
@@ -579,9 +580,8 @@ class ClientChannel::FilterBasedLoadBalancedCall
   // Set when we fail inside the LB call.
   grpc_error_handle failure_error_;
 
-  // Accessed while holding ClientChannel::lb_mu_.
   LbQueuedCallCanceller* lb_call_canceller_
-      ABSL_GUARDED_BY(&ClientChannel::lb_mu_) = nullptr;
+      ABSL_GUARDED_BY(&ClientChannelFilter::lb_mu_) = nullptr;
 
   RefCountedPtr<SubchannelCall> subchannel_call_;
 
@@ -604,10 +604,10 @@ class ClientChannel::FilterBasedLoadBalancedCall
   grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {};
 };
 
-class ClientChannel::PromiseBasedLoadBalancedCall
-    : public ClientChannel::LoadBalancedCall {
+class ClientChannelFilter::PromiseBasedLoadBalancedCall
+    : public ClientChannelFilter::LoadBalancedCall {
  public:
-  PromiseBasedLoadBalancedCall(ClientChannel* chand,
+  PromiseBasedLoadBalancedCall(ClientChannelFilter* chand,
                                absl::AnyInvocable<void()> on_commit,
                                bool is_transparent_retry);
 
@@ -622,7 +622,7 @@ class ClientChannel::PromiseBasedLoadBalancedCall
   void RetryPickLocked() override;
 
   void OnAddToQueueLocked() override
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::lb_mu_);
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannelFilter::lb_mu_);
 
   grpc_polling_entity pollent_;
   ClientMetadataHandle client_initial_metadata_;
@@ -633,4 +633,4 @@ class ClientChannel::PromiseBasedLoadBalancedCall
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H

data/src/core/{ext/filters/client_channel → client_channel}/client_channel_internal.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -25,16 +25,17 @@
 
 #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/load_balancing/lb_policy.h"
 #include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/service_config/service_config_call_data.h"
+#include "src/core/service_config/service_config_call_data.h"
+#include "src/core/load_balancing/lb_policy.h"
 
 //
 // This file contains internal interfaces used to allow various plugins
 // (filters, LB policies, etc) to access internal data provided by the
-// ClientChannel that is not normally accessible via external APIs.
+// ClientChannelFilter that is not normally accessible via external APIs.
 //
 
 // Channel arg key for health check service name.
@@ -49,6 +50,7 @@ class ClientChannelLbCallState : public LoadBalancingPolicy::CallState {
  public:
   virtual ServiceConfigCallData::CallAttributeInterface* GetCallAttribute(
       UniqueTypeName type) const = 0;
+  virtual ClientCallTracer::CallAttemptTracer* GetCallAttemptTracer() const = 0;
 };
 
 // Internal type for ServiceConfigCallData.  Handles call commits.
@@ -74,4 +76,4 @@ class ClientChannelServiceConfigCallData : public ServiceConfigCallData {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_INTERNAL_H

data/src/core/{ext/filters/client_channel → client_channel}/client_channel_plugin.cc

@@ -22,9 +22,9 @@
 
 #include <grpc/impl/channel_arg_names.h>
 
-#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/client_channel_service_config.h"
-#include "src/core/ext/filters/client_channel/retry_service_config.h"
+#include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/client_channel/client_channel_service_config.h"
+#include "src/core/client_channel/retry_service_config.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/channel_stack_type.h"
@@ -42,12 +42,12 @@ void BuildClientChannelConfiguration(CoreConfiguration::Builder* builder) {
   internal::RetryServiceConfigParser::Register(builder);
   builder->channel_init()
       ->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                       &ClientChannel::kFilterVtableWithPromises)
+                       &ClientChannelFilter::kFilterVtableWithPromises)
       .If(IsEverythingBelowClientChannelPromiseSafe)
       .Terminal();
   builder->channel_init()
       ->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                       &ClientChannel::kFilterVtableWithoutPromises)
+                       &ClientChannelFilter::kFilterVtableWithoutPromises)
       .IfNot(IsEverythingBelowClientChannelPromiseSafe)
       .Terminal();
 }

data/src/core/{ext/filters/client_channel → client_channel}/client_channel_service_config.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/client_channel_service_config.h"
+#include "src/core/client_channel/client_channel_service_config.h"
 
 #include <map>
 #include <utility>
@@ -27,7 +27,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 
-#include "src/core/lib/load_balancing/lb_policy_registry.h"
+#include "src/core/load_balancing/lb_policy_registry.h"
 
 // As per the retry design, we do not allow more than 5 retry attempts.
 #define MAX_MAX_RETRY_ATTEMPTS 5

data/src/core/{ext/filters/client_channel → client_channel}/client_channel_service_config.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
 
 #include <grpc/support/port_platform.h>
 
@@ -35,8 +35,8 @@
 #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/lib/load_balancing/lb_policy.h"
-#include "src/core/lib/service_config/service_config_parser.h"
+#include "src/core/service_config/service_config_parser.h"
+#include "src/core/load_balancing/lb_policy.h"
 
 namespace grpc_core {
 namespace internal {
@@ -108,4 +108,4 @@ class ClientChannelServiceConfigParser : public ServiceConfigParser::Parser {
 }  // namespace internal
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H

data/src/core/{ext/filters/client_channel → client_channel}/config_selector.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/config_selector.h"
+#include "src/core/client_channel/config_selector.h"
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/useful.h"

data/src/core/{ext/filters/client_channel → client_channel}/config_selector.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONFIG_SELECTOR_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONFIG_SELECTOR_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -30,13 +30,13 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/ext/filters/client_channel/client_channel_internal.h"
+#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/service_config/service_config.h"
+#include "src/core/service_config/service_config.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
@@ -122,4 +122,4 @@ class DefaultConfigSelector : public ConfigSelector {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONFIG_SELECTOR_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H

data/src/core/{ext/filters/client_channel → client_channel}/connector.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONNECTOR_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_CONNECTOR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -84,4 +84,4 @@ class SubchannelConnector : public InternallyRefCounted<SubchannelConnector> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_CONNECTOR_H

data/src/core/{ext/filters/client_channel → client_channel}/dynamic_filters.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/dynamic_filters.h"
+#include "src/core/client_channel/dynamic_filters.h"
 
 #include <stddef.h>
 

data/src/core/{ext/filters/client_channel → client_channel}/dynamic_filters.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -107,4 +107,4 @@ class DynamicFilters : public RefCounted<DynamicFilters> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H

data/src/core/{ext/filters/client_channel → client_channel}/global_subchannel_pool.cc

@@ -18,17 +18,17 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/global_subchannel_pool.h"
+#include "src/core/client_channel/global_subchannel_pool.h"
 
 #include <utility>
 
-#include "src/core/ext/filters/client_channel/subchannel.h"
+#include "src/core/client_channel/subchannel.h"
 
 namespace grpc_core {
 
 RefCountedPtr<GlobalSubchannelPool> GlobalSubchannelPool::instance() {
   static GlobalSubchannelPool* p = new GlobalSubchannelPool();
-  return p->Ref();
+  return p->RefAsSubclass<GlobalSubchannelPool>();
 }
 
 RefCountedPtr<Subchannel> GlobalSubchannelPool::RegisterSubchannel(

data/src/core/{ext/filters/client_channel → client_channel}/global_subchannel_pool.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -25,7 +25,7 @@
 
 #include "absl/base/thread_annotations.h"
 
-#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
+#include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 
@@ -60,4 +60,4 @@ class GlobalSubchannelPool final : public SubchannelPoolInterface {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H

data/src/core/{ext/filters/client_channel → client_channel}/http_proxy_mapper.cc

@@ -18,7 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/http_proxy_mapper.h"
+#include "src/core/client_channel/http_proxy_mapper.h"
 
 #include <stdint.h>
 #include <string.h>

data/src/core/{ext/filters/client_channel → client_channel}/http_proxy_mapper.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -50,4 +50,4 @@ void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_HTTP_PROXY_MAPPER_H

data/src/core/{ext/filters/client_channel → client_channel}/local_subchannel_pool.cc

@@ -18,13 +18,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/local_subchannel_pool.h"
+#include "src/core/client_channel/local_subchannel_pool.h"
 
 #include <utility>
 
 #include <grpc/support/log.h>
 
-#include "src/core/ext/filters/client_channel/subchannel.h"
+#include "src/core/client_channel/subchannel.h"
 
 namespace grpc_core {
 

data/src/core/{ext/filters/client_channel → client_channel}/local_subchannel_pool.h

@@ -16,14 +16,14 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
+#ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
+#define GRPC_SRC_CORE_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
 
 #include <grpc/support/port_platform.h>
 
 #include <map>
 
-#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
+#include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -56,4 +56,4 @@ class LocalSubchannelPool final : public SubchannelPoolInterface {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
+#endif  // GRPC_SRC_CORE_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H

data/src/core/{ext/filters/client_channel → client_channel}/retry_filter.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/retry_filter.h"
+#include "src/core/client_channel/retry_filter.h"
 
 #include <string>
 
@@ -26,17 +26,17 @@
 
 #include <grpc/event_engine/event_engine.h>
 
-#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h"
-#include "src/core/ext/filters/client_channel/retry_service_config.h"
-#include "src/core/ext/filters/client_channel/retry_throttle.h"
+#include "src/core/client_channel/client_channel_filter.h"
+#include "src/core/client_channel/retry_filter_legacy_call_data.h"
+#include "src/core/client_channel/retry_service_config.h"
+#include "src/core/client_channel/retry_throttle.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/service_config/service_config.h"
-#include "src/core/lib/service_config/service_config_call_data.h"
+#include "src/core/service_config/service_config.h"
+#include "src/core/service_config/service_config_call_data.h"
 #include "src/core/lib/uri/uri_parser.h"
 
 //
@@ -98,7 +98,7 @@ namespace grpc_core {
 //
 
 RetryFilter::RetryFilter(const ChannelArgs& args, grpc_error_handle* error)
-    : client_channel_(args.GetObject<ClientChannel>()),
+    : client_channel_(args.GetObject<ClientChannelFilter>()),
       event_engine_(args.GetObject<EventEngine>()),
       per_rpc_retry_buffer_size_(GetMaxPerRpcRetryBufferSize(args)),
       service_config_parser_index_(
@@ -143,6 +143,7 @@ const RetryMethodConfig* RetryFilter::GetRetryPolicy(
 const grpc_channel_filter RetryFilter::kVtable = {
     RetryFilter::LegacyCallData::StartTransportStreamOpBatch,
     nullptr,
+    /* init_call: */ nullptr,
     RetryFilter::StartTransportOp,
     sizeof(RetryFilter::LegacyCallData),
     RetryFilter::LegacyCallData::Init,