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

11 months ago · d587ede574
parent 23e3550e54
commit d587ede574
15 changed files with 78 additions and 31 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5811,6 +5811,7 @@ 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
  )

@ -8333,6 +8334,7 @@ target_include_directories(buffer_list_test
 target_link_libraries(buffer_list_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
+  absl::check
  grpc_test_util
 )

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

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

@ -23547,6 +23551,7 @@ 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
 )
@ -23653,6 +23658,7 @@ 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
 )
@ -26431,6 +26437,7 @@ target_include_directories(secure_endpoint_test
 target_link_libraries(secure_endpoint_test
  ${_gRPC_ALLTARGETS_LIBRARIES}
  gtest
+  absl::check
  grpc_test_util
 )

@ -28291,6 +28298,7 @@ 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
  )

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

--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -5139,6 +5139,7 @@ targets:
  - test/core/util/slice_splitter.cc
  - test/core/util/tracer_util.cc
  deps:
+  - absl/log:check
  - grpc_test_util
  platforms:
  - linux
@ -6278,6 +6279,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
 - name: byte_buffer_test
  gtest: true
@ -9017,6 +9019,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
 - name: env_test
  gtest: true
@ -9074,6 +9077,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
  uses_polling: false
 - name: error_utils_test
@ -14806,6 +14810,7 @@ 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
@ -14875,6 +14880,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
  - grpc++_test_config
 - name: resource_quota_end2end_stress_test
@ -17293,6 +17299,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
 - name: security_connector_test
  gtest: true
@ -18250,6 +18257,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
  platforms:
  - linux
@ -18732,6 +18740,7 @@ targets:
  - test/core/util/tracer_util.cc
  deps:
  - gtest
+  - absl/log:check
  - grpc_test_util
  platforms:
  - linux
--- a/test/core/iomgr/BUILD
+++ b/test/core/iomgr/BUILD
@ -26,6 +26,7 @@ grpc_cc_library(
    name = "endpoint_tests",
    srcs = ["endpoint_tests.cc"],
    hdrs = ["endpoint_tests.h"],
+    external_deps = ["absl/log:check"],
    language = "C++",
    visibility = [
        "//test:__subpackages__",
@ -59,7 +60,10 @@ grpc_cc_test(
 grpc_cc_test(
    name = "endpoint_pair_test",
    srcs = ["endpoint_pair_test.cc"],
-    external_deps = ["gtest"],
+    external_deps = [
+        "absl/log:check",
+        "gtest",
+    ],
    language = "C++",
    tags = [
        "endpoint_test",
@ -95,6 +99,7 @@ grpc_cc_test(
 grpc_cc_test(
    name = "fd_conservation_posix_test",
    srcs = ["fd_conservation_posix_test.cc"],
+    external_deps = ["absl/log:check"],
    language = "C++",
    tags = ["no_windows"],
    deps = [
@ -180,6 +185,7 @@ grpc_cc_test(
    name = "resolve_address_using_ares_resolver_test",
    srcs = ["resolve_address_test.cc"],
    external_deps = [
+        "absl/log:check",
        "absl/strings",
        "gtest",
    ],
@ -198,6 +204,7 @@ grpc_cc_test(
    name = "resolve_address_using_native_resolver_test",
    srcs = ["resolve_address_test.cc"],
    external_deps = [
+        "absl/log:check",
        "absl/strings",
        "gtest",
    ],
@ -215,7 +222,10 @@ grpc_cc_test(
 grpc_cc_test(
    name = "socket_utils_test",
    srcs = ["socket_utils_test.cc"],
-    external_deps = ["gtest"],
+    external_deps = [
+        "absl/log:check",
+        "gtest",
+    ],
    language = "C++",
    tags = ["no_windows"],
    deps = [
@ -270,7 +280,10 @@ grpc_cc_test(
 grpc_cc_test(
    name = "buffer_list_test",
    srcs = ["buffer_list_test.cc"],
-    external_deps = ["gtest"],
+    external_deps = [
+        "absl/log:check",
+        "gtest",
+    ],
    language = "C++",
    deps = [
        "//:gpr",
--- a/test/core/iomgr/endpoint_pair_test.cc
+++ b/test/core/iomgr/endpoint_pair_test.cc
@ -22,6 +22,8 @@

 #include <gtest/gtest.h>

+#include "absl/log/check.h"
+
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
--- a/test/core/iomgr/endpoint_tests.cc
+++ b/test/core/iomgr/endpoint_tests.cc
@ -22,6 +22,8 @@
 #include <stdbool.h>
 #include <sys/types.h>

+#include "absl/log/check.h"
+
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
@ -274,8 +276,8 @@ static void read_and_write_test(grpc_endpoint_test_config config,
  while (!state.read_done || !state.write_done) {
    grpc_pollset_worker* worker = nullptr;
    CHECK(grpc_core::Timestamp::Now() < deadline);
-    CHECK(GRPC_LOG_IF_ERROR(
-        "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
+    CHECK(GRPC_LOG_IF_ERROR("pollset_work",
+                            grpc_pollset_work(g_pollset, &worker, deadline)));
  }
  gpr_mu_unlock(g_mu);
  grpc_core::ExecCtx::Get()->Flush();
@ -302,8 +304,8 @@ static void wait_for_fail_count(int* fail_count, int want_fail_count) {
  while (grpc_core::Timestamp::Now() < deadline &&
         *fail_count < want_fail_count) {
    grpc_pollset_worker* worker = nullptr;
-    CHECK(GRPC_LOG_IF_ERROR(
-        "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
+    CHECK(GRPC_LOG_IF_ERROR("pollset_work",
+                            grpc_pollset_work(g_pollset, &worker, deadline)));
    gpr_mu_unlock(g_mu);
    grpc_core::ExecCtx::Get()->Flush();
    gpr_mu_lock(g_mu);
--- a/test/core/iomgr/fd_conservation_posix_test.cc
+++ b/test/core/iomgr/fd_conservation_posix_test.cc
@ -18,6 +18,8 @@

 #include <sys/resource.h>

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

--- a/test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm
+++ b/test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm
@ -57,7 +57,7 @@ static void must_succeed(void* arg, grpc_error_handle error) {

 static void must_fail(void* arg, grpc_error_handle error) {
  CHECK_EQ(g_connecting, nullptr);
-  CHECK_DONT(!error.ok());
+  CHECK(!error.ok());
  NSLog(@"%s", grpc_core::StatusToString(error).c_str());
  finish_connection();
 }
--- a/test/core/iomgr/resolve_address_test.cc
+++ b/test/core/iomgr/resolve_address_test.cc
@ -25,6 +25,7 @@
 #include <gtest/gtest.h>

 #include "absl/functional/bind_front.h"
+#include "absl/log/check.h"
 #include "absl/strings/match.h"

 #include <grpc/grpc.h>
--- a/test/core/iomgr/socket_utils_test.cc
+++ b/test/core/iomgr/socket_utils_test.cc
@ -28,6 +28,8 @@

 #include <gtest/gtest.h>

+#include "absl/log/check.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
--- a/test/core/memory_usage/BUILD
+++ b/test/core/memory_usage/BUILD
@ -26,6 +26,7 @@ grpc_cc_library(
    ],
    hdrs = ["memstats.h"],
    external_deps = [
+        "absl/log:check",
        "absl/types:optional",
    ],
    tags = [
@ -44,6 +45,7 @@ grpc_cc_binary(
    external_deps = [
        "absl/flags:flag",
        "absl/flags:parse",
+        "absl/log:check",
    ],
    tags = [
        "bazel_only",
@ -66,6 +68,7 @@ grpc_cc_binary(
    external_deps = [
        "absl/flags:flag",
        "absl/flags:parse",
+        "absl/log:check",
    ],
    tags = [
        "bazel_only",
@ -90,6 +93,7 @@ grpc_cc_binary(
    external_deps = [
        "absl/flags:flag",
        "absl/flags:parse",
+        "absl/log:check",
        "absl/time",
    ],
    tags = [
@ -115,6 +119,7 @@ grpc_cc_binary(
    external_deps = [
        "absl/flags:flag",
        "absl/flags:parse",
+        "absl/log:check",
    ],
    tags = [
        "bazel_only",
--- a/test/core/memory_usage/callback_client.cc
+++ b/test/core/memory_usage/callback_client.cc
@ -27,6 +27,7 @@

 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/log/check.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"

@ -159,9 +160,9 @@ int main(int argc, char** argv) {
  // Checking that all channels are still open
  for (int i = 0; i < size; ++i) {
    CHECK(!std::exchange(channels_list[i], nullptr)
-                    ->WaitForStateChange(GRPC_CHANNEL_READY,
-                                         std::chrono::system_clock::now() +
-                                             std::chrono::milliseconds(1)));
+               ->WaitForStateChange(GRPC_CHANNEL_READY,
+                                    std::chrono::system_clock::now() +
+                                        std::chrono::milliseconds(1)));
  }

  std::string prefix;
--- a/test/core/memory_usage/callback_server.cc
+++ b/test/core/memory_usage/callback_server.cc
@ -24,6 +24,7 @@

 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/log/check.h"

 #include <grpc/support/log.h>
 #include <grpcpp/grpcpp.h>
--- a/test/core/memory_usage/client.cc
+++ b/test/core/memory_usage/client.cc
@ -27,6 +27,7 @@

 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/log/check.h"
 #include "absl/strings/match.h"

 #include <grpc/byte_buffer.h>
@ -91,9 +92,9 @@ static void init_ping_pong_request(int call_idx) {
      gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);

  CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
-                                                   metadata_ops,
-                                                   (size_t)(op - metadata_ops),
-                                                   tag(call_idx), nullptr));
+                                              metadata_ops,
+                                              (size_t)(op - metadata_ops),
+                                              tag(call_idx), nullptr));
  grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
 }

@ -110,10 +111,9 @@ static void finish_ping_pong_request(int call_idx) {
  op->data.recv_status_on_client.status_details = &calls[call_idx].details;
  op++;

-  CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
-                                                   status_ops,
-                                                   (size_t)(op - status_ops),
-                                                   tag(call_idx), nullptr));
+  CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call, status_ops,
+                                              (size_t)(op - status_ops),
+                                              tag(call_idx), nullptr));
  grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
  grpc_metadata_array_destroy(&calls[call_idx].initial_metadata_recv);
  grpc_metadata_array_destroy(&calls[call_idx].trailing_metadata_recv);
@ -155,9 +155,9 @@ static MemStats send_snapshot_request(int call_idx, grpc_slice call_type) {
      channel, nullptr, GRPC_PROPAGATE_DEFAULTS, cq, call_type, &hostname,
      gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
  CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
-                                                   snapshot_ops,
-                                                   (size_t)(op - snapshot_ops),
-                                                   (void*)nullptr, nullptr));
+                                              snapshot_ops,
+                                              (size_t)(op - snapshot_ops),
+                                              (void*)nullptr, nullptr));
  grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);

  gpr_log(GPR_INFO, "Call %d status %d (%s)", call_idx, calls[call_idx].status,
--- a/test/core/memory_usage/memstats.cc
+++ b/test/core/memory_usage/memstats.cc
@ -19,6 +19,7 @@
 #include <fstream>
 #include <string>

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

 #include <grpc/support/log.h>
--- a/test/core/memory_usage/server.cc
+++ b/test/core/memory_usage/server.cc
@ -33,6 +33,7 @@
 #include "absl/base/attributes.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/log/check.h"
 #include "absl/status/status.h"

 #include <grpc/byte_buffer.h>
@ -107,8 +108,7 @@ static void send_initial_metadata_unary(void* tag) {
  metadata_ops[0].data.send_initial_metadata.count = 0;

  CHECK(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call,
-                                                   metadata_ops, 1, tag,
-                                                   nullptr));
+                                              metadata_ops, 1, tag, nullptr));
 }

 static void send_status(void* tag) {
@ -119,8 +119,7 @@ static void send_status(void* tag) {
  status_op.data.send_status_from_server.status_details = &details;

  CHECK(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call,
-                                                   &status_op, 1, tag,
-                                                   nullptr));
+                                              &status_op, 1, tag, nullptr));
 }

 static void send_snapshot(void* tag, MemStats* snapshot) {
@ -153,8 +152,8 @@ static void send_snapshot(void* tag, MemStats* snapshot) {
  op++;

  CHECK(GRPC_CALL_OK ==
-             grpc_call_start_batch((*(fling_call*)tag).call, snapshot_ops,
-                                   (size_t)(op - snapshot_ops), tag, nullptr));
+        grpc_call_start_batch((*(fling_call*)tag).call, snapshot_ops,
+                              (size_t)(op - snapshot_ops), tag, nullptr));
 }
 // We have some sort of deadlock, so let's not exit gracefully for now.
 // When that is resolved, please remove the #include <unistd.h> above.
@ -257,10 +256,10 @@ int main(int argc, char** argv) {

      shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
      grpc_server_shutdown_and_notify(server, shutdown_cq, tag(1000));
-      CHECK(grpc_completion_queue_pluck(
-                     shutdown_cq, tag(1000),
-                     grpc_timeout_seconds_to_deadline(5), nullptr)
-                     .type == GRPC_OP_COMPLETE);
+      CHECK(grpc_completion_queue_pluck(shutdown_cq, tag(1000),
+                                        grpc_timeout_seconds_to_deadline(5),
+                                        nullptr)
+                .type == GRPC_OP_COMPLETE);
      grpc_completion_queue_destroy(shutdown_cq);
      grpc_completion_queue_shutdown(cq);
      shutdown_started = 1;