grpc 1.83.1 → 1.84.0

data/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h

@@ -1,130 +0,0 @@
-//
-//
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
-#define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
-
-#include <grpc/support/port_platform.h>
-#include <stddef.h>
-
-#include <memory>
-
-#include "src/core/lib/debug/trace.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/resolver/endpoint_addresses.h"
-#include "src/core/util/sync.h"
-#include "absl/base/thread_annotations.h"
-#include "absl/log/log.h"
-
-#if GRPC_ARES == 1
-
-#include <ares.h>
-
-#define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000
-
-typedef struct grpc_ares_ev_driver grpc_ares_ev_driver;
-
-struct grpc_ares_request {
-  /// synchronizes access to this request, and also to associated
-  /// ev_driver and fd_node objects
-  grpc_core::Mutex mu;
-  /// indicates the DNS server to use, if specified
-  struct ares_addr_port_node dns_server_addr ABSL_GUARDED_BY(mu);
-  /// following members are set in grpc_resolve_address_ares_impl
-  /// closure to call when the request completes
-  grpc_closure* on_done ABSL_GUARDED_BY(mu) = nullptr;
-  /// the pointer to receive the resolved addresses
-  std::unique_ptr<grpc_core::EndpointAddressesList>* addresses_out
-      ABSL_GUARDED_BY(mu);
-  /// the pointer to receive the resolved balancer addresses
-  std::unique_ptr<grpc_core::EndpointAddressesList>* balancer_addresses_out
-      ABSL_GUARDED_BY(mu);
-  /// the pointer to receive the service config in JSON
-  char** service_config_json_out ABSL_GUARDED_BY(mu) = nullptr;
-  /// the event driver used by this request
-  grpc_ares_ev_driver* ev_driver ABSL_GUARDED_BY(mu) = nullptr;
-  /// number of ongoing queries
-  size_t pending_queries ABSL_GUARDED_BY(mu) = 0;
-  /// the errors explaining query failures, appended to in query callbacks
-  grpc_error_handle error ABSL_GUARDED_BY(mu);
-};
-
-// Asynchronously resolve \a name (A/AAAA records only).
-// It uses \a default_port if a port isn't designated in \a name, otherwise it
-// uses the port in \a name. grpc_ares_init() must be called at least once
-// before this function. The returned grpc_ares_request object is owned by the
-// caller and it is safe to free after on_done is called back.
-
-// Note on synchronization: \a as on_done might be called from another thread
-//~immediately, access to the grpc_ares_request* return value must be
-// synchronized by the caller. TODO(apolcyn): we should remove this requirement
-// by changing this API to use two phase initialization - one API to create
-// the grpc_ares_request* and another to start the async work.
-extern grpc_ares_request* (*grpc_dns_lookup_hostname_ares)(
-    const char* dns_server, const char* name, const char* default_port,
-    grpc_pollset_set* interested_parties, grpc_closure* on_done,
-    std::unique_ptr<grpc_core::EndpointAddressesList>* addresses,
-    int query_timeout_ms);
-
-// Asynchronously resolve a SRV record.
-// See \a grpc_dns_lookup_hostname_ares for usage details and caveats.
-extern grpc_ares_request* (*grpc_dns_lookup_srv_ares)(
-    const char* dns_server, const char* name,
-    grpc_pollset_set* interested_parties, grpc_closure* on_done,
-    std::unique_ptr<grpc_core::EndpointAddressesList>* balancer_addresses,
-    int query_timeout_ms);
-
-// Asynchronously resolve a TXT record.
-// See \a grpc_dns_lookup_hostname_ares for usage details and caveats.
-extern grpc_ares_request* (*grpc_dns_lookup_txt_ares)(
-    const char* dns_server, const char* name,
-    grpc_pollset_set* interested_parties, grpc_closure* on_done,
-    char** service_config_json, int query_timeout_ms);
-
-// Cancel the pending grpc_ares_request \a request
-extern void (*grpc_cancel_ares_request)(grpc_ares_request* request);
-
-// Initialize gRPC ares wrapper. Must be called at least once before
-// grpc_resolve_address_ares().
-grpc_error_handle grpc_ares_init(void);
-
-// Uninitialized gRPC ares wrapper. If there was more than one previous call to
-// grpc_ares_init(), this function uninitializes the gRPC ares wrapper only if
-// it has been called the same number of times as grpc_ares_init().
-void grpc_ares_cleanup(void);
-
-// Indicates whether or not AAAA queries should be attempted.
-// E.g., return false if ipv6 is known to not be available.
-bool grpc_ares_query_ipv6();
-
-// Sorts destinations in lb_addrs according to RFC 6724.
-void grpc_cares_wrapper_address_sorting_sort(
-    const grpc_ares_request* request,
-    grpc_core::EndpointAddressesList* addresses);
-
-// Exposed in this header for C-core tests only
-extern void (*grpc_ares_test_only_inject_config)(ares_channel* channel);
-
-// Exposed in this header for C-core tests only
-extern bool g_grpc_ares_test_only_force_tcp;
-
-#endif
-
-#endif  // GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H

data/src/core/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc

@@ -1,35 +0,0 @@
-//
-//
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
-
-#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
-
-#include <grpc/support/string_util.h>
-
-#include "src/core/lib/address_utils/parse_address.h"
-#include "src/core/lib/iomgr/socket_windows.h"
-#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
-#include "src/core/resolver/endpoint_addresses.h"
-#include "src/core/util/string.h"
-
-bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); }
-
-#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)

data/src/core/resolver/dns/dns_resolver_plugin.cc

@@ -1,64 +0,0 @@
-// Copyright 2022 The gRPC Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#include "src/core/resolver/dns/dns_resolver_plugin.h"
-
-#include <grpc/support/port_platform.h>
-
-#include <memory>
-
-#include "src/core/config/config_vars.h"
-#include "src/core/lib/experiments/experiments.h"
-#include "src/core/resolver/dns/c_ares/dns_resolver_ares.h"
-#include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
-#include "src/core/resolver/dns/native/dns_resolver.h"
-#include "src/core/resolver/resolver_factory.h"
-#include "src/core/util/crash.h"
-#include "absl/log/log.h"
-#include "absl/strings/match.h"
-
-namespace grpc_core {
-
-void RegisterDnsResolver(CoreConfiguration::Builder* builder) {
-#if GRPC_IOS_EVENT_ENGINE_CLIENT
-  VLOG(2) << "Using EventEngine dns resolver";
-  builder->resolver_registry()->RegisterResolverFactory(
-      std::make_unique<EventEngineClientChannelDNSResolverFactory>());
-  return;
-#endif
-  if (IsEventEngineDnsEnabled()) {
-    VLOG(2) << "Using EventEngine dns resolver";
-    builder->resolver_registry()->RegisterResolverFactory(
-        std::make_unique<EventEngineClientChannelDNSResolverFactory>());
-    return;
-  }
-  auto resolver = ConfigVars::Get().DnsResolver();
-  // ---- Ares resolver ----
-  if (ShouldUseAresDnsResolver(resolver)) {
-    VLOG(2) << "Using ares dns resolver";
-    RegisterAresDnsResolver(builder);
-    return;
-  }
-  // ---- Native resolver ----
-  if (absl::EqualsIgnoreCase(resolver, "native") ||
-      !builder->resolver_registry()->HasResolverFactory("dns")) {
-    VLOG(2) << "Using native dns resolver";
-    RegisterNativeDnsResolver(builder);
-    return;
-  }
-  Crash(
-      "Unable to set DNS resolver! Likely a logic error in gRPC-core, "
-      "please file a bug.");
-}
-
-}  // namespace grpc_core

data/src/core/resolver/dns/native/dns_resolver.cc

@@ -1,173 +0,0 @@
-//
-// Copyright 2015 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
-#include <algorithm>
-#include <memory>
-#include <optional>
-#include <utility>
-#include <vector>
-
-#include "src/core/config/core_configuration.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/debug/trace.h"
-#include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/resolver/endpoint_addresses.h"
-#include "src/core/resolver/polling_resolver.h"
-#include "src/core/resolver/resolver.h"
-#include "src/core/resolver/resolver_factory.h"
-#include "src/core/util/backoff.h"
-#include "src/core/util/debug_location.h"
-#include "src/core/util/orphanable.h"
-#include "src/core/util/ref_counted_ptr.h"
-#include "src/core/util/time.h"
-#include "src/core/util/uri.h"
-#include "absl/functional/bind_front.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/string_view.h"
-#include "absl/strings/strip.h"
-
-#define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1
-#define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6
-#define GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS 120
-#define GRPC_DNS_RECONNECT_JITTER 0.2
-
-namespace grpc_core {
-
-namespace {
-
-class NativeClientChannelDNSResolver final : public PollingResolver {
- public:
-  NativeClientChannelDNSResolver(ResolverArgs args,
-                                 Duration min_time_between_resolutions);
-  ~NativeClientChannelDNSResolver() override;
-
-  OrphanablePtr<Orphanable> StartRequest() override;
-
- private:
-  // No-op request class, used so that the PollingResolver code knows
-  // when there is a request in flight, even if the request is not
-  // actually cancellable.
-  class Request final : public Orphanable {
-   public:
-    Request() = default;
-
-    void Orphan() override { delete this; }
-  };
-
-  void OnResolved(
-      absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or);
-};
-
-NativeClientChannelDNSResolver::NativeClientChannelDNSResolver(
-    ResolverArgs args, Duration min_time_between_resolutions)
-    : PollingResolver(std::move(args), min_time_between_resolutions,
-                      BackOff::Options()
-                          .set_initial_backoff(Duration::Milliseconds(
-                              GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * 1000))
-                          .set_multiplier(GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER)
-                          .set_jitter(GRPC_DNS_RECONNECT_JITTER)
-                          .set_max_backoff(Duration::Milliseconds(
-                              GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS * 1000)),
-                      &dns_resolver_trace) {
-  GRPC_TRACE_VLOG(dns_resolver, 2) << "[dns_resolver=" << this << "] created";
-}
-
-NativeClientChannelDNSResolver::~NativeClientChannelDNSResolver() {
-  GRPC_TRACE_VLOG(dns_resolver, 2) << "[dns_resolver=" << this << "] destroyed";
-}
-
-OrphanablePtr<Orphanable> NativeClientChannelDNSResolver::StartRequest() {
-  Ref(DEBUG_LOCATION, "dns_request").release();
-  auto dns_request_handle = GetDNSResolver()->LookupHostname(
-      absl::bind_front(&NativeClientChannelDNSResolver::OnResolved, this),
-      name_to_resolve(), kDefaultSecurePort, kDefaultDNSRequestTimeout,
-      interested_parties(), /*name_server=*/"");
-  GRPC_TRACE_VLOG(dns_resolver, 2)
-      << "[dns_resolver=" << this << "] starting request="
-      << DNSResolver::HandleToString(dns_request_handle);
-  return MakeOrphanable<Request>();
-}
-
-void NativeClientChannelDNSResolver::OnResolved(
-    absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or) {
-  GRPC_TRACE_VLOG(dns_resolver, 2)
-      << "[dns_resolver=" << this
-      << "] request complete, status=" << addresses_or.status();
-  // Convert result from iomgr DNS API into Resolver::Result.
-  Result result;
-  if (addresses_or.ok()) {
-    EndpointAddressesList addresses;
-    for (auto& addr : *addresses_or) {
-      addresses.emplace_back(addr, ChannelArgs());
-    }
-    result.addresses = std::move(addresses);
-  } else {
-    result.addresses = absl::UnavailableError(
-        absl::StrCat("DNS resolution failed for ", name_to_resolve(), ": ",
-                     addresses_or.status().ToString()));
-  }
-  result.args = channel_args();
-  OnRequestComplete(std::move(result));
-  Unref(DEBUG_LOCATION, "dns_request");
-}
-
-//
-// Factory
-//
-
-class NativeClientChannelDNSResolverFactory final : public ResolverFactory {
- public:
-  absl::string_view scheme() const override { return "dns"; }
-
-  bool IsValidUri(const URI& uri) const override {
-    if (GPR_UNLIKELY(!uri.authority().empty())) {
-      LOG(ERROR) << "authority based dns uri's not supported";
-      return false;
-    }
-    if (absl::StripPrefix(uri.path(), "/").empty()) {
-      LOG(ERROR) << "no server name supplied in dns URI";
-      return false;
-    }
-    return true;
-  }
-
-  OrphanablePtr<Resolver> CreateResolver(ResolverArgs args) const override {
-    if (!IsValidUri(args.uri)) return nullptr;
-    Duration min_time_between_resolutions = std::max(
-        Duration::Zero(), args.args
-                              .GetDurationFromIntMillis(
-                                  GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS)
-                              .value_or(Duration::Seconds(30)));
-    return MakeOrphanable<NativeClientChannelDNSResolver>(
-        std::move(args), min_time_between_resolutions);
-  }
-};
-
-}  // namespace
-
-void RegisterNativeDnsResolver(CoreConfiguration::Builder* builder) {
-  builder->resolver_registry()->RegisterResolverFactory(
-      std::make_unique<NativeClientChannelDNSResolverFactory>());
-}
-
-}  // namespace grpc_core

data/src/core/util/json/json_util.cc

@@ -1,101 +0,0 @@
-//
-//
-// Copyright 2020 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#include "src/core/util/json/json_util.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/util/json/json_args.h"
-#include "src/core/util/json/json_object_loader.h"
-#include "src/core/util/no_destruct.h"
-#include "src/core/util/validation_errors.h"
-
-namespace grpc_core {
-
-bool ParseDurationFromJson(const Json& field, Duration* duration) {
-  ValidationErrors errors;
-  static_cast<json_detail::LoaderInterface*>(
-      NoDestructSingleton<json_detail::AutoLoader<Duration>>::Get())
-      ->LoadInto(field, JsonArgs(), duration, &errors);
-  return errors.ok();
-}
-
-bool ExtractJsonBool(const Json& json, absl::string_view field_name,
-                     bool* output, std::vector<grpc_error_handle>* error_list) {
-  if (json.type() != Json::Type::kBoolean) {
-    error_list->push_back(GRPC_ERROR_CREATE(
-        absl::StrCat("field:", field_name, " error:type should be BOOLEAN")));
-    return false;
-  }
-  *output = json.boolean();
-  return true;
-}
-
-bool ExtractJsonArray(const Json& json, absl::string_view field_name,
-                      const Json::Array** output,
-                      std::vector<grpc_error_handle>* error_list) {
-  if (json.type() != Json::Type::kArray) {
-    *output = nullptr;
-    error_list->push_back(GRPC_ERROR_CREATE(
-        absl::StrCat("field:", field_name, " error:type should be ARRAY")));
-    return false;
-  }
-  *output = &json.array();
-  return true;
-}
-
-bool ExtractJsonObject(const Json& json, absl::string_view field_name,
-                       const Json::Object** output,
-                       std::vector<grpc_error_handle>* error_list) {
-  if (json.type() != Json::Type::kObject) {
-    *output = nullptr;
-    error_list->push_back(GRPC_ERROR_CREATE(
-        absl::StrCat("field:", field_name, " error:type should be OBJECT")));
-    return false;
-  }
-  *output = &json.object();
-  return true;
-}
-
-bool ParseJsonObjectFieldAsDuration(const Json::Object& object,
-                                    absl::string_view field_name,
-                                    Duration* output,
-                                    std::vector<grpc_error_handle>* error_list,
-                                    bool required) {
-  // TODO(roth): Once we can use C++14 heterogenous lookups, stop
-  // creating a std::string here.
-  auto it = object.find(std::string(field_name));
-  if (it == object.end()) {
-    if (required) {
-      error_list->push_back(GRPC_ERROR_CREATE(
-          absl::StrCat("field:", field_name, " error:does not exist.")));
-    }
-    return false;
-  }
-  if (!ParseDurationFromJson(it->second, output)) {
-    *output = Duration::NegativeInfinity();
-    error_list->push_back(GRPC_ERROR_CREATE(
-        absl::StrCat("field:", field_name,
-                     " error:type should be STRING of the form given by "
-                     "google.proto.Duration.")));
-    return false;
-  }
-  return true;
-}
-
-}  // namespace grpc_core

data/src/core/util/json/json_util.h

@@ -1,163 +0,0 @@
-//
-//
-// Copyright 2020 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H
-#define GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H
-
-#include <grpc/support/port_platform.h>
-
-#include <algorithm>
-#include <map>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/util/json/json.h"
-#include "src/core/util/time.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
-
-namespace grpc_core {
-
-// Parses a JSON field of the form generated for a google.proto.Duration
-// proto message, as per:
-//   https://developers.google.com/protocol-buffers/docs/proto3#json
-// Returns true on success, false otherwise.
-bool ParseDurationFromJson(const Json& field, Duration* duration);
-
-//
-// Helper functions for extracting types from JSON.
-// Return true on success, false otherwise. If an error is encountered during
-// parsing, a descriptive error is appended to \a error_list.
-//
-template <typename NumericType>
-bool ExtractJsonNumber(const Json& json, absl::string_view field_name,
-                       NumericType* output,
-                       std::vector<grpc_error_handle>* error_list) {
-  static_assert(std::is_integral<NumericType>::value, "Integral required");
-  if (json.type() != Json::Type::kNumber &&
-      json.type() != Json::Type::kString) {
-    error_list->push_back(GRPC_ERROR_CREATE(absl::StrCat(
-        "field:", field_name, " error:type should be NUMBER or STRING")));
-    return false;
-  }
-  if (!absl::SimpleAtoi(json.string(), output)) {
-    error_list->push_back(GRPC_ERROR_CREATE(
-        absl::StrCat("field:", field_name, " error:failed to parse.")));
-    return false;
-  }
-  return true;
-}
-
-bool ExtractJsonBool(const Json& json, absl::string_view field_name,
-                     bool* output, std::vector<grpc_error_handle>* error_list);
-
-// OutputType can be std::string or absl::string_view.
-template <typename OutputType>
-bool ExtractJsonString(const Json& json, absl::string_view field_name,
-                       OutputType* output,
-                       std::vector<grpc_error_handle>* error_list) {
-  if (json.type() != Json::Type::kString) {
-    *output = "";
-    error_list->push_back(GRPC_ERROR_CREATE(
-        absl::StrCat("field:", field_name, " error:type should be STRING")));
-    return false;
-  }
-  *output = json.string();
-  return true;
-}
-
-bool ExtractJsonArray(const Json& json, absl::string_view field_name,
-                      const Json::Array** output,
-                      std::vector<grpc_error_handle>* error_list);
-
-bool ExtractJsonObject(const Json& json, absl::string_view field_name,
-                       const Json::Object** output,
-                       std::vector<grpc_error_handle>* error_list);
-
-// Wrappers for automatically choosing one of the above functions based
-// on output parameter type.
-template <typename NumericType>
-inline bool ExtractJsonType(const Json& json, absl::string_view field_name,
-                            NumericType* output,
-                            std::vector<grpc_error_handle>* error_list) {
-  return ExtractJsonNumber(json, field_name, output, error_list);
-}
-inline bool ExtractJsonType(const Json& json, absl::string_view field_name,
-                            bool* output,
-                            std::vector<grpc_error_handle>* error_list) {
-  return ExtractJsonBool(json, field_name, output, error_list);
-}
-inline bool ExtractJsonType(const Json& json, absl::string_view field_name,
-                            std::string* output,
-                            std::vector<grpc_error_handle>* error_list) {
-  return ExtractJsonString(json, field_name, output, error_list);
-}
-inline bool ExtractJsonType(const Json& json, absl::string_view field_name,
-                            absl::string_view* output,
-                            std::vector<grpc_error_handle>* error_list) {
-  return ExtractJsonString(json, field_name, output, error_list);
-}
-inline bool ExtractJsonType(const Json& json, absl::string_view field_name,
-                            const Json::Array** output,
-                            std::vector<grpc_error_handle>* error_list) {
-  return ExtractJsonArray(json, field_name, output, error_list);
-}
-inline bool ExtractJsonType(const Json& json, absl::string_view field_name,
-                            const Json::Object** output,
-                            std::vector<grpc_error_handle>* error_list) {
-  return ExtractJsonObject(json, field_name, output, error_list);
-}
-
-// Extracts a field from a JSON object, automatically selecting the type
-// of parsing based on the output parameter type.
-// If the field is not present, returns false, and if required is true,
-// adds an error to error_list.
-// Upon any other error, adds an error to error_list and returns false.
-template <typename T>
-bool ParseJsonObjectField(const Json::Object& object,
-                          absl::string_view field_name, T* output,
-                          std::vector<grpc_error_handle>* error_list,
-                          bool required = true) {
-  // TODO(roth): Once we can use C++14 heterogenous lookups, stop
-  // creating a std::string here.
-  auto it = object.find(std::string(field_name));
-  if (it == object.end()) {
-    if (required) {
-      error_list->push_back(GRPC_ERROR_CREATE(
-          absl::StrCat("field:", field_name, " error:does not exist.")));
-    }
-    return false;
-  }
-  auto& child_object_json = it->second;
-  return ExtractJsonType(child_object_json, field_name, output, error_list);
-}
-
-// Alternative to ParseJsonObjectField() for duration-value fields.
-bool ParseJsonObjectFieldAsDuration(const Json::Object& object,
-                                    absl::string_view field_name,
-                                    Duration* output,
-                                    std::vector<grpc_error_handle>* error_list,
-                                    bool required = true);
-
-}  // namespace grpc_core
-
-#endif  // GRPC_SRC_CORE_UTIL_JSON_JSON_UTIL_H