grpc 1.64.0 → 1.65.2

data/src/core/lib/resource_quota/memory_quota.cc

@@ -34,15 +34,14 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/mpscq.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/race.h"
 #include "src/core/lib/promise/seq.h"
-#include "src/core/lib/resource_quota/trace.h"
 #include "src/core/lib/slice/slice_refcount.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 
@@ -253,9 +252,9 @@ GrpcMemoryAllocatorImpl::GrpcMemoryAllocatorImpl(
 }
 
 GrpcMemoryAllocatorImpl::~GrpcMemoryAllocatorImpl() {
-  CHECK(free_bytes_.load(std::memory_order_acquire) +
-            sizeof(GrpcMemoryAllocatorImpl) ==
-        taken_bytes_.load(std::memory_order_relaxed));
+  CHECK_EQ(free_bytes_.load(std::memory_order_acquire) +
+               sizeof(GrpcMemoryAllocatorImpl),
+           taken_bytes_.load(std::memory_order_relaxed));
   memory_quota_->Return(taken_bytes_.load(std::memory_order_relaxed));
 }
 
@@ -355,7 +354,7 @@ void GrpcMemoryAllocatorImpl::MaybeDonateBack() {
     if (free_bytes_.compare_exchange_weak(free, new_free,
                                           std::memory_order_acq_rel,
                                           std::memory_order_acquire)) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
         gpr_log(GPR_INFO, "[%p] Early return %" PRIdPTR " bytes", this, ret);
       }
       CHECK(taken_bytes_.fetch_sub(ret, std::memory_order_relaxed) >= ret);
@@ -450,7 +449,7 @@ void BasicMemoryQuota::Start() {
       [self](
           std::tuple<const char*, RefCountedPtr<ReclaimerQueue::Handle>> arg) {
         auto reclaimer = std::move(std::get<1>(arg));
-        if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+        if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
           double free = std::max(intptr_t{0}, self->free_bytes_.load());
           size_t quota_size = self->quota_size_.load();
           gpr_log(GPR_INFO,
@@ -533,7 +532,7 @@ void BasicMemoryQuota::FinishReclamation(uint64_t token, Waker waker) {
   if (reclamation_counter_.compare_exchange_strong(current, current + 1,
                                                    std::memory_order_relaxed,
                                                    std::memory_order_relaxed)) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
       double free = std::max(intptr_t{0}, free_bytes_.load());
       size_t quota_size = quota_size_.load();
       gpr_log(GPR_INFO,
@@ -550,7 +549,7 @@ void BasicMemoryQuota::Return(size_t amount) {
 }
 
 void BasicMemoryQuota::AddNewAllocator(GrpcMemoryAllocatorImpl* allocator) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
     gpr_log(GPR_INFO, "Adding allocator %p", allocator);
   }
 
@@ -563,7 +562,7 @@ void BasicMemoryQuota::AddNewAllocator(GrpcMemoryAllocatorImpl* allocator) {
 }
 
 void BasicMemoryQuota::RemoveAllocator(GrpcMemoryAllocatorImpl* allocator) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
     gpr_log(GPR_INFO, "Removing allocator %p", allocator);
   }
 
@@ -610,7 +609,7 @@ void BasicMemoryQuota::MaybeMoveAllocator(GrpcMemoryAllocatorImpl* allocator,
 
 void BasicMemoryQuota::MaybeMoveAllocatorBigToSmall(
     GrpcMemoryAllocatorImpl* allocator) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
     gpr_log(GPR_INFO, "Moving allocator %p to small", allocator);
   }
 
@@ -631,7 +630,7 @@ void BasicMemoryQuota::MaybeMoveAllocatorBigToSmall(
 
 void BasicMemoryQuota::MaybeMoveAllocatorSmallToBig(
     GrpcMemoryAllocatorImpl* allocator) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
     gpr_log(GPR_INFO, "Moving allocator %p to big", allocator);
   }
 
@@ -768,7 +767,7 @@ double PressureTracker::AddSampleAndGetControlValue(double sample) {
     } else {
       report = controller_.Update(current_estimate - kSetPoint);
     }
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
       gpr_log(GPR_INFO, "RQ: pressure:%lf report:%lf controller:%s",
               current_estimate, report, controller_.DebugString().c_str());
     }

data/src/core/lib/resource_quota/memory_quota.h

@@ -39,7 +39,6 @@
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -47,7 +46,7 @@
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/periodic_update.h"
-#include "src/core/lib/resource_quota/trace.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 
@@ -426,7 +425,7 @@ class GrpcMemoryAllocatorImpl final : public EventEngineMemoryAllocatorImpl {
   void ReturnFree() {
     size_t ret = free_bytes_.exchange(0, std::memory_order_acq_rel);
     if (ret == 0) return;
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) {
       gpr_log(GPR_INFO, "Allocator %p returning %zu bytes to quota", this, ret);
     }
     taken_bytes_.fetch_sub(ret, std::memory_order_relaxed);

data/src/core/lib/resource_quota/periodic_update.cc

@@ -18,7 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

data/src/core/lib/resource_quota/resource_quota.h

@@ -24,12 +24,12 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/cpp_impl_of.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/thread_quota.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 

data/src/core/lib/security/authorization/authorization_policy_provider.h

@@ -21,10 +21,10 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/security/authorization/authorization_engine.h"
+#include "src/core/util/useful.h"
 
 struct grpc_authorization_policy_provider
     : public grpc_core::DualRefCounted<grpc_authorization_policy_provider> {

data/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc

@@ -16,9 +16,9 @@
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/security/authorization/authorization_policy_provider.h"
+#include "src/core/util/useful.h"
 
 namespace {
 

data/src/core/lib/security/authorization/evaluate_args.cc

@@ -16,13 +16,13 @@
 
 #include <string.h>
 
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
 
 #include <grpc/grpc_security_constants.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
@@ -41,25 +41,23 @@ EvaluateArgs::PerChannelArgs::Address ParseEndpointUri(
   EvaluateArgs::PerChannelArgs::Address address;
   absl::StatusOr<URI> uri = URI::Parse(uri_text);
   if (!uri.ok()) {
-    gpr_log(GPR_DEBUG, "Failed to parse uri.");
+    VLOG(2) << "Failed to parse uri.";
     return address;
   }
   absl::string_view host_view;
   absl::string_view port_view;
   if (!SplitHostPort(uri->path(), &host_view, &port_view)) {
-    gpr_log(GPR_DEBUG, "Failed to split %s into host and port.",
-            uri->path().c_str());
+    VLOG(2) << "Failed to split " << uri->path() << " into host and port.";
     return address;
   }
   if (!absl::SimpleAtoi(port_view, &address.port)) {
-    gpr_log(GPR_DEBUG, "Port %s is out of range or null.",
-            std::string(port_view).c_str());
+    VLOG(2) << "Port " << port_view << " is out of range or null.";
   }
   address.address_str = std::string(host_view);
   auto resolved_address = StringToSockaddr(uri->path());
   if (!resolved_address.ok()) {
-    gpr_log(GPR_DEBUG, "Address \"%s\" is not IPv4/IPv6. Error: %s",
-            uri->path().c_str(), resolved_address.status().ToString().c_str());
+    VLOG(2) << "Address \"" << uri->path()
+            << "\" is not IPv4/IPv6. Error: " << resolved_address.status();
     memset(&address.address, 0, sizeof(address.address));
   } else {
     address.address = *resolved_address;

data/src/core/lib/security/authorization/grpc_server_authz_filter.cc

@@ -36,11 +36,10 @@
 
 namespace grpc_core {
 
-TraceFlag grpc_authz_trace(false, "grpc_authz_api");
-
 const NoInterceptor GrpcServerAuthzFilter::Call::OnServerInitialMetadata;
 const NoInterceptor GrpcServerAuthzFilter::Call::OnServerTrailingMetadata;
 const NoInterceptor GrpcServerAuthzFilter::Call::OnClientToServerMessage;
+const NoInterceptor GrpcServerAuthzFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor GrpcServerAuthzFilter::Call::OnServerToClientMessage;
 const NoInterceptor GrpcServerAuthzFilter::Call::OnFinalize;
 
@@ -65,7 +64,7 @@ GrpcServerAuthzFilter::Create(const ChannelArgs& args, ChannelFilter::Args) {
 
 bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
   EvaluateArgs args(&initial_metadata, &per_channel_evaluate_args_);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
     gpr_log(GPR_DEBUG,
             "checking request: url_path=%s, transport_security_type=%s, "
             "uri_sans=[%s], dns_sans=[%s], subject=%s",
@@ -81,7 +80,7 @@ bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
     AuthorizationEngine::Decision decision =
         engines.deny_engine->Evaluate(args);
     if (decision.type == AuthorizationEngine::Decision::Type::kDeny) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
         gpr_log(GPR_INFO, "chand=%p: request denied by policy %s.", this,
                 decision.matching_policy_name.c_str());
       }
@@ -92,14 +91,14 @@ bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
     AuthorizationEngine::Decision decision =
         engines.allow_engine->Evaluate(args);
     if (decision.type == AuthorizationEngine::Decision::Type::kAllow) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_trace)) {
+      if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
         gpr_log(GPR_DEBUG, "chand=%p: request allowed by policy %s.", this,
                 decision.matching_policy_name.c_str());
       }
       return true;
     }
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_trace)) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
     gpr_log(GPR_INFO, "chand=%p: request denied, no matching policy found.",
             this);
   }

data/src/core/lib/security/authorization/grpc_server_authz_filter.h

@@ -51,6 +51,7 @@ class GrpcServerAuthzFilter final
     static const NoInterceptor OnServerInitialMetadata;
     static const NoInterceptor OnServerTrailingMetadata;
     static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnClientToServerHalfClose;
     static const NoInterceptor OnServerToClientMessage;
     static const NoInterceptor OnFinalize;
   };

data/src/core/lib/security/authorization/matchers.cc

@@ -18,12 +18,12 @@
 
 #include <string>
 
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc_security_constants.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/address_utils/parse_address.h"
@@ -157,8 +157,8 @@ IpAuthorizationMatcher::IpAuthorizationMatcher(Type type, Rbac::CidrRange range)
   auto address =
       StringToSockaddr(range.address_prefix, 0);  // Port does not matter here.
   if (!address.ok()) {
-    gpr_log(GPR_DEBUG, "CidrRange address \"%s\" is not IPv4/IPv6. Error: %s",
-            range.address_prefix.c_str(), address.status().ToString().c_str());
+    VLOG(2) << "CidrRange address \"" << range.address_prefix
+            << "\" is not IPv4/IPv6. Error: " << address.status();
     memset(&subnet_address_, 0, sizeof(subnet_address_));
     return;
   }

data/src/core/lib/security/certificate_provider/certificate_provider_factory.h

@@ -30,8 +30,8 @@
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.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/util/json/json.h"
+#include "src/core/util/json/json_args.h"
 
 namespace grpc_core {
 

data/src/core/lib/security/certificate_provider/certificate_provider_registry.cc

@@ -22,8 +22,8 @@
 #include <utility>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 namespace grpc_core {
@@ -31,8 +31,7 @@ namespace grpc_core {
 void CertificateProviderRegistry::Builder::RegisterCertificateProviderFactory(
     std::unique_ptr<CertificateProviderFactory> factory) {
   absl::string_view name = factory->name();
-  gpr_log(GPR_DEBUG, "registering certificate provider factory for \"%s\"",
-          std::string(name).c_str());
+  VLOG(2) << "registering certificate provider factory for \"" << name << "\"";
   CHECK(factories_.emplace(name, std::move(factory)).second);
 }
 

data/src/core/lib/security/context/security_context.cc

@@ -23,6 +23,7 @@
 #include <algorithm>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
@@ -32,7 +33,7 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/context.h"
+#include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
@@ -40,9 +41,6 @@
 #include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/call.h"
 
-grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount(
-    false, "auth_context_refcount");
-
 // --- grpc_call ---
 
 grpc_call_error grpc_call_set_credentials(grpc_call* call,
@@ -52,15 +50,15 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call,
   GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2,
                  (call, creds));
   if (!grpc_call_is_client(call)) {
-    gpr_log(GPR_ERROR, "Method is client-side only.");
+    LOG(ERROR) << "Method is client-side only.";
     return GRPC_CALL_ERROR_NOT_ON_SERVER;
   }
-  ctx = static_cast<grpc_client_security_context*>(
-      grpc_call_context_get(call, GRPC_CONTEXT_SECURITY));
+  auto* arena = grpc_call_get_arena(call);
+  ctx = grpc_core::DownCast<grpc_client_security_context*>(
+      arena->GetContext<grpc_core::SecurityContext>());
   if (ctx == nullptr) {
-    ctx = grpc_client_security_context_create(grpc_call_get_arena(call), creds);
-    grpc_call_context_set(call, GRPC_CONTEXT_SECURITY, ctx,
-                          grpc_client_security_context_destroy);
+    ctx = grpc_client_security_context_create(arena, creds);
+    arena->SetContext<grpc_core::SecurityContext>(ctx);
   } else {
     ctx->creds = creds != nullptr ? creds->Ref() : nullptr;
   }
@@ -69,11 +67,12 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call,
 }
 
 grpc_auth_context* grpc_call_auth_context(grpc_call* call) {
-  void* sec_ctx = grpc_call_context_get(call, GRPC_CONTEXT_SECURITY);
+  auto* sec_ctx =
+      grpc_call_get_arena(call)->GetContext<grpc_core::SecurityContext>();
   GRPC_API_TRACE("grpc_call_auth_context(call=%p)", 1, (call));
   if (sec_ctx == nullptr) return nullptr;
   if (grpc_call_is_client(call)) {
-    auto* sc = static_cast<grpc_client_security_context*>(sec_ctx);
+    auto* sc = grpc_core::DownCast<grpc_client_security_context*>(sec_ctx);
     if (sc->auth_context == nullptr) {
       return nullptr;
     } else {
@@ -82,7 +81,7 @@ grpc_auth_context* grpc_call_auth_context(grpc_call* call) {
           .release();
     }
   } else {
-    auto* sc = static_cast<grpc_server_security_context*>(sec_ctx);
+    auto* sc = grpc_core::DownCast<grpc_server_security_context*>(sec_ctx);
     if (sc->auth_context == nullptr) {
       return nullptr;
     } else {

data/src/core/lib/security/context/security_context.h

@@ -33,14 +33,12 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gpr/useful.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"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/security/credentials/credentials.h"  // IWYU pragma: keep
-
-extern grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount;
+#include "src/core/util/useful.h"
 
 // --- grpc_auth_context ---
 
@@ -74,7 +72,7 @@ struct grpc_auth_context
       grpc_core::RefCountedPtr<grpc_auth_context> chained)
       : grpc_core::RefCounted<grpc_auth_context,
                               grpc_core::NonPolymorphicRefCount>(
-            GRPC_TRACE_FLAG_ENABLED(grpc_trace_auth_context_refcount)
+            GRPC_TRACE_FLAG_ENABLED(auth_context_refcount)
                 ? "auth_context_refcount"
                 : nullptr),
         chained_(std::move(chained)) {
@@ -136,15 +134,24 @@ struct grpc_security_context_extension {
   void (*destroy)(void*) = nullptr;
 };
 
+namespace grpc_core {
+
+class SecurityContext {
+ public:
+  virtual ~SecurityContext() = default;
+};
+
+}  // namespace grpc_core
+
 // --- grpc_client_security_context ---
 
 // Internal client-side security context.
 
-struct grpc_client_security_context {
+struct grpc_client_security_context final : public grpc_core::SecurityContext {
   explicit grpc_client_security_context(
       grpc_core::RefCountedPtr<grpc_call_credentials> creds)
       : creds(std::move(creds)) {}
-  ~grpc_client_security_context();
+  ~grpc_client_security_context() override;
 
   grpc_core::RefCountedPtr<grpc_call_credentials> creds;
   grpc_core::RefCountedPtr<grpc_auth_context> auth_context;
@@ -159,9 +166,9 @@ void grpc_client_security_context_destroy(void* ctx);
 
 // Internal server-side security context.
 
-struct grpc_server_security_context {
+struct grpc_server_security_context final : public grpc_core::SecurityContext {
   grpc_server_security_context() = default;
-  ~grpc_server_security_context();
+  ~grpc_server_security_context() override;
 
   grpc_core::RefCountedPtr<grpc_auth_context> auth_context;
   grpc_security_context_extension extension;
@@ -178,4 +185,20 @@ grpc_auth_context* grpc_auth_context_from_arg(const grpc_arg* arg);
 grpc_auth_context* grpc_find_auth_context_in_args(
     const grpc_channel_args* args);
 
+namespace grpc_core {
+template <>
+struct ArenaContextType<SecurityContext> {
+  static void Destroy(SecurityContext* p) { p->~SecurityContext(); }
+};
+
+template <>
+struct ContextSubclass<grpc_client_security_context> {
+  using Base = SecurityContext;
+};
+template <>
+struct ContextSubclass<grpc_server_security_context> {
+  using Base = SecurityContext;
+};
+}  // namespace grpc_core
+
 #endif  // GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H

data/src/core/lib/security/credentials/alts/alts_credentials.h

@@ -25,11 +25,11 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
+#include "src/core/util/useful.h"
 
 // Main struct for grpc ALTS channel credential.
 class grpc_alts_credentials final : public grpc_channel_credentials {

data/src/core/lib/security/credentials/alts/check_gcp_environment.cc

@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "absl/log/log.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
@@ -56,7 +58,7 @@ namespace internal {
 char* read_bios_file(const char* bios_file) {
   FILE* fp = fopen(bios_file, "r");
   if (!fp) {
-    gpr_log(GPR_INFO, "BIOS data file does not exist or cannot be opened.");
+    LOG(INFO) << "BIOS data file does not exist or cannot be opened.";
     return nullptr;
   }
   char buf[kBiosDataBufferSize + 1];

data/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc

@@ -20,14 +20,13 @@
 
 #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS)
 
-#include <grpc/support/log.h>
+#include "absl/log/log.h"
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 
 bool grpc_alts_is_running_on_gcp() {
-  gpr_log(GPR_INFO,
-          "ALTS: Platforms other than Linux and Windows are not supported");
+  LOG(INFO) << "ALTS: Platforms other than Linux and Windows are not supported";
   return false;
 }
 

data/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc

@@ -16,9 +16,10 @@
 //
 //
 
+#include "absl/log/log.h"
+
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
@@ -44,10 +45,9 @@ static target_service_account* target_service_account_create(
 void grpc_alts_credentials_client_options_add_target_service_account(
     grpc_alts_credentials_options* options, const char* service_account) {
   if (options == nullptr || service_account == nullptr) {
-    gpr_log(
-        GPR_ERROR,
-        "Invalid nullptr arguments to "
-        "grpc_alts_credentials_client_options_add_target_service_account()");
+    LOG(ERROR)
+        << "Invalid nullptr arguments to "
+           "grpc_alts_credentials_client_options_add_target_service_account()";
     return;
   }
   auto client_options =

data/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc

@@ -18,8 +18,9 @@
 
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 
+#include "absl/log/log.h"
+
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 grpc_alts_credentials_options* grpc_alts_credentials_options_copy(
@@ -29,8 +30,7 @@ grpc_alts_credentials_options* grpc_alts_credentials_options_copy(
     return options->vtable->copy(options);
   }
   // An error occurred.
-  gpr_log(GPR_ERROR,
-          "Invalid arguments to grpc_alts_credentials_options_copy()");
+  LOG(ERROR) << "Invalid arguments to grpc_alts_credentials_options_copy()";
   return nullptr;
 }
 

data/src/core/lib/security/credentials/call_creds_util.cc

@@ -18,6 +18,7 @@
 
 #include <string.h>
 
+#include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
@@ -47,7 +48,7 @@ ServiceUrlAndMethod MakeServiceUrlAndMethod(
   auto last_slash = service.find_last_of('/');
   absl::string_view method_name;
   if (last_slash == absl::string_view::npos) {
-    gpr_log(GPR_ERROR, "No '/' found in fully qualified method name");
+    LOG(ERROR) << "No '/' found in fully qualified method name";
     service = "";
     method_name = "";
   } else if (last_slash == 0) {

data/src/core/lib/security/credentials/channel_creds_registry.h

@@ -29,8 +29,8 @@
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.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/util/json/json.h"
+#include "src/core/util/json/json_args.h"
 
 struct grpc_channel_credentials;
 

data/src/core/lib/security/credentials/channel_creds_registry_init.cc

@@ -34,9 +34,6 @@
 #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/lib/security/credentials/channel_creds_registry.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
@@ -44,6 +41,9 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 #include "src/core/lib/security/credentials/tls/tls_credentials.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 {
 
@@ -96,6 +96,8 @@ class TlsChannelCredsFactory : public ChannelCredsFactory<> {
     }
     options->set_watch_root_cert(!config->ca_certificate_file().empty());
     options->set_watch_identity_pair(!config->certificate_file().empty());
+    options->set_certificate_verifier(
+        MakeRefCounted<HostNameCertificateVerifier>());
     return MakeRefCounted<TlsCredentials>(std::move(options));
   }