grpc 1.75.0 → 1.78.0

data/src/core/credentials/transport/alts/grpc_alts_credentials_server_options.cc

@@ -27,7 +27,12 @@ static grpc_alts_credentials_options* alts_server_options_copy(
     const grpc_alts_credentials_options* options);
 
 static void alts_server_options_destroy(
-    grpc_alts_credentials_options* /*options*/) {}
+    grpc_alts_credentials_options* options) {
+  if (options == nullptr) {
+    return;
+  }
+  delete reinterpret_cast<grpc_alts_credentials_server_options*>(options);
+}
 
 static const grpc_alts_credentials_options_vtable vtable = {
     alts_server_options_copy, alts_server_options_destroy};
@@ -35,8 +40,7 @@ static const grpc_alts_credentials_options_vtable vtable = {
 grpc_alts_credentials_options* grpc_alts_credentials_server_options_create(
     void) {
   grpc_alts_credentials_server_options* server_options =
-      static_cast<grpc_alts_credentials_server_options*>(
-          gpr_zalloc(sizeof(*server_options)));
+      new grpc_alts_credentials_server_options();
   server_options->base.vtable = &vtable;
   return &server_options->base;
 }
@@ -51,5 +55,6 @@ static grpc_alts_credentials_options* alts_server_options_copy(
   // Copy rpc protocol versions.
   grpc_gcp_rpc_protocol_versions_copy(&options->rpc_versions,
                                       &new_options->rpc_versions);
+  new_options->record_protocols = options->record_protocols;
   return new_options;
 }

data/src/core/credentials/transport/channel_creds_registry.h

@@ -24,12 +24,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_channel_credentials;
 

data/src/core/credentials/transport/channel_creds_registry_init.cc

@@ -28,7 +28,6 @@
 #include <string>
 #include <utility>
 
-#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/transport/channel_creds_registry.h"
@@ -43,6 +42,7 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/transport/composite/composite_channel_credentials.cc

@@ -22,14 +22,14 @@
 #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/credentials/call/composite/composite_call_credentials.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::UniqueTypeName grpc_composite_channel_credentials::Type() {
   static grpc_core::UniqueTypeName::Factory kFactory("Composite");
@@ -40,8 +40,8 @@ grpc_core::RefCountedPtr<grpc_channel_security_connector>
 grpc_composite_channel_credentials::create_security_connector(
     grpc_core::RefCountedPtr<grpc_call_credentials> call_creds,
     const char* target, grpc_core::ChannelArgs* args) {
-  CHECK(inner_creds_ != nullptr);
-  CHECK(call_creds_ != nullptr);
+  GRPC_CHECK(inner_creds_ != nullptr);
+  GRPC_CHECK(call_creds_ != nullptr);
   // If we are passed a call_creds, create a call composite to pass it
   // downstream.
   if (call_creds != nullptr) {
@@ -57,8 +57,8 @@ grpc_composite_channel_credentials::create_security_connector(
 grpc_channel_credentials* grpc_composite_channel_credentials_create(
     grpc_channel_credentials* channel_creds, grpc_call_credentials* call_creds,
     void* reserved) {
-  CHECK(channel_creds != nullptr && call_creds != nullptr &&
-        reserved == nullptr);
+  GRPC_CHECK(channel_creds != nullptr && call_creds != nullptr &&
+             reserved == nullptr);
   GRPC_TRACE_LOG(api, INFO)
       << "grpc_composite_channel_credentials_create(channel_creds="
       << channel_creds << ", call_creds=" << call_creds

data/src/core/credentials/transport/composite/composite_channel_credentials.h

@@ -28,7 +28,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/credentials/transport/transport_credentials.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_channel_credentials : public grpc_channel_credentials {
  public:

data/src/core/credentials/transport/fake/fake_credentials.cc

@@ -24,13 +24,13 @@
 #include <memory>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/credentials/transport/fake/fake_security_connector.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/strings/string_view.h"
 
 // -- Fake transport security credentials. --
 

data/src/core/credentials/transport/fake/fake_credentials.h

@@ -27,7 +27,6 @@
 
 #include <string>
 
-#include "absl/status/statusor.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -37,6 +36,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"
 
 #define GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS \
   "grpc.fake_security.expected_targets"

data/src/core/credentials/transport/fake/fake_security_connector.cc

@@ -30,12 +30,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/fake/fake_credentials.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/handshaker/handshaker.h"
@@ -54,10 +48,16 @@
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 
 namespace {
 class grpc_fake_channel_security_connector final
@@ -140,7 +140,7 @@ class grpc_fake_channel_security_connector final
 
  private:
   bool fake_check_target(const char* target, const char* set_str) const {
-    CHECK_NE(target, nullptr);
+    GRPC_CHECK_NE(target, nullptr);
     char** set = nullptr;
     size_t set_size = 0;
     gpr_string_split(set_str, ",", &set, &set_size);

data/src/core/credentials/transport/google_default/credentials_generic.cc

@@ -21,11 +21,11 @@
 #include <optional>
 #include <string>
 
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/credentials/transport/google_default/google_default_credentials.h"
 #include "src/core/util/env.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 
 std::string grpc_get_well_known_google_credentials_file_path_impl(void) {
   auto base = grpc_core::GetEnv(GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR);

data/src/core/credentials/transport/google_default/google_default_credentials.cc

@@ -31,13 +31,8 @@
 #include <memory>
 #include <optional>
 #include <string>
+#include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/external/external_account_credentials.h"
 #include "src/core/credentials/call/jwt/json_token.h"
 #include "src/core/credentials/call/jwt/jwt_credentials.h"
@@ -60,6 +55,7 @@
 #include "src/core/load_balancing/grpclb/grpclb.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/util/env.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json.h"
@@ -72,6 +68,11 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/uri.h"
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 using grpc_core::Json;
 
@@ -158,12 +159,6 @@ grpc_google_default_channel_credentials::create_security_connector(
   return sc;
 }
 
-grpc_core::ChannelArgs
-grpc_google_default_channel_credentials::update_arguments(
-    grpc_core::ChannelArgs args) {
-  return args.SetIfUnset(GRPC_ARG_DNS_ENABLE_SRV_QUERIES, true);
-}
-
 grpc_core::UniqueTypeName grpc_google_default_channel_credentials::Type() {
   static grpc_core::UniqueTypeName::Factory kFactory("GoogleDefault");
   return kFactory.Create();
@@ -221,7 +216,7 @@ static int is_metadata_server_reachable() {
   auto uri = grpc_core::URI::Create("http", /*user_info=*/"",
                                     GRPC_COMPUTE_ENGINE_DETECTION_HOST, "/",
                                     {} /* query params */, "" /* fragment */);
-  CHECK(uri.ok());  // params are hardcoded
+  GRPC_CHECK(uri.ok());  // params are hardcoded
   auto http_request = grpc_core::HttpRequest::Get(
       std::move(*uri), nullptr /* channel args */, &detector.pollent, &request,
       grpc_core::Timestamp::Now() + max_detection_delay,
@@ -339,6 +334,8 @@ static bool metadata_server_available() {
   return static_cast<bool>(g_metadata_server_available);
 }
 
+namespace {
+
 // A grpc_call_credentials implementation that uses two
 // underlying credentials: one for TLS and one for ALTS.
 // The implementation will pick the right credentials based on the auth
@@ -398,24 +395,42 @@ class GoogleDefaultCallCredentialsWrapper : public grpc_call_credentials {
   grpc_core::RefCountedPtr<grpc_call_credentials> alts_credentials_;
 };
 
-static grpc_core::RefCountedPtr<grpc_call_credentials> make_default_call_creds(
-    grpc_error_handle* error) {
+enum class DefaultCallCredentialsCreationMethod {
+  kNone,
+  kFromEnviromentPathValue,
+  kFromWellKnownFile,
+  kFromDefaultGCE,
+};
+
+absl::StatusOr<std::pair<grpc_core::RefCountedPtr<grpc_call_credentials>,
+                         DefaultCallCredentialsCreationMethod>>
+CreateGoogleDefaultCallCredentials() {
+  DefaultCallCredentialsCreationMethod default_credentials_type;
   grpc_core::RefCountedPtr<grpc_call_credentials> call_creds;
-  grpc_error_handle err;
+  grpc_error_handle return_status;
+  grpc_error_handle child_error;
 
   // First, try the environment variable.
   auto path_from_env = grpc_core::GetEnv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR);
   if (path_from_env.has_value()) {
-    err = create_default_creds_from_path(*path_from_env, &call_creds);
-    if (err.ok()) return call_creds;
-    *error = grpc_error_add_child(*error, err);
+    child_error = create_default_creds_from_path(*path_from_env, &call_creds);
+    if (child_error.ok()) {
+      default_credentials_type =
+          DefaultCallCredentialsCreationMethod::kFromEnviromentPathValue;
+      return std::pair(call_creds, default_credentials_type);
+    }
+    return_status = grpc_error_add_child(return_status, child_error);
   }
 
   // Then the well-known file.
-  err = create_default_creds_from_path(
+  child_error = create_default_creds_from_path(
       grpc_get_well_known_google_credentials_file_path(), &call_creds);
-  if (err.ok()) return call_creds;
-  *error = grpc_error_add_child(*error, err);
+  if (child_error.ok()) {
+    default_credentials_type =
+        DefaultCallCredentialsCreationMethod::kFromWellKnownFile;
+    return std::pair(call_creds, default_credentials_type);
+  }
+  return_status = grpc_error_add_child(return_status, child_error);
 
   update_tenancy();
 
@@ -423,18 +438,26 @@ static grpc_core::RefCountedPtr<grpc_call_credentials> make_default_call_creds(
     call_creds = grpc_core::RefCountedPtr<grpc_call_credentials>(
         grpc_google_compute_engine_credentials_create(nullptr));
     if (call_creds == nullptr) {
-      *error = GRPC_ERROR_CREATE(GRPC_GOOGLE_CREDENTIAL_CREATION_ERROR);
-      *error = grpc_error_add_child(
-          *error, GRPC_ERROR_CREATE("Failed to get credentials from network"));
+      return_status = GRPC_ERROR_CREATE(GRPC_GOOGLE_CREDENTIAL_CREATION_ERROR);
+      return_status = grpc_error_add_child(
+          return_status,
+          GRPC_ERROR_CREATE("Failed to get credentials from network"));
+      return return_status;
     }
+    default_credentials_type =
+        DefaultCallCredentialsCreationMethod::kFromDefaultGCE;
   }
 
-  return call_creds;
+  return std::pair(call_creds, default_credentials_type);
 }
 
+}  // namespace
+
 grpc_channel_credentials* grpc_google_default_credentials_create(
     grpc_call_credentials* call_creds_for_tls,
-    grpc_call_credentials* call_creds_for_alts) {
+    grpc_google_default_credentials_options* options) {
+  DefaultCallCredentialsCreationMethod default_credentials_type =
+      DefaultCallCredentialsCreationMethod::kNone;
   grpc_channel_credentials* result = nullptr;
   grpc_core::RefCountedPtr<grpc_call_credentials> call_creds(
       call_creds_for_tls);
@@ -445,33 +468,54 @@ grpc_channel_credentials* grpc_google_default_credentials_create(
       << "grpc_google_default_credentials_create(" << call_creds_for_tls << ")";
 
   if (call_creds == nullptr) {
-    call_creds = make_default_call_creds(&error);
+    auto create_default_creds_status = CreateGoogleDefaultCallCredentials();
+
+    if (!create_default_creds_status.ok()) {
+      LOG(ERROR) << "Could not create google default credentials: "
+                 << grpc_core::StatusToString(
+                        create_default_creds_status.status());
+    } else {
+      call_creds = create_default_creds_status->first;
+      default_credentials_type = create_default_creds_status->second;
+    }
   }
 
   if (call_creds != nullptr) {
     // Create google default credentials.
     grpc_channel_credentials* ssl_creds =
         grpc_ssl_credentials_create(nullptr, nullptr, nullptr, nullptr);
-    CHECK_NE(ssl_creds, nullptr);
-    grpc_alts_credentials_options* options =
+    GRPC_CHECK_NE(ssl_creds, nullptr);
+    grpc_alts_credentials_options* credentials_options =
         grpc_alts_credentials_client_options_create();
     grpc_channel_credentials* alts_creds =
-        grpc_alts_credentials_create(options);
-    grpc_alts_credentials_options_destroy(options);
+        grpc_alts_credentials_create(credentials_options);
+    grpc_alts_credentials_options_destroy(credentials_options);
     auto creds =
         grpc_core::MakeRefCounted<grpc_google_default_channel_credentials>(
             grpc_core::RefCountedPtr<grpc_channel_credentials>(alts_creds),
             grpc_core::RefCountedPtr<grpc_channel_credentials>(ssl_creds));
-    if (call_creds_for_alts != nullptr) {
-      grpc_core::RefCountedPtr<grpc_call_credentials> alts_call_creds(
-          call_creds_for_alts);
-      call_creds =
-          grpc_core::MakeRefCounted<GoogleDefaultCallCredentialsWrapper>(
-              std::move(call_creds), std::move(alts_call_creds));
+    if (options != nullptr) {
+      if (options->create_hard_bound_credentials &&
+          default_credentials_type ==
+              DefaultCallCredentialsCreationMethod::kFromDefaultGCE) {
+        grpc_google_compute_engine_credentials_options alts_options = {};
+        alts_options.alts_hard_bound = true;
+        grpc_core::RefCountedPtr<grpc_call_credentials> alts_call_creds(
+            grpc_google_compute_engine_credentials_create(&alts_options));
+        call_creds =
+            grpc_core::MakeRefCounted<GoogleDefaultCallCredentialsWrapper>(
+                std::move(call_creds), std::move(alts_call_creds));
+      } else if (options->call_creds_for_alts != nullptr) {
+        grpc_core::RefCountedPtr<grpc_call_credentials> alts_call_creds(
+            options->call_creds_for_alts);
+        call_creds =
+            grpc_core::MakeRefCounted<GoogleDefaultCallCredentialsWrapper>(
+                std::move(call_creds), std::move(alts_call_creds));
+      }
     }
     result = grpc_composite_channel_credentials_create(
         creds.get(), call_creds.get(), nullptr);
-    CHECK_NE(result, nullptr);
+    GRPC_CHECK_NE(result, nullptr);
   } else {
     LOG(ERROR) << "Could not create google default credentials: "
                << grpc_core::StatusToString(error);

data/src/core/credentials/transport/google_default/google_default_credentials.h

@@ -63,8 +63,6 @@ class grpc_google_default_channel_credentials
       grpc_core::RefCountedPtr<grpc_call_credentials> call_creds,
       const char* target, grpc_core::ChannelArgs* args) override;
 
-  grpc_core::ChannelArgs update_arguments(grpc_core::ChannelArgs args) override;
-
   static grpc_core::UniqueTypeName Type();
 
   grpc_core::UniqueTypeName type() const override { return Type(); }

data/src/core/credentials/transport/insecure/insecure_security_connector.cc

@@ -22,7 +22,6 @@
 #include <grpc/support/port_platform.h>
 #include <string.h>
 
-#include "absl/log/check.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@@ -30,6 +29,7 @@
 #include "src/core/transport/auth_context.h"
 #include "src/core/tsi/local_transport_security.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -69,7 +69,7 @@ void InsecureChannelSecurityConnector::add_handshakers(
     HandshakeManager* handshake_manager) {
   tsi_handshaker* handshaker = nullptr;
   // Re-use local_tsi_handshaker_create as a minimalist handshaker.
-  CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
+  GRPC_CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
   handshake_manager->Add(SecurityHandshakerCreate(handshaker, this, args));
 }
 
@@ -96,7 +96,7 @@ void InsecureServerSecurityConnector::add_handshakers(
     HandshakeManager* handshake_manager) {
   tsi_handshaker* handshaker = nullptr;
   // Re-use local_tsi_handshaker_create as a minimalist handshaker.
-  CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
+  GRPC_CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
   handshake_manager->Add(SecurityHandshakerCreate(handshaker, this, args));
 }
 

data/src/core/credentials/transport/insecure/insecure_security_connector.h

@@ -26,8 +26,6 @@
 
 #include <utility>
 
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/handshaker/handshaker.h"
@@ -39,6 +37,8 @@
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/transport/local/local_security_connector.cc

@@ -29,12 +29,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/match.h"
-#include "absl/strings/string_view.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/credentials/transport/local/local_credentials.h"
 #include "src/core/credentials/transport/transport_credentials.h"
@@ -60,8 +54,14 @@
 #include "src/core/tsi/transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/uri.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/match.h"
+#include "absl/strings/string_view.h"
 
 #define GRPC_UDS_URI_PATTERN "unix:"
 #define GRPC_ABSTRACT_UDS_URI_PATTERN "unix-abstract:"
@@ -77,12 +77,12 @@ grpc_core::RefCountedPtr<grpc_auth_context> local_auth_context_create(
   grpc_auth_context_add_cstring_property(
       ctx.get(), GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME,
       GRPC_LOCAL_TRANSPORT_SECURITY_TYPE);
-  CHECK(grpc_auth_context_set_peer_identity_property_name(
-            ctx.get(), GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME) == 1);
-  CHECK_EQ(peer->property_count, 1u);
+  GRPC_CHECK(grpc_auth_context_set_peer_identity_property_name(
+                 ctx.get(), GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME) == 1);
+  GRPC_CHECK_EQ(peer->property_count, 1u);
   const tsi_peer_property* prop = &peer->properties[0];
-  CHECK_NE(prop, nullptr);
-  CHECK_EQ(strcmp(prop->name, TSI_SECURITY_LEVEL_PEER_PROPERTY), 0);
+  GRPC_CHECK_NE(prop, nullptr);
+  GRPC_CHECK_EQ(strcmp(prop->name, TSI_SECURITY_LEVEL_PEER_PROPERTY), 0);
   grpc_auth_context_add_property(ctx.get(),
                                  GRPC_TRANSPORT_SECURITY_LEVEL_PROPERTY_NAME,
                                  prop->value.data, prop->value.length);
@@ -186,7 +186,7 @@ class grpc_local_channel_security_connector final
       grpc_pollset_set* /*interested_parties*/,
       grpc_core::HandshakeManager* handshake_manager) override {
     tsi_handshaker* handshaker = nullptr;
-    CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
+    GRPC_CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
     handshake_manager->Add(
         grpc_core::SecurityHandshakerCreate(handshaker, this, args));
   }
@@ -241,7 +241,7 @@ class grpc_local_server_security_connector final
       grpc_pollset_set* /*interested_parties*/,
       grpc_core::HandshakeManager* handshake_manager) override {
     tsi_handshaker* handshaker = nullptr;
-    CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
+    GRPC_CHECK(tsi_local_handshaker_create(&handshaker) == TSI_OK);
     handshake_manager->Add(
         grpc_core::SecurityHandshakerCreate(handshaker, this, args));
   }

data/src/core/credentials/transport/security_connector.cc

@@ -23,12 +23,12 @@
 
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/useful.h"
+#include "absl/log/log.h"
 
 grpc_channel_security_connector::grpc_channel_security_connector(
     absl::string_view url_scheme,
@@ -42,8 +42,8 @@ int grpc_channel_security_connector::channel_security_connector_cmp(
     const grpc_channel_security_connector* other) const {
   const grpc_channel_security_connector* other_sc =
       static_cast<const grpc_channel_security_connector*>(other);
-  CHECK_NE(channel_creds(), nullptr);
-  CHECK_NE(other_sc->channel_creds(), nullptr);
+  GRPC_CHECK_NE(channel_creds(), nullptr);
+  GRPC_CHECK_NE(other_sc->channel_creds(), nullptr);
   int c = channel_creds()->cmp(other_sc->channel_creds());
   if (c != 0) return c;
   return grpc_core::QsortCompare(request_metadata_creds(),
@@ -64,8 +64,8 @@ int grpc_server_security_connector::server_security_connector_cmp(
     const grpc_server_security_connector* other) const {
   const grpc_server_security_connector* other_sc =
       static_cast<const grpc_server_security_connector*>(other);
-  CHECK_NE(server_creds(), nullptr);
-  CHECK_NE(other_sc->server_creds(), nullptr);
+  GRPC_CHECK_NE(server_creds(), nullptr);
+  GRPC_CHECK_NE(other_sc->server_creds(), nullptr);
   return grpc_core::QsortCompare(server_creds(), other_sc->server_creds());
 }
 

data/src/core/credentials/transport/security_connector.h

@@ -26,8 +26,6 @@
 
 #include <memory>
 
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
@@ -40,6 +38,8 @@
 #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/status.h"
+#include "absl/strings/string_view.h"
 
 // --- URL schemes. ---