grpc 1.75.0 → 1.78.1

data/src/core/client_channel/subchannel_pool_interface.cc

@@ -21,11 +21,11 @@
 #include <grpc/support/port_platform.h>
 #include <string.h>
 
+#include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-#include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/channel/channel_args.h"
 
 // The subchannel pool to reuse subchannels.
 #define GRPC_ARG_SUBCHANNEL_POOL "grpc.internal.subchannel_pool"

data/src/core/client_channel/subchannel_pool_interface.h

@@ -23,13 +23,13 @@
 
 #include <string>
 
-#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/useful.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/client_channel/subchannel_stream_client.cc

@@ -23,17 +23,17 @@
 
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/time_precise.h"
+#include "absl/log/log.h"
 
 #define SUBCHANNEL_STREAM_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define SUBCHANNEL_STREAM_RECONNECT_BACKOFF_MULTIPLIER 1.6
@@ -110,7 +110,7 @@ void SubchannelStreamClient::StartCall() {
 
 void SubchannelStreamClient::StartCallLocked() {
   if (event_handler_ == nullptr) return;
-  CHECK(call_state_ == nullptr);
+  GRPC_CHECK(call_state_ == nullptr);
   if (event_handler_ != nullptr) {
     event_handler_->OnCallStartLocked(this);
   }
@@ -222,7 +222,7 @@ void SubchannelStreamClient::CallState::StartCallLocked() {
   send_initial_metadata_.Set(
       HttpPathMetadata(),
       subchannel_stream_client_->event_handler_->GetPathLocked());
-  CHECK(error.ok());
+  GRPC_CHECK(error.ok());
   payload_.send_initial_metadata.send_initial_metadata =
       &send_initial_metadata_;
   batch_.send_initial_metadata = true;
@@ -432,7 +432,7 @@ void SubchannelStreamClient::CallState::CallEndedLocked(bool retry) {
   if (this == subchannel_stream_client_->call_state_.get()) {
     subchannel_stream_client_->call_state_.reset();
     if (retry) {
-      CHECK(subchannel_stream_client_->event_handler_ != nullptr);
+      GRPC_CHECK(subchannel_stream_client_->event_handler_ != nullptr);
       if (seen_response_.load(std::memory_order_acquire)) {
         // If the call fails after we've gotten a successful response, reset
         // the backoff and restart the call immediately.

data/src/core/client_channel/subchannel_stream_client.h

@@ -27,9 +27,6 @@
 #include <memory>
 #include <optional>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/lib/iomgr/call_combiner.h"
@@ -46,6 +43,9 @@
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/config/config_vars.cc

@@ -20,10 +20,10 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/config/load_config.h"
 #include "absl/flags/flag.h"
 #include "absl/strings/escaping.h"
 #include "absl/types/optional.h"
-#include "src/core/config/load_config.h"
 
 #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING
 #define GPR_DEFAULT_LOG_VERBOSITY_STRING ""
@@ -70,6 +70,9 @@ ABSL_FLAG(absl::optional<std::string>, grpc_system_ssl_roots_dir, {},
           "Custom directory to SSL Roots");
 ABSL_FLAG(absl::optional<std::string>, grpc_default_ssl_roots_file_path, {},
           "Path to the default SSL roots file.");
+ABSL_FLAG(absl::optional<bool>, grpc_use_system_roots_over_language_callback,
+          {},
+          "Prefer loading system root certificates over language callback.");
 ABSL_FLAG(absl::optional<bool>, grpc_not_use_system_ssl_roots, {},
           "Disable loading system root certificates.");
 ABSL_FLAG(absl::optional<std::string>, grpc_ssl_cipher_suites, {},
@@ -83,6 +86,17 @@ ABSL_FLAG(
     "EXPERIMENTAL: If non-zero, extend the lifetime of channelz nodes past the "
     "underlying object lifetime, up to this many nodes. The value may be "
     "adjusted slightly to account for implementation limits.");
+ABSL_FLAG(absl::optional<bool>, grpc_channelz_call_tracer, {},
+          "EXPERIMENTAL: If true, channelz will allow inspecting calls as well "
+          "as channels.");
+ABSL_FLAG(absl::optional<double>, grpc_experimental_target_memory_pressure, {},
+          "EXPERIMENTAL: The target pressure for the memory quota pressure "
+          "controller. This is a value between 0 and 1.");
+ABSL_FLAG(absl::optional<double>, grpc_experimental_memory_pressure_threshold,
+          {},
+          "EXPERIMENTAL: The threshold for the memory quota pressure "
+          "controller. This is a value between 0 and 1, and must always be "
+          "greater than the target pressure.");
 
 namespace grpc_core {
 
@@ -95,12 +109,24 @@ ConfigVars::ConfigVars(const Overrides& overrides)
           LoadConfig(FLAGS_grpc_channelz_max_orphaned_nodes,
                      "GRPC_CHANNELZ_MAX_ORPHANED_NODES",
                      overrides.channelz_max_orphaned_nodes, 0)),
+      experimental_target_memory_pressure_(
+          LoadConfig(FLAGS_grpc_experimental_target_memory_pressure,
+                     "GRPC_EXPERIMENTAL_TARGET_MEMORY_PRESSURE",
+                     overrides.experimental_target_memory_pressure, 0.95)),
+      experimental_memory_pressure_threshold_(
+          LoadConfig(FLAGS_grpc_experimental_memory_pressure_threshold,
+                     "GRPC_EXPERIMENTAL_MEMORY_PRESSURE_THRESHOLD",
+                     overrides.experimental_memory_pressure_threshold, 0.99)),
       enable_fork_support_(LoadConfig(
           FLAGS_grpc_enable_fork_support, "GRPC_ENABLE_FORK_SUPPORT",
           overrides.enable_fork_support, GRPC_ENABLE_FORK_SUPPORT_DEFAULT)),
       abort_on_leaks_(LoadConfig(FLAGS_grpc_abort_on_leaks,
                                  "GRPC_ABORT_ON_LEAKS",
                                  overrides.abort_on_leaks, false)),
+      use_system_roots_over_language_callback_(
+          LoadConfig(FLAGS_grpc_use_system_roots_over_language_callback,
+                     "GRPC_USE_SYSTEM_ROOTS_OVER_LANGUAGE_CALLBACK",
+                     overrides.use_system_roots_over_language_callback, false)),
       not_use_system_ssl_roots_(LoadConfig(
           FLAGS_grpc_not_use_system_ssl_roots, "GRPC_NOT_USE_SYSTEM_SSL_ROOTS",
           overrides.not_use_system_ssl_roots, false)),
@@ -108,6 +134,9 @@ ConfigVars::ConfigVars(const Overrides& overrides)
           LoadConfig(FLAGS_grpc_cpp_experimental_disable_reflection,
                      "GRPC_CPP_EXPERIMENTAL_DISABLE_REFLECTION",
                      overrides.cpp_experimental_disable_reflection, false)),
+      channelz_call_tracer_(LoadConfig(FLAGS_grpc_channelz_call_tracer,
+                                       "GRPC_CHANNELZ_CALL_TRACER",
+                                       overrides.channelz_call_tracer, false)),
       dns_resolver_(LoadConfig(FLAGS_grpc_dns_resolver, "GRPC_DNS_RESOLVER",
                                overrides.dns_resolver, "")),
       verbosity_(LoadConfig(FLAGS_grpc_verbosity, "GRPC_VERBOSITY",
@@ -154,11 +183,17 @@ std::string ConfigVars::ToString() const {
       ", system_ssl_roots_dir: ", "\"", absl::CEscape(SystemSslRootsDir()),
       "\"", ", default_ssl_roots_file_path: ", "\"",
       absl::CEscape(DefaultSslRootsFilePath()), "\"",
+      ", use_system_roots_over_language_callback: ",
+      UseSystemRootsOverLanguageCallback() ? "true" : "false",
       ", not_use_system_ssl_roots: ", NotUseSystemSslRoots() ? "true" : "false",
       ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\"",
       ", cpp_experimental_disable_reflection: ",
       CppExperimentalDisableReflection() ? "true" : "false",
-      ", channelz_max_orphaned_nodes: ", ChannelzMaxOrphanedNodes());
+      ", channelz_max_orphaned_nodes: ", ChannelzMaxOrphanedNodes(),
+      ", channelz_call_tracer: ", ChannelzCallTracer() ? "true" : "false",
+      ", experimental_target_memory_pressure: ",
+      ExperimentalTargetMemoryPressure(),
+      ", experimental_memory_pressure_threshold: ",
+      ExperimentalMemoryPressureThreshold());
 }
-
 }  // namespace grpc_core

data/src/core/config/config_vars.h

@@ -36,10 +36,14 @@ class GPR_DLL ConfigVars {
   struct Overrides {
     absl::optional<int32_t> client_channel_backup_poll_interval_ms;
     absl::optional<int32_t> channelz_max_orphaned_nodes;
+    absl::optional<double> experimental_target_memory_pressure;
+    absl::optional<double> experimental_memory_pressure_threshold;
     absl::optional<bool> enable_fork_support;
     absl::optional<bool> abort_on_leaks;
+    absl::optional<bool> use_system_roots_over_language_callback;
     absl::optional<bool> not_use_system_ssl_roots;
     absl::optional<bool> cpp_experimental_disable_reflection;
+    absl::optional<bool> channelz_call_tracer;
     absl::optional<std::string> dns_resolver;
     absl::optional<std::string> verbosity;
     absl::optional<std::string> poll_strategy;
@@ -95,6 +99,10 @@ class GPR_DLL ConfigVars {
   std::string SystemSslRootsDir() const;
   // Path to the default SSL roots file.
   std::string DefaultSslRootsFilePath() const;
+  // Prefer loading system root certificates over language callback.
+  bool UseSystemRootsOverLanguageCallback() const {
+    return use_system_roots_over_language_callback_;
+  }
   // Disable loading system root certificates.
   bool NotUseSystemSslRoots() const { return not_use_system_ssl_roots_; }
   // A colon separated list of cipher suites to use with OpenSSL
@@ -111,6 +119,20 @@ class GPR_DLL ConfigVars {
   int32_t ChannelzMaxOrphanedNodes() const {
     return channelz_max_orphaned_nodes_;
   }
+  // EXPERIMENTAL: If true, channelz will allow inspecting calls as well as
+  // channels.
+  bool ChannelzCallTracer() const { return channelz_call_tracer_; }
+  // EXPERIMENTAL: The target pressure for the memory quota pressure controller.
+  // This is a value between 0 and 1.
+  double ExperimentalTargetMemoryPressure() const {
+    return experimental_target_memory_pressure_;
+  }
+  // EXPERIMENTAL: The threshold for the memory quota pressure controller. This
+  // is a value between 0 and 1, and must always be greater than the target
+  // pressure.
+  double ExperimentalMemoryPressureThreshold() const {
+    return experimental_memory_pressure_threshold_;
+  }
 
  private:
   explicit ConfigVars(const Overrides& overrides);
@@ -118,10 +140,14 @@ class GPR_DLL ConfigVars {
   static std::atomic<ConfigVars*> config_vars_;
   int32_t client_channel_backup_poll_interval_ms_;
   int32_t channelz_max_orphaned_nodes_;
+  double experimental_target_memory_pressure_;
+  double experimental_memory_pressure_threshold_;
   bool enable_fork_support_;
   bool abort_on_leaks_;
+  bool use_system_roots_over_language_callback_;
   bool not_use_system_ssl_roots_;
   bool cpp_experimental_disable_reflection_;
+  bool channelz_call_tracer_;
   std::string dns_resolver_;
   std::string verbosity_;
   std::string poll_strategy_;

data/src/core/config/core_configuration.cc

@@ -20,7 +20,7 @@
 #include <utility>
 #include <vector>
 
-#include "absl/log/check.h"
+#include "src/core/util/grpc_check.h"
 
 namespace grpc_core {
 
@@ -58,15 +58,15 @@ CoreConfiguration::CoreConfiguration(Builder* builder)
 void CoreConfiguration::RegisterBuilder(
     BuilderScope scope, absl::AnyInvocable<void(Builder*)> builder,
     SourceLocation whence) {
-  CHECK(config_.load(std::memory_order_relaxed) == nullptr)
+  GRPC_CHECK(config_.load(std::memory_order_relaxed) == nullptr)
       << "CoreConfiguration was already instantiated before builder "
          "registration was completed";
   if (scope == BuilderScope::kPersistent) {
-    CHECK(!has_config_ever_been_produced_.load(std::memory_order_relaxed))
+    GRPC_CHECK(!has_config_ever_been_produced_.load(std::memory_order_relaxed))
         << "Persistent builders cannot be registered after the first "
            "CoreConfiguration has been produced";
   }
-  CHECK_NE(scope, BuilderScope::kCount);
+  GRPC_CHECK_NE(scope, BuilderScope::kCount);
   auto& head = builders_[static_cast<size_t>(scope)];
   RegisteredBuilder* n = new RegisteredBuilder();
   VLOG(4) << "Registering " << scope << " builder from " << whence.file() << ":"
@@ -77,7 +77,7 @@ void CoreConfiguration::RegisterBuilder(
   while (!head.compare_exchange_weak(n->next, n, std::memory_order_acq_rel,
                                      std::memory_order_relaxed)) {
   }
-  CHECK(config_.load(std::memory_order_relaxed) == nullptr)
+  GRPC_CHECK(config_.load(std::memory_order_relaxed) == nullptr)
       << "CoreConfiguration was already instantiated before builder "
          "registration was completed";
 }

data/src/core/config/core_configuration.h

@@ -20,8 +20,6 @@
 
 #include <atomic>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/check.h"
 #include "src/core/credentials/call/call_creds_registry.h"
 #include "src/core/credentials/transport/channel_creds_registry.h"
 #include "src/core/credentials/transport/tls/certificate_provider_registry.h"
@@ -35,6 +33,8 @@
 #include "src/core/transport/auth_context_comparator_registry.h"
 #include "src/core/transport/endpoint_transport.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
+#include "absl/functional/any_invocable.h"
 
 namespace grpc_core {
 
@@ -172,12 +172,12 @@ class GRPC_DLL CoreConfiguration {
     ~WithSubstituteBuilder() {
       // Reset and restore.
       Reset();
-      CHECK(CoreConfiguration::config_.exchange(
-                config_restore_, std::memory_order_acquire) == nullptr);
-      CHECK(CoreConfiguration::builders_[static_cast<size_t>(
-                                             BuilderScope::kEphemeral)]
-                .exchange(builders_restore_, std::memory_order_acquire) ==
-            nullptr);
+      GRPC_CHECK(CoreConfiguration::config_.exchange(
+                     config_restore_, std::memory_order_acquire) == nullptr);
+      GRPC_CHECK(CoreConfiguration::builders_[static_cast<size_t>(
+                                                  BuilderScope::kEphemeral)]
+                     .exchange(builders_restore_, std::memory_order_acquire) ==
+                 nullptr);
     }
 
    private:

data/src/core/config/load_config.cc

@@ -19,11 +19,11 @@
 
 #include <optional>
 
+#include "src/core/util/env.h"
 #include "absl/flags/marshalling.h"
 #include "absl/log/check.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_join.h"
-#include "src/core/util/env.h"
 
 namespace grpc_core {
 
@@ -51,6 +51,18 @@ int32_t LoadConfigFromEnv(absl::string_view environment_variable,
   return default_value;
 }
 
+double LoadConfigFromEnv(absl::string_view environment_variable,
+                         double default_value) {
+  auto env = LoadEnv(environment_variable);
+  if (env.has_value()) {
+    double out;
+    if (absl::SimpleAtod(*env, &out)) return out;
+    fprintf(stderr, "Error reading double from %s: '%s' is not a double",
+            std::string(environment_variable).c_str(), env->c_str());
+  }
+  return default_value;
+}
+
 bool LoadConfigFromEnv(absl::string_view environment_variable,
                        bool default_value) {
   auto env = LoadEnv(environment_variable);

data/src/core/config/load_config.h

@@ -33,6 +33,8 @@ int32_t LoadConfigFromEnv(absl::string_view environment_variable,
                           int32_t default_value);
 bool LoadConfigFromEnv(absl::string_view environment_variable,
                        bool default_value);
+double LoadConfigFromEnv(absl::string_view environment_variable,
+                         double default_value);
 
 template <typename T, typename D>
 T LoadConfig(const absl::Flag<absl::optional<T>>& flag,

data/src/core/credentials/call/call_credentials.h

@@ -28,9 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/log/check.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
@@ -38,9 +35,12 @@
 #include "src/core/lib/transport/transport.h"
 #include "src/core/transport/auth_context.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/unique_type_name.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 // --- Constants. ---
 
@@ -130,7 +130,7 @@ struct grpc_call_credentials
   // If this method returns 0, it means that gRPC can treat the two call
   // credentials as effectively the same..
   int cmp(const grpc_call_credentials* other) const {
-    CHECK_NE(other, nullptr);
+    GRPC_CHECK_NE(other, nullptr);
     int r = type().Compare(other->type());
     if (r != 0) return r;
     return cmp_impl(other);

data/src/core/credentials/call/call_creds_registry.h

@@ -22,12 +22,12 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/strings/string_view.h"
 
 struct grpc_call_credentials;
 

data/src/core/credentials/call/call_creds_registry_init.cc

@@ -22,8 +22,6 @@
 #include <memory>
 #include <string>
 
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/credentials/call/call_creds_registry.h"
@@ -34,6 +32,8 @@
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/call_creds_util.cc

@@ -20,14 +20,14 @@
 #include <grpc/support/string_util.h>
 #include <string.h>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/transport/auth_context.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -41,7 +41,7 @@ struct ServiceUrlAndMethod {
 ServiceUrlAndMethod MakeServiceUrlAndMethod(
     const ClientMetadataHandle& initial_metadata,
     const grpc_call_credentials::GetRequestMetadataArgs* args) {
-  DCHECK(initial_metadata->get_pointer(HttpPathMetadata()) != nullptr);
+  GRPC_DCHECK(initial_metadata->get_pointer(HttpPathMetadata()) != nullptr);
   auto service =
       initial_metadata->get_pointer(HttpPathMetadata())->as_string_view();
   auto last_slash = service.find_last_of('/');
@@ -56,7 +56,8 @@ ServiceUrlAndMethod MakeServiceUrlAndMethod(
     method_name = service.substr(last_slash + 1);
     service = service.substr(0, last_slash);
   }
-  DCHECK(initial_metadata->get_pointer(HttpAuthorityMetadata()) != nullptr);
+  GRPC_DCHECK(initial_metadata->get_pointer(HttpAuthorityMetadata()) !=
+              nullptr);
   auto host_and_port =
       initial_metadata->get_pointer(HttpAuthorityMetadata())->as_string_view();
   absl::string_view url_scheme = args->security_connector->url_scheme();

data/src/core/credentials/call/composite/composite_call_credentials.cc

@@ -22,13 +22,13 @@
 #include <memory>
 #include <vector>
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_join.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/try_seq.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
 
 grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
 grpc_composite_call_credentials::GetRequestMetadata(
@@ -106,9 +106,9 @@ grpc_call_credentials* grpc_composite_call_credentials_create(
   GRPC_TRACE_LOG(api, INFO)
       << "grpc_composite_call_credentials_create(creds1=" << creds1
       << ", creds2=" << creds2 << ", reserved=" << reserved << ")";
-  CHECK_EQ(reserved, nullptr);
-  CHECK_NE(creds1, nullptr);
-  CHECK_NE(creds2, nullptr);
+  GRPC_CHECK_EQ(reserved, nullptr);
+  GRPC_CHECK_NE(creds1, nullptr);
+  GRPC_CHECK_NE(creds2, nullptr);
   return grpc_core::MakeRefCounted<grpc_composite_call_credentials>(
              creds1->Ref(), creds2->Ref())
       .release();

data/src/core/credentials/call/composite/composite_call_credentials.h

@@ -29,7 +29,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/status/statusor.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -38,6 +37,7 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/useful.h"
+#include "absl/status/statusor.h"
 
 class grpc_composite_call_credentials : public grpc_call_credentials {
  public:

data/src/core/credentials/call/external/aws_external_account_credentials.cc

@@ -28,21 +28,21 @@
 #include <optional>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_replace.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/util/env.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/uri.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_replace.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -422,8 +422,8 @@ void AwsExternalAccountCredentials::AwsFetchBody::BuildSubjectToken() {
 void AwsExternalAccountCredentials::AwsFetchBody::AddMetadataRequestHeaders(
     grpc_http_request* request) {
   if (!imdsv2_session_token_.empty()) {
-    CHECK_EQ(request->hdr_count, 0u);
-    CHECK_EQ(request->hdrs, nullptr);
+    GRPC_CHECK_EQ(request->hdr_count, 0u);
+    GRPC_CHECK_EQ(request->hdrs, nullptr);
     grpc_http_header* headers =
         static_cast<grpc_http_header*>(gpr_malloc(sizeof(grpc_http_header)));
     headers[0].key = gpr_strdup("x-aws-ec2-metadata-token");

data/src/core/credentials/call/external/aws_external_account_credentials.h

@@ -24,7 +24,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/external/aws_request_signer.h"
 #include "src/core/credentials/call/external/external_account_credentials.h"
 #include "src/core/lib/iomgr/error.h"
@@ -32,6 +31,7 @@
 #include "src/core/util/http_client/parser.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/external/external_account_credentials.cc

@@ -29,7 +29,18 @@
 #include <memory>
 #include <utility>
 
-#include "absl/log/check.h"
+#include "src/core/credentials/call/external/aws_external_account_credentials.h"
+#include "src/core/credentials/call/external/file_external_account_credentials.h"
+#include "src/core/credentials/call/external/url_external_account_credentials.h"
+#include "src/core/credentials/call/json_util.h"
+#include "src/core/credentials/transport/transport_credentials.h"
+#include "src/core/util/grpc_check.h"
+#include "src/core/util/http_client/httpcli_ssl_credentials.h"
+#include "src/core/util/http_client/parser.h"
+#include "src/core/util/json/json_reader.h"
+#include "src/core/util/json/json_writer.h"
+#include "src/core/util/status_helper.h"
+#include "src/core/util/uri.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -43,17 +54,6 @@
 #include "absl/strings/strip.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-#include "src/core/credentials/call/external/aws_external_account_credentials.h"
-#include "src/core/credentials/call/external/file_external_account_credentials.h"
-#include "src/core/credentials/call/external/url_external_account_credentials.h"
-#include "src/core/credentials/call/json_util.h"
-#include "src/core/credentials/transport/transport_credentials.h"
-#include "src/core/util/http_client/httpcli_ssl_credentials.h"
-#include "src/core/util/http_client/parser.h"
-#include "src/core/util/json/json_reader.h"
-#include "src/core/util/json/json_writer.h"
-#include "src/core/util/status_helper.h"
-#include "src/core/util/uri.h"
 
 #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \
   "urn:ietf:params:oauth:grant-type:token-exchange"

data/src/core/credentials/call/external/external_account_credentials.h

@@ -26,7 +26,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/oauth2/oauth2_credentials.h"
 #include "src/core/credentials/call/token_fetcher/token_fetcher_credentials.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -38,6 +37,7 @@
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/external/file_external_account_credentials.cc

@@ -22,14 +22,14 @@
 #include <map>
 #include <utility>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/load_file.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {