[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT

10 months ago · e2ce0689b1
parent 6ac336bcd5
commit e2ce0689b1
23 changed files with 38 additions and 51 deletions
--- a/1
+++ b/1
@ -4268,6 +4268,7 @@ grpc_cc_library(
    external_deps = [
        "absl/base:core_headers",
        "absl/cleanup",
+        "absl/log:check",
        "absl/memory",
        "absl/status",
        "absl/status:statusor",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -109,6 +109,7 @@ set(gRPC_ABSL_USED_TARGETS
  absl_bind_front
  absl_bits
  absl_charset
+  absl_check
  absl_city
  absl_civil_time
  absl_cleanup
@ -169,6 +170,8 @@ set(gRPC_ABSL_USED_TARGETS
  absl_log_entry
  absl_log_globals
  absl_log_internal_append_truncated
+  absl_log_internal_check_impl
+  absl_log_internal_check_op
  absl_log_internal_conditions
  absl_log_internal_config
  absl_log_internal_fnmatch
@ -2674,6 +2677,7 @@ target_link_libraries(grpc
  absl::bind_front
  absl::function_ref
  absl::hash
+  absl::check
  absl::type_traits
  absl::random_bit_gen_ref
  absl::random_distributions
@ -2841,7 +2845,6 @@ target_link_libraries(grpc_test_util
  absl::failure_signal_handler
  absl::stacktrace
  absl::symbolize
-  absl::check
  grpc
 )
 if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
@ -5815,7 +5818,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)

  target_link_libraries(fd_conservation_posix_test
    ${_gRPC_ALLTARGETS_LIBRARIES}
-    absl::check
    grpc_test_util
  )

@ -6129,7 +6131,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  target_link_libraries(address_sorting_test_unsecure
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
-    absl::check
    grpc++_unsecure
    grpc_test_util_unsecure
    grpc++_test_config
@ -8334,7 +8335,6 @@ target_include_directories(buffer_list_test
 target_link_libraries(buffer_list_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc_test_util
 )

@ -12868,7 +12868,6 @@ target_include_directories(endpoint_pair_test
 target_link_libraries(endpoint_pair_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc_test_util
 )

@ -13019,7 +13018,6 @@ target_include_directories(error_test
 target_link_libraries(error_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc_test_util
 )

@ -15350,7 +15348,6 @@ target_include_directories(grpc_cli

 target_link_libraries(grpc_cli
  ${_gRPC_ALLTARGETS_LIBRARIES}
-  absl::check
  grpc++
  ${_gRPC_PROTOBUF_PROTOC_LIBRARIES}
  grpc++_test_config
@ -23765,7 +23762,6 @@ target_include_directories(resolve_address_using_ares_resolver_test
 target_link_libraries(resolve_address_using_ares_resolver_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc_test_util
  grpc++_test_config
 )
@ -23872,7 +23868,6 @@ target_include_directories(resolve_address_using_native_resolver_test
 target_link_libraries(resolve_address_using_native_resolver_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc_test_util
  grpc++_test_config
 )
@ -26613,7 +26608,6 @@ target_include_directories(secure_endpoint_test
 target_link_libraries(secure_endpoint_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc_test_util
 )

@ -28462,7 +28456,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  target_link_libraries(socket_utils_test
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
-    absl::check
    grpc_test_util
  )

@ -29604,7 +29597,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
  target_link_libraries(tcp_posix_test
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
-    absl::check
    grpc_test_util
  )

@ -29701,7 +29693,6 @@ target_include_directories(tcp_socket_utils_test
 target_link_libraries(tcp_socket_utils_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc
 )

@ -30392,7 +30383,6 @@ target_include_directories(test_cpp_client_credentials_test
 target_link_libraries(test_cpp_client_credentials_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc++
  grpc_test_util
 )
@ -30552,7 +30542,6 @@ target_include_directories(test_cpp_server_credentials_test
 target_link_libraries(test_cpp_server_credentials_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc++
  grpc_test_util
 )
@ -30972,7 +30961,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  target_link_libraries(time_jump_test
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
-    absl::check
    grpc++
    grpc_test_util
  )
@ -31216,7 +31204,6 @@ target_include_directories(timer_test
 target_link_libraries(timer_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
-  absl::check
  grpc++
  grpc_test_util
 )
@ -36949,7 +36936,7 @@ generate_pkgconfig(
  "gRPC"
  "high performance general RPC framework"
  "${gRPC_CORE_VERSION}"
-  "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
+  "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
  "libcares openssl re2 zlib"
  "-lgrpc"
  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib"
@ -36971,7 +36958,7 @@ generate_pkgconfig(
  "gRPC++"
  "C++ wrapper for gRPC"
  "${gRPC_CPP_VERSION}"
-  "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc"
+  "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc"
  "libcares openssl re2 zlib"
  "-lgrpc++"
  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib"
--- a/1
+++ b/1
@ -1550,6 +1550,7 @@ LIBGRPC_SRC = \
    third_party/abseil-cpp/absl/hash/internal/hash.cc \
    third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \
    third_party/abseil-cpp/absl/log/globals.cc \
+    third_party/abseil-cpp/absl/log/internal/check_op.cc \
    third_party/abseil-cpp/absl/log/internal/conditions.cc \
    third_party/abseil-cpp/absl/log/internal/fnmatch.cc \
    third_party/abseil-cpp/absl/log/internal/globals.cc \
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -2057,6 +2057,7 @@ libs:
  - absl/functional:bind_front
  - absl/functional:function_ref
  - absl/hash:hash
+  - absl/log:check
  - absl/meta:type_traits
  - absl/random:bit_gen_ref
  - absl/random:distributions
@ -2098,7 +2099,6 @@ libs:
  - absl/debugging:failure_signal_handler
  - absl/debugging:stacktrace
  - absl/debugging:symbolize
-  - absl/log:check
  - grpc
 - name: grpc_test_util_unsecure
  build: private
@ -5140,7 +5140,6 @@ targets:
  - test/core/util/slice_splitter.cc
  - test/core/util/tracer_util.cc
  deps:
-  - absl/log:check
  - grpc_test_util
  platforms:
  - linux
@ -5311,7 +5310,6 @@ targets:
  - test/cpp/util/subprocess.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc++_unsecure
  - grpc_test_util_unsecure
  - grpc++_test_config
@ -6276,7 +6274,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
 - name: byte_buffer_test
  gtest: true
@ -8988,7 +8985,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
 - name: env_test
  gtest: true
@ -9046,7 +9042,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
  uses_polling: false
 - name: error_utils_test
@ -10524,7 +10519,6 @@ targets:
  - test/cpp/util/proto_reflection_descriptor_database.cc
  - test/cpp/util/service_describer.cc
  deps:
-  - absl/log:check
  - grpc++
  - protoc
  - grpc++_test_config
@ -15315,7 +15309,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
  - grpc++_test_config
 - name: resolve_address_using_native_resolver_posix_test
@ -15385,7 +15378,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
  - grpc++_test_config
 - name: resource_quota_end2end_stress_test
@ -17766,7 +17758,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
 - name: security_connector_test
  gtest: true
@ -18712,7 +18703,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
  platforms:
  - linux
@ -19192,7 +19182,6 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc_test_util
  platforms:
  - linux
@ -19240,7 +19229,6 @@ targets:
  - test/core/event_engine/tcp_socket_utils_test.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc
  uses_polling: false
 - name: test_core_channelz_channelz_test
@ -19594,7 +19582,6 @@ targets:
  - test/cpp/util/tls_test_utils.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc++
  - grpc_test_util
 - name: test_cpp_end2end_ssl_credentials_test
@ -19662,7 +19649,6 @@ targets:
  - test/cpp/util/tls_test_utils.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc++
  - grpc_test_util
 - name: test_cpp_util_slice_test
@ -19794,7 +19780,6 @@ targets:
  - test/cpp/common/time_jump_test.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc++
  - grpc_test_util
  platforms:
@ -19927,7 +19912,6 @@ targets:
  - test/cpp/common/timer_test.cc
  deps:
  - gtest
-  - absl/log:check
  - grpc++
  - grpc_test_util
 - name: tls_certificate_verifier_test
--- a/config.m4
+++ b/config.m4
@ -935,6 +935,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/abseil-cpp/absl/hash/internal/hash.cc \
    third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \
    third_party/abseil-cpp/absl/log/globals.cc \
+    third_party/abseil-cpp/absl/log/internal/check_op.cc \
    third_party/abseil-cpp/absl/log/internal/conditions.cc \
    third_party/abseil-cpp/absl/log/internal/fnmatch.cc \
    third_party/abseil-cpp/absl/log/internal/globals.cc \
--- a/config.w32
+++ b/config.w32
@ -900,6 +900,7 @@ if (PHP_GRPC != "no") {
    "third_party\\abseil-cpp\\absl\\hash\\internal\\hash.cc " +
    "third_party\\abseil-cpp\\absl\\hash\\internal\\low_level_hash.cc " +
    "third_party\\abseil-cpp\\absl\\log\\globals.cc " +
+    "third_party\\abseil-cpp\\absl\\log\\internal\\check_op.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\conditions.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\fnmatch.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\globals.cc " +
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -242,6 +242,7 @@ Pod::Spec.new do |s|
    ss.dependency 'abseil/functional/bind_front', abseil_version
    ss.dependency 'abseil/functional/function_ref', abseil_version
    ss.dependency 'abseil/hash/hash', abseil_version
+    ss.dependency 'abseil/log/check', abseil_version
    ss.dependency 'abseil/log/log', abseil_version
    ss.dependency 'abseil/memory/memory', abseil_version
    ss.dependency 'abseil/meta/type_traits', abseil_version
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -214,6 +214,7 @@ Pod::Spec.new do |s|
    ss.dependency 'abseil/functional/bind_front', abseil_version
    ss.dependency 'abseil/functional/function_ref', abseil_version
    ss.dependency 'abseil/hash/hash', abseil_version
+    ss.dependency 'abseil/log/check', abseil_version
    ss.dependency 'abseil/log/log', abseil_version
    ss.dependency 'abseil/memory/memory', abseil_version
    ss.dependency 'abseil/meta/type_traits', abseil_version
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -2178,9 +2178,13 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc )
  s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.h )
  s.files += %w( third_party/abseil-cpp/absl/log/absl_vlog_is_on.h )
+  s.files += %w( third_party/abseil-cpp/absl/log/check.h )
  s.files += %w( third_party/abseil-cpp/absl/log/globals.cc )
  s.files += %w( third_party/abseil-cpp/absl/log/globals.h )
  s.files += %w( third_party/abseil-cpp/absl/log/internal/append_truncated.h )
+  s.files += %w( third_party/abseil-cpp/absl/log/internal/check_impl.h )
+  s.files += %w( third_party/abseil-cpp/absl/log/internal/check_op.cc )
+  s.files += %w( third_party/abseil-cpp/absl/log/internal/check_op.h )
  s.files += %w( third_party/abseil-cpp/absl/log/internal/conditions.cc )
  s.files += %w( third_party/abseil-cpp/absl/log/internal/conditions.h )
  s.files += %w( third_party/abseil-cpp/absl/log/internal/config.h )
--- a/package.xml
+++ b/package.xml
@ -2182,9 +2182,13 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/low_level_hash.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/absl_vlog_is_on.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/check.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/globals.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/globals.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/append_truncated.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/check_impl.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/check_op.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/check_op.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/conditions.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/conditions.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/log/internal/config.h" role="src" />
--- a/src/core/BUILD
+++ b/src/core/BUILD
@ -4998,6 +4998,7 @@ grpc_cc_library(
        "absl/base:core_headers",
        "absl/cleanup",
        "absl/functional:bind_front",
+        "absl/log:check",
        "absl/memory",
        "absl/random",
        "absl/status",
@ -5181,6 +5182,7 @@ grpc_cc_library(
    ],
    external_deps = [
        "absl/base:core_headers",
+        "absl/log:check",
        "absl/status",
        "absl/status:statusor",
        "absl/strings",
--- a/src/core/ext/xds/xds_certificate_provider.cc
+++ b/src/core/ext/xds/xds_certificate_provider.cc
@ -21,9 +21,9 @@
 #include <utility>

 #include "absl/functional/bind_front.h"
+#include "absl/log/check.h"
 #include "absl/types/optional.h"

-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_client.cc
+++ b/src/core/ext/xds/xds_client.cc
@ -27,6 +27,7 @@
 #include <vector>

 #include "absl/cleanup/cleanup.h"
+#include "absl/log/check.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
@ -42,7 +43,6 @@
 #include "upb/mem/arena.h"

 #include <grpc/event_engine/event_engine.h>
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_cluster.cc
+++ b/src/core/ext/xds/xds_cluster.cc
@ -22,6 +22,7 @@
 #include <memory>
 #include <utility>

+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
@ -52,7 +53,6 @@
 #include "upb/text/encode.h"

 #include <grpc/support/json.h>
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_cluster_specifier_plugin.cc
+++ b/src/core/ext/xds/xds_cluster_specifier_plugin.cc
@ -21,6 +21,7 @@
 #include <map>
 #include <utility>

+#include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
@ -29,7 +30,6 @@
 #include "upb/mem/arena.hpp"

 #include <grpc/support/json.h>
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_endpoint.cc
+++ b/src/core/ext/xds/xds_endpoint.cc
@ -25,6 +25,7 @@
 #include <set>
 #include <vector>

+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@ -39,7 +40,6 @@
 #include "google/protobuf/wrappers.upb.h"
 #include "upb/text/encode.h"

-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_http_filters.cc
+++ b/src/core/ext/xds/xds_http_filters.cc
@ -20,11 +20,11 @@
 #include <utility>
 #include <vector>

+#include "absl/log/check.h"
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/router/v3/router.upb.h"
 #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"

-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

@ -92,8 +92,7 @@ XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {

 void XdsHttpFilterRegistry::RegisterFilter(
    std::unique_ptr<XdsHttpFilterImpl> filter) {
-  CHECK(
-      registry_map_.emplace(filter->ConfigProtoName(), filter.get()).second);
+  CHECK(registry_map_.emplace(filter->ConfigProtoName(), filter.get()).second);
  auto override_proto_name = filter->OverrideConfigProtoName();
  if (!override_proto_name.empty()) {
    CHECK(registry_map_.emplace(override_proto_name, filter.get()).second);
--- a/src/core/ext/xds/xds_listener.cc
+++ b/src/core/ext/xds/xds_listener.cc
@ -21,6 +21,7 @@
 #include <set>
 #include <utility>

+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@ -43,7 +44,6 @@
 #include "google/protobuf/wrappers.upb.h"
 #include "upb/text/encode.h"

-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

@ -874,8 +874,8 @@ void AddFilterChainDataForSourceType(
    const FilterChain& filter_chain,
    InternalFilterChainMap::DestinationIp* destination_ip,
    ValidationErrors* errors) {
-  CHECK(static_cast<unsigned int>(
-                 filter_chain.filter_chain_match.source_type) < 3);
+  CHECK(static_cast<unsigned int>(filter_chain.filter_chain_match.source_type) <
+        3);
  AddFilterChainDataForSourceIpRange(
      filter_chain,
      &destination_ip->source_types_array[static_cast<int>(
--- a/src/core/ext/xds/xds_route_config.cc
+++ b/src/core/ext/xds/xds_route_config.cc
@ -27,6 +27,7 @@
 #include <utility>
 #include <vector>

+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@ -54,7 +55,6 @@
 #include "upb/text/encode.h"

 #include <grpc/status.h>
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_routing.cc
+++ b/src/core/ext/xds/xds_routing.cc
@ -25,12 +25,12 @@
 #include <cctype>
 #include <utility>

+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"

-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_server_config_fetcher.cc
+++ b/src/core/ext/xds/xds_server_config_fetcher.cc
@ -27,6 +27,7 @@
 #include <vector>

 #include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
@ -43,7 +44,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/core/ext/xds/xds_transport_grpc.cc
+++ b/src/core/ext/xds/xds_transport_grpc.cc
@ -23,6 +23,7 @@
 #include <string_view>
 #include <utility>

+#include "absl/log/check.h"
 #include "absl/strings/str_cat.h"

 #include <grpc/byte_buffer.h>
@ -33,7 +34,6 @@
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -899,6 +899,7 @@ CORE_SOURCE_FILES = [
    'third_party/abseil-cpp/absl/hash/internal/hash.cc',
    'third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc',
    'third_party/abseil-cpp/absl/log/globals.cc',
+    'third_party/abseil-cpp/absl/log/internal/check_op.cc',
    'third_party/abseil-cpp/absl/log/internal/conditions.cc',
    'third_party/abseil-cpp/absl/log/internal/fnmatch.cc',
    'third_party/abseil-cpp/absl/log/internal/globals.cc',