grpc 1.47.0-x86_64-linux → 1.49.0.pre1-x86_64-linux

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

@@ -30,6 +30,7 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
 #include <grpc/impl/codegen/connectivity_state.h>
@@ -39,13 +40,13 @@
 #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.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/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/channel_stack_builder.h"
 #include "src/core/lib/channel/channelz.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/gpr/time_precise.h"
@@ -54,20 +55,22 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/gprpp/unique_type_name.h"
+#include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/closure.h"
 #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/iomgr/work_serializer.h"
+#include "src/core/lib/load_balancing/lb_policy.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/lib/service_config/service_config_call_data.h"
 #include "src/core/lib/service_config/service_config_parser.h"
 #include "src/core/lib/slice/slice.h"
+#include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/surface/channel.h"
-#include "src/core/lib/transport/byte_stream.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
@@ -89,9 +92,6 @@
 // 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 ServiceConfig object.
-#define GRPC_ARG_SERVICE_CONFIG_OBJ "grpc.internal.service_config_obj"
-
 // 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
@@ -110,6 +110,10 @@ class ClientChannel {
 
   class LoadBalancedCall;
 
+  // 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; }
+
   // Returns the ClientChannel object from channel, or null if channel
   // is not a client channel.
   static ClientChannel* GetFromChannel(Channel* channel);
@@ -164,6 +168,12 @@ class ClientChannel {
       ConfigSelector::CallDispatchController* call_dispatch_controller,
       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 ResolverResultHandler;
@@ -245,8 +255,7 @@ class ClientChannel {
       const absl::optional<std::string>& health_check_service_name,
       Resolver::Result result) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_);
   OrphanablePtr<LoadBalancingPolicy> CreateLbPolicyLocked(
-      const grpc_channel_args& args)
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_);
+      const ChannelArgs& args) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*work_serializer_);
 
   void UpdateStateAndPickerLocked(
       grpc_connectivity_state state, const absl::Status& status,
@@ -291,10 +300,10 @@ class ClientChannel {
   //
   // Fields set at construction and never modified.
   //
+  ChannelArgs channel_args_;
   const bool deadline_checking_enabled_;
   grpc_channel_stack* owning_stack_;
   ClientChannelFactory* client_channel_factory_;
-  const grpc_channel_args* channel_args_;
   RefCountedPtr<ServiceConfig> default_service_config_;
   std::string uri_to_resolve_;
   std::string default_authority_;
@@ -382,6 +391,20 @@ class ClientChannel {
 class ClientChannel::LoadBalancedCall
     : public InternallyRefCounted<LoadBalancedCall, kUnrefCallDtor> {
  public:
+  class LbCallState : public LoadBalancingPolicy::CallState {
+   public:
+    explicit LbCallState(LoadBalancedCall* lb_call) : lb_call_(lb_call) {}
+
+    void* Alloc(size_t size) override { return lb_call_->arena_->Alloc(size); }
+
+    // Internal API to allow first-party LB policies to access per-call
+    // attributes set by the ConfigSelector.
+    absl::string_view GetCallAttribute(UniqueTypeName type);
+
+   private:
+    LoadBalancedCall* lb_call_;
+  };
+
   // If on_call_destruction_complete is non-null, then it will be
   // invoked once the LoadBalancedCall is completely destroyed.
   // If it is null, then the caller is responsible for checking whether
@@ -417,7 +440,6 @@ class ClientChannel::LoadBalancedCall
  private:
   class LbQueuedCallCanceller;
   class Metadata;
-  class LbCallState;
   class BackendMetricAccessor;
 
   // Returns the index into pending_batches_ to be used for batch.
@@ -519,7 +541,7 @@ class ClientChannel::LoadBalancedCall
   grpc_closure* original_recv_initial_metadata_ready_ = nullptr;
 
   // For intercepting recv_message_ready.
-  OrphanablePtr<ByteStream>* recv_message_ = nullptr;
+  absl::optional<SliceBuffer>* recv_message_ = nullptr;
   grpc_closure recv_message_ready_;
   grpc_closure* original_recv_message_ready_ = nullptr;
 

data/src/core/ext/filters/client_channel/client_channel_factory.cc

@@ -20,42 +20,13 @@
 
 #include "src/core/ext/filters/client_channel/client_channel_factory.h"
 
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/useful.h"
-
 // Channel arg key for client channel factory.
 #define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory"
 
 namespace grpc_core {
 
-namespace {
-
-void* factory_arg_copy(void* f) { return f; }
-void factory_arg_destroy(void* /*f*/) {}
-int factory_arg_cmp(void* factory1, void* factory2) {
-  return QsortCompare(factory1, factory2);
-}
-const grpc_arg_pointer_vtable factory_arg_vtable = {
-    factory_arg_copy, factory_arg_destroy, factory_arg_cmp};
-
-}  // namespace
-
 absl::string_view ClientChannelFactory::ChannelArgName() {
   return GRPC_ARG_CLIENT_CHANNEL_FACTORY;
 }
 
-grpc_arg ClientChannelFactory::CreateChannelArg(ClientChannelFactory* factory) {
-  return grpc_channel_arg_pointer_create(
-      const_cast<char*>(GRPC_ARG_CLIENT_CHANNEL_FACTORY), factory,
-      &factory_arg_vtable);
-}
-
-ClientChannelFactory* ClientChannelFactory::GetFromChannelArgs(
-    const grpc_channel_args* args) {
-  const grpc_arg* arg =
-      grpc_channel_args_find(args, GRPC_ARG_CLIENT_CHANNEL_FACTORY);
-  if (arg == nullptr || arg->type != GRPC_ARG_POINTER) return nullptr;
-  return static_cast<ClientChannelFactory*>(arg->value.pointer.p);
-}
-
 }  // namespace grpc_core

data/src/core/ext/filters/client_channel/client_channel_factory.h

@@ -21,9 +21,8 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
-
 #include "src/core/ext/filters/client_channel/subchannel.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
@@ -37,16 +36,9 @@ class ClientChannelFactory {
 
   // Creates a subchannel with the specified args.
   virtual RefCountedPtr<Subchannel> CreateSubchannel(
-      const grpc_resolved_address& address, const grpc_channel_args* args) = 0;
+      const grpc_resolved_address& address, const ChannelArgs& args) = 0;
 
   static absl::string_view ChannelArgName();
-
-  // Returns a channel arg containing the specified factory.
-  static grpc_arg CreateChannelArg(ClientChannelFactory* factory);
-
-  // Returns the factory from args, or null if not found.
-  static ClientChannelFactory* GetFromChannelArgs(
-      const grpc_channel_args* args);
 };
 
 }  // namespace grpc_core

data/src/core/ext/filters/client_channel/client_channel_plugin.cc

@@ -21,12 +21,12 @@
 #include "src/core/ext/filters/client_channel/backup_poller.h"
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/client_channel/http_proxy.h"
-#include "src/core/ext/filters/client_channel/lb_policy_registry.h"
 #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
 #include "src/core/ext/filters/client_channel/resolver_result_parsing.h"
 #include "src/core/ext/filters/client_channel/retry_service_config.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/load_balancing/lb_policy_registry.h"
 #include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 

data/src/core/ext/filters/client_channel/config_selector.h

@@ -24,14 +24,18 @@
 #include <utility>
 #include <vector>
 
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/slice.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/channel/channel_args.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/iomgr/error.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/service_config/service_config.h"
 #include "src/core/lib/service_config/service_config_call_data.h"
@@ -69,7 +73,7 @@ class ConfigSelector : public RefCounted<ConfigSelector> {
 
   struct CallConfig {
     // Can be set to indicate the call should be failed.
-    grpc_error_handle error = GRPC_ERROR_NONE;
+    absl::Status status;
     // The per-method parsed configs that will be passed to
     // ServiceConfigCallData.
     const ServiceConfigParser::ParsedConfigVector* method_configs = nullptr;
@@ -101,8 +105,7 @@ class ConfigSelector : public RefCounted<ConfigSelector> {
   // to determine what set of dynamic filters will be configured.
   virtual std::vector<const grpc_channel_filter*> GetFilters() { return {}; }
   // Modifies channel args to be passed to the dynamic filter stack.
-  // Takes ownership of argument.  Caller takes ownership of result.
-  virtual grpc_channel_args* ModifyChannelArgs(grpc_channel_args* args) {
+  virtual ChannelArgs ModifyChannelArgs(const ChannelArgs& args) {
     return args;
   }
 
@@ -111,6 +114,11 @@ class ConfigSelector : public RefCounted<ConfigSelector> {
   grpc_arg MakeChannelArg() const;
   static RefCountedPtr<ConfigSelector> GetFromChannelArgs(
       const grpc_channel_args& args);
+  static absl::string_view ChannelArgName() { return GRPC_ARG_CONFIG_SELECTOR; }
+  static int ChannelArgsCompare(const ConfigSelector* a,
+                                const ConfigSelector* b) {
+    return QsortCompare(a, b);
+  }
 };
 
 // Default ConfigSelector that gets the MethodConfig from the service config.

data/src/core/ext/filters/client_channel/connector.h

@@ -19,8 +19,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/grpc_types.h>
-
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channelz.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
@@ -29,7 +28,7 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/transport/transport.h"
+#include "src/core/lib/transport/transport_fwd.h"
 
 namespace grpc_core {
 
@@ -46,20 +45,20 @@ class SubchannelConnector : public InternallyRefCounted<SubchannelConnector> {
     // Deadline for connection.
     Timestamp deadline;
     // Channel args to be passed to handshakers and transport.
-    const grpc_channel_args* channel_args;
+    ChannelArgs channel_args;
   };
 
   struct Result {
     // The connected transport.
     grpc_transport* transport = nullptr;
     // Channel args to be passed to filters.
-    const grpc_channel_args* channel_args = nullptr;
+    ChannelArgs channel_args;
     // Channelz socket node of the connected transport, if any.
     RefCountedPtr<channelz::SocketNode> socket_node;
 
     void Reset() {
       transport = nullptr;
-      channel_args = nullptr;
+      channel_args = ChannelArgs();
       socket_node.reset();
     }
   };

data/src/core/ext/filters/client_channel/dynamic_filters.cc

@@ -24,6 +24,8 @@
 #include <string>
 #include <utility>
 
+#include "absl/status/status.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
@@ -63,7 +65,7 @@ DynamicFilters::Call::Call(Args args, grpc_error_handle* error)
   };
   *error = grpc_call_stack_init(channel_stack_->channel_stack_, 1, Destroy,
                                 this, &call_args);
-  if (GPR_UNLIKELY(*error != GRPC_ERROR_NONE)) {
+  if (GPR_UNLIKELY(!GRPC_ERROR_IS_NONE(*error))) {
     gpr_log(GPR_ERROR, "error: %s", grpc_error_std_string(*error).c_str());
     return;
   }
@@ -152,7 +154,7 @@ std::pair<grpc_channel_stack*, grpc_error_handle> CreateChannelStack(
   grpc_error_handle error = grpc_channel_stack_init(
       /*initial_refs=*/1, DestroyChannelStack, channel_stack, filters.data(),
       filters.size(), args, "DynamicFilters", channel_stack);
-  if (error != GRPC_ERROR_NONE) {
+  if (!GRPC_ERROR_IS_NONE(error)) {
     gpr_log(GPR_ERROR, "error initializing client internal stack: %s",
             grpc_error_std_string(error).c_str());
     grpc_channel_stack_destroy(channel_stack);
@@ -169,7 +171,7 @@ RefCountedPtr<DynamicFilters> DynamicFilters::Create(
     std::vector<const grpc_channel_filter*> filters) {
   // Attempt to create channel stack from requested filters.
   auto p = CreateChannelStack(args, std::move(filters));
-  if (p.second != GRPC_ERROR_NONE) {
+  if (!GRPC_ERROR_IS_NONE(p.second)) {
     // Channel stack creation failed with requested filters.
     // Create with lame filter instead.
     grpc_error_handle error = p.second;
@@ -178,7 +180,7 @@ RefCountedPtr<DynamicFilters> DynamicFilters::Create(
         grpc_channel_args_copy_and_add(args, &error_arg, 1);
     GRPC_ERROR_UNREF(error);
     p = CreateChannelStack(new_args, {&LameClientFilter::kFilter});
-    GPR_ASSERT(p.second == GRPC_ERROR_NONE);
+    GPR_ASSERT(GRPC_ERROR_IS_NONE(p.second));
     grpc_channel_args_destroy(new_args);
   }
   return MakeRefCounted<DynamicFilters>(p.first);

data/src/core/ext/filters/client_channel/dynamic_filters.h

@@ -24,7 +24,7 @@
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/slice.h>
 
-#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/debug_location.h"

data/src/core/ext/filters/client_channel/http_proxy.cc

@@ -26,7 +26,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/container/inlined_vector.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
@@ -34,10 +33,11 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
+#include "absl/types/optional.h"
 
+#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
 #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -55,17 +55,14 @@ namespace {
 
 /**
  * Parses the 'https_proxy' env var (fallback on 'http_proxy') and returns the
- * proxy hostname to resolve or nullptr on error. Also sets 'user_cred' to user
+ * proxy hostname to resolve or nullopt on error. Also sets 'user_cred' to user
  * credentials if present in the 'http_proxy' env var, otherwise leaves it
- * unchanged. It is caller's responsibility to gpr_free user_cred.
+ * unchanged.
  */
-// TODO(hork): change this to return std::string
-char* GetHttpProxyServer(const grpc_channel_args* args, char** user_cred) {
+absl::optional<std::string> GetHttpProxyServer(
+    const ChannelArgs& args, absl::optional<std::string>* user_cred) {
   GPR_ASSERT(user_cred != nullptr);
   absl::StatusOr<URI> uri;
-  char* proxy_name = nullptr;
-  char** authority_strs = nullptr;
-  size_t authority_nstrs;
   /* We check the following places to determine the HTTP proxy to use, stopping
    * at the first one that is set:
    * 1. GRPC_ARG_HTTP_PROXY channel arg
@@ -74,29 +71,39 @@ char* GetHttpProxyServer(const grpc_channel_args* args, char** user_cred) {
    * 4. http_proxy environment variable
    * If none of the above are set, then no HTTP proxy will be used.
    */
-  auto uri_str = UniquePtr<char>(
-      gpr_strdup(grpc_channel_args_find_string(args, GRPC_ARG_HTTP_PROXY)));
-  if (uri_str == nullptr) uri_str = UniquePtr<char>(gpr_getenv("grpc_proxy"));
-  if (uri_str == nullptr) uri_str = UniquePtr<char>(gpr_getenv("https_proxy"));
-  if (uri_str == nullptr) uri_str = UniquePtr<char>(gpr_getenv("http_proxy"));
-  if (uri_str == nullptr) return nullptr;
+  absl::optional<std::string> uri_str =
+      args.GetOwnedString(GRPC_ARG_HTTP_PROXY);
+  auto get_env = [](const char* name) -> absl::optional<std::string> {
+    char* v = gpr_getenv(name);
+    if (v == nullptr) return absl::nullopt;
+    std::string s(v);
+    gpr_free(v);
+    return s;
+  };
+  if (!uri_str.has_value()) uri_str = get_env("grpc_proxy");
+  if (!uri_str.has_value()) uri_str = get_env("https_proxy");
+  if (!uri_str.has_value()) uri_str = get_env("http_proxy");
+  if (!uri_str.has_value()) return absl::nullopt;
   // an emtpy value means "don't use proxy"
-  if (uri_str.get()[0] == '\0') return nullptr;
-  uri = URI::Parse(uri_str.get());
+  if (uri_str->empty()) return absl::nullopt;
+  uri = URI::Parse(*uri_str);
   if (!uri.ok() || uri->authority().empty()) {
     gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var. Error: %s",
             uri.status().ToString().c_str());
-    return nullptr;
+    return absl::nullopt;
   }
   if (uri->scheme() != "http") {
     gpr_log(GPR_ERROR, "'%s' scheme not supported in proxy URI",
             uri->scheme().c_str());
-    return nullptr;
+    return absl::nullopt;
   }
   /* Split on '@' to separate user credentials from host */
+  char** authority_strs = nullptr;
+  size_t authority_nstrs;
   gpr_string_split(uri->authority().c_str(), "@", &authority_strs,
                    &authority_nstrs);
   GPR_ASSERT(authority_nstrs != 0); /* should have at least 1 string */
+  absl::optional<std::string> proxy_name;
   if (authority_nstrs == 1) {
     /* User cred not present in authority */
     proxy_name = authority_strs[0];
@@ -107,10 +114,10 @@ char* GetHttpProxyServer(const grpc_channel_args* args, char** user_cred) {
     gpr_log(GPR_DEBUG, "userinfo found in proxy URI");
   } else {
     /* Bad authority */
-    for (size_t i = 0; i < authority_nstrs; i++) {
-      gpr_free(authority_strs[i]);
-    }
-    proxy_name = nullptr;
+    proxy_name = absl::nullopt;
+  }
+  for (size_t i = 0; i < authority_nstrs; i++) {
+    gpr_free(authority_strs[i]);
   }
   gpr_free(authority_strs);
   return proxy_name;
@@ -129,35 +136,26 @@ std::string MaybeAddDefaultPort(absl::string_view target) {
 
 }  // namespace
 
-bool HttpProxyMapper::MapName(const char* server_uri,
-                              const grpc_channel_args* args,
-                              char** name_to_resolve,
-                              grpc_channel_args** new_args) {
-  if (!grpc_channel_args_find_bool(args, GRPC_ARG_ENABLE_HTTP_PROXY, true)) {
-    return false;
+absl::optional<std::string> HttpProxyMapper::MapName(
+    absl::string_view server_uri, ChannelArgs* args) {
+  if (!args->GetBool(GRPC_ARG_ENABLE_HTTP_PROXY).value_or(true)) {
+    return absl::nullopt;
   }
-  char* user_cred = nullptr;
-  *name_to_resolve = GetHttpProxyServer(args, &user_cred);
-  if (*name_to_resolve == nullptr) return false;
-  std::string server_target;
+  absl::optional<std::string> user_cred;
+  auto name_to_resolve = GetHttpProxyServer(*args, &user_cred);
+  if (!name_to_resolve.has_value()) return name_to_resolve;
   absl::StatusOr<URI> uri = URI::Parse(server_uri);
-  auto no_use_proxy = [&]() {
-    gpr_free(*name_to_resolve);
-    *name_to_resolve = nullptr;
-    gpr_free(user_cred);
-    return false;
-  };
   if (!uri.ok() || uri->path().empty()) {
     gpr_log(GPR_ERROR,
             "'http_proxy' environment variable set, but cannot "
             "parse server URI '%s' -- not using proxy. Error: %s",
-            server_uri, uri.status().ToString().c_str());
-    return no_use_proxy();
+            std::string(server_uri).c_str(), uri.status().ToString().c_str());
+    return absl::nullopt;
   }
   if (uri->scheme() == "unix") {
     gpr_log(GPR_INFO, "not using proxy for Unix domain socket '%s'",
-            server_uri);
-    return no_use_proxy();
+            std::string(server_uri).c_str());
+    return absl::nullopt;
   }
   /* Prefer using 'no_grpc_proxy'. Fallback on 'no_proxy' if it is not set. */
   auto no_proxy_str = UniquePtr<char>(gpr_getenv("no_grpc_proxy"));
@@ -173,42 +171,32 @@ bool HttpProxyMapper::MapName(const char* server_uri,
       gpr_log(GPR_INFO,
               "unable to split host and port, not checking no_proxy list for "
               "host '%s'",
-              server_uri);
+              std::string(server_uri).c_str());
     } else {
       std::vector<absl::string_view> no_proxy_hosts =
           absl::StrSplit(no_proxy_str.get(), ',', absl::SkipEmpty());
       for (const auto& no_proxy_entry : no_proxy_hosts) {
         if (absl::EndsWithIgnoreCase(server_host, no_proxy_entry)) {
           gpr_log(GPR_INFO, "not using proxy for host in no_proxy list '%s'",
-                  server_uri);
+                  std::string(server_uri).c_str());
           use_proxy = false;
           break;
         }
       }
-      if (!use_proxy) return no_use_proxy();
+      if (!use_proxy) return absl::nullopt;
     }
   }
-  server_target =
-      MaybeAddDefaultPort(absl::StripPrefix(uri->path(), "/")).c_str();
-  absl::InlinedVector<grpc_arg, 2> args_to_add;
-  args_to_add.push_back(grpc_channel_arg_string_create(
-      const_cast<char*>(GRPC_ARG_HTTP_CONNECT_SERVER),
-      const_cast<char*>(server_target.c_str())));
-  std::string header;
-  if (user_cred != nullptr) {
+  *args = args->Set(GRPC_ARG_HTTP_CONNECT_SERVER,
+                    MaybeAddDefaultPort(absl::StripPrefix(uri->path(), "/")));
+  if (user_cred.has_value()) {
     /* Use base64 encoding for user credentials as stated in RFC 7617 */
-    auto encoded_user_cred =
-        UniquePtr<char>(grpc_base64_encode(user_cred, strlen(user_cred), 0, 0));
-    header =
-        absl::StrCat("Proxy-Authorization:Basic ", encoded_user_cred.get());
-    args_to_add.push_back(grpc_channel_arg_string_create(
-        const_cast<char*>(GRPC_ARG_HTTP_CONNECT_HEADERS),
-        const_cast<char*>(header.c_str())));
+    auto encoded_user_cred = UniquePtr<char>(
+        grpc_base64_encode(user_cred->data(), user_cred->length(), 0, 0));
+    *args = args->Set(
+        GRPC_ARG_HTTP_CONNECT_HEADERS,
+        absl::StrCat("Proxy-Authorization:Basic ", encoded_user_cred.get()));
   }
-  *new_args = grpc_channel_args_copy_and_add(args, args_to_add.data(),
-                                             args_to_add.size());
-  gpr_free(user_cred);
-  return true;
+  return name_to_resolve;
 }
 
 void RegisterHttpProxyMapper() {

data/src/core/ext/filters/client_channel/http_proxy.h

@@ -21,23 +21,26 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <string>
+
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 
 #include "src/core/ext/filters/client_channel/proxy_mapper.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {
 
 class HttpProxyMapper : public ProxyMapperInterface {
  public:
-  bool MapName(const char* server_uri, const grpc_channel_args* args,
-               char** name_to_resolve, grpc_channel_args** new_args) override;
-
-  bool MapAddress(const grpc_resolved_address& /*address*/,
-                  const grpc_channel_args* /*args*/,
-                  grpc_resolved_address** /*new_address*/,
-                  grpc_channel_args** /*new_args*/) override {
-    return false;
+  absl::optional<std::string> MapName(absl::string_view server_uri,
+                                      ChannelArgs* args) override;
+
+  absl::optional<grpc_resolved_address> MapAddress(
+      const grpc_resolved_address& /*address*/,
+      ChannelArgs* /*args*/) override {
+    return absl::nullopt;
   }
 };
 

data/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc

@@ -20,9 +20,9 @@
 
 #include <stddef.h>
 
+#include <algorithm>
 #include <utility>
 
-#include "absl/container/inlined_vector.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"