[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36442)

[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT
Replacing GPR_ASSERT with absl CHECK

These changes have been made using string replacement and regex.

Will not be replacing all instances of CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only ones which are doable using very simple regex with least chance of failure will be replaced.

Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer.

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #36442

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36442 from tanvi-jagtap:tjagtap_xds_tsi_address_utils 5c10771ac1
PiperOrigin-RevId: 628081981
pull/35809/head
Tanvi Jagtap 10 months ago committed by Copybara-Service
parent e61fa603cc
commit 60f8235ae8
  1. 2
      test/core/address_utils/BUILD
  2. 3
      test/core/address_utils/sockaddr_utils_fuzzer_test.cc
  3. 6
      test/core/address_utils/sockaddr_utils_test.cc
  4. 2
      test/core/tsi/BUILD
  5. 4
      test/core/tsi/alts/fake_handshaker/BUILD
  6. 15
      test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
  7. 3
      test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
  8. 5
      test/core/tsi/alts/handshaker/BUILD
  9. 9
      test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
  10. 9
      test/core/tsi/crl_ssl_transport_security_test.cc
  11. 4
      test/core/tsi/ssl_session_cache_test.cc
  12. 11
      test/core/xds/BUILD
  13. 3
      test/core/xds/certificate_provider_store_test.cc
  14. 9
      test/core/xds/xds_http_filters_test.cc
  15. 10
      test/core/xds/xds_transport_fake.cc

@ -26,6 +26,7 @@ grpc_cc_test(
name = "sockaddr_utils_test",
srcs = ["sockaddr_utils_test.cc"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
@ -55,6 +56,7 @@ grpc_fuzzer(
name = "sockaddr_utils_fuzzer_test",
srcs = ["sockaddr_utils_fuzzer_test.cc"],
corpus = "sockaddr_uri_corpus",
external_deps = ["absl/log:check"],
tags = ["no_windows"],
uses_event_engine = False,
uses_polling = False,

@ -19,6 +19,7 @@
#include <string>
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include <grpc/support/log.h>
@ -42,6 +43,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
absl::StatusOr<grpc_core::URI> parsed_uri =
grpc_core::URI::Parse(uri.value());
GPR_ASSERT(parsed_uri.ok());
CHECK_OK(parsed_uri);
return 0;
}

@ -42,6 +42,8 @@
#include <string>
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include "src/core/lib/address_utils/parse_address.h"
@ -57,7 +59,7 @@ grpc_resolved_address MakeAddr4(const uint8_t* data, size_t data_len) {
reinterpret_cast<grpc_sockaddr_in*>(resolved_addr4.addr);
memset(&resolved_addr4, 0, sizeof(resolved_addr4));
addr4->sin_family = GRPC_AF_INET;
GPR_ASSERT(data_len == sizeof(addr4->sin_addr.s_addr));
CHECK(data_len == sizeof(addr4->sin_addr.s_addr));
memcpy(&addr4->sin_addr.s_addr, data, data_len);
addr4->sin_port = grpc_htons(12345);
resolved_addr4.len = static_cast<socklen_t>(sizeof(grpc_sockaddr_in));
@ -70,7 +72,7 @@ grpc_resolved_address MakeAddr6(const uint8_t* data, size_t data_len) {
reinterpret_cast<grpc_sockaddr_in6*>(resolved_addr6.addr);
memset(&resolved_addr6, 0, sizeof(resolved_addr6));
addr6->sin6_family = GRPC_AF_INET6;
GPR_ASSERT(data_len == sizeof(addr6->sin6_addr.s6_addr));
CHECK(data_len == sizeof(addr6->sin6_addr.s6_addr));
memcpy(&addr6->sin6_addr.s6_addr, data, data_len);
addr6->sin6_port = grpc_htons(12345);
resolved_addr6.len = static_cast<socklen_t>(sizeof(grpc_sockaddr_in6));

@ -52,6 +52,7 @@ grpc_cc_test(
name = "ssl_session_cache_test",
srcs = ["ssl_session_cache_test.cc"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
@ -148,6 +149,7 @@ grpc_cc_test(
"//test/core/tsi/test_creds/crl_data/crls_missing_root:b9322cac.r0",
],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",

@ -41,6 +41,9 @@ grpc_cc_library(
testonly = True,
srcs = ["fake_handshaker_server.cc"],
hdrs = ["fake_handshaker_server.h"],
external_deps = [
"absl/log:check",
],
language = "C++",
deps = [
"handshaker_proto",
@ -55,6 +58,7 @@ grpc_cc_binary(
srcs = ["fake_handshaker_server_main.cc"],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
language = "C++",
deps = [

@ -21,6 +21,7 @@
#include <sstream>
#include <string>
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include <grpc/grpc.h>
@ -96,7 +97,8 @@ class FakeHandshakerService : public HandshakerService::Service {
Status ProcessRequest(HandshakerContext* context,
const HandshakerReq& request,
HandshakerResp* response) {
GPR_ASSERT(context != nullptr && response != nullptr);
CHECK(context != nullptr);
CHECK_NE(response, nullptr);
response->Clear();
if (request.has_client_start()) {
gpr_log(GPR_DEBUG, "Process client start request.");
@ -114,7 +116,8 @@ class FakeHandshakerService : public HandshakerService::Service {
Status ProcessClientStart(HandshakerContext* context,
const StartClientHandshakeReq& request,
HandshakerResp* response) {
GPR_ASSERT(context != nullptr && response != nullptr);
CHECK(context != nullptr);
CHECK_NE(response, nullptr);
// Checks request.
if (context->state != INITIAL) {
return Status(StatusCode::FAILED_PRECONDITION, kWrongStateError);
@ -140,7 +143,8 @@ class FakeHandshakerService : public HandshakerService::Service {
Status ProcessServerStart(HandshakerContext* context,
const StartServerHandshakeReq& request,
HandshakerResp* response) {
GPR_ASSERT(context != nullptr && response != nullptr);
CHECK(context != nullptr);
CHECK_NE(response, nullptr);
// Checks request.
if (context->state != INITIAL) {
return Status(StatusCode::FAILED_PRECONDITION, kWrongStateError);
@ -176,7 +180,8 @@ class FakeHandshakerService : public HandshakerService::Service {
Status ProcessNext(HandshakerContext* context,
const NextHandshakeMessageReq& request,
HandshakerResp* response) {
GPR_ASSERT(context != nullptr && response != nullptr);
CHECK(context != nullptr);
CHECK_NE(response, nullptr);
if (context->is_client) {
// Processes next request on client side.
if (context->state != SENT) {
@ -222,7 +227,7 @@ class FakeHandshakerService : public HandshakerService::Service {
Status WriteErrorResponse(
ServerReaderWriter<HandshakerResp, HandshakerReq>* stream,
const Status& status) {
GPR_ASSERT(!status.ok());
CHECK(!status.ok());
HandshakerResp response;
response.mutable_status()->set_code(status.error_code());
response.mutable_status()->set_details(status.error_message());

@ -18,6 +18,7 @@
#include <sstream>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include <grpcpp/impl/service_type.h>
@ -49,7 +50,7 @@ int main(int argc, char** argv) {
grpc::testing::TestEnvironment env(&argc, argv);
grpc::testing::InitTest(&argc, &argv, true);
GPR_ASSERT(absl::GetFlag(FLAGS_handshaker_port) != 0);
CHECK_NE(absl::GetFlag(FLAGS_handshaker_port), 0);
std::ostringstream server_address;
server_address << "[::1]:" << absl::GetFlag(FLAGS_handshaker_port);

@ -81,7 +81,10 @@ grpc_cc_test(
srcs = [
"alts_concurrent_connectivity_test.cc",
],
external_deps = ["gtest"],
external_deps = [
"absl/log:check",
"gtest",
],
flaky = True,
language = "C++",
# TODO(apolcyn): make the fake TCP server used in this

@ -31,6 +31,7 @@
#include <gmock/gmock.h>
#include "absl/log/check.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h"
@ -143,8 +144,8 @@ class TestServer {
grpc_server_register_completion_queue(server_, server_cq_, nullptr);
int port = grpc_pick_unused_port_or_die();
server_addr_ = grpc_core::JoinHostPort("localhost", port);
GPR_ASSERT(grpc_server_add_http2_port(server_, server_addr_.c_str(),
server_creds));
CHECK(grpc_server_add_http2_port(server_, server_addr_.c_str(),
server_creds));
grpc_server_credentials_release(server_creds);
grpc_server_start(server_);
gpr_log(GPR_DEBUG, "Start TestServer %p. listen on %s", this,
@ -167,8 +168,8 @@ class TestServer {
static void PollUntilShutdown(const TestServer* self) {
grpc_event ev = grpc_completion_queue_next(
self->server_cq_, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
GPR_ASSERT(ev.type == GRPC_OP_COMPLETE);
GPR_ASSERT(ev.tag == self);
CHECK(ev.type == GRPC_OP_COMPLETE);
CHECK(ev.tag == self);
gpr_log(GPR_DEBUG, "TestServer %p stop polling", self);
}

@ -22,6 +22,7 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "absl/log/check.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
@ -114,7 +115,7 @@ class CrlSslTransportSecurityTest
gpr_malloc(sizeof(tsi_ssl_pem_key_cert_pair)));
client_pem_key_cert_pairs_[0].private_key = client_key_.c_str();
client_pem_key_cert_pairs_[0].cert_chain = client_cert_.c_str();
GPR_ASSERT(root_store_ != nullptr);
CHECK_NE(root_store_, nullptr);
}
void Run() {
@ -133,7 +134,7 @@ class CrlSslTransportSecurityTest
private:
static void SetupHandshakers(tsi_test_fixture* fixture) {
GPR_ASSERT(fixture != nullptr);
CHECK_NE(fixture, nullptr);
auto* self = reinterpret_cast<SslTsiTestFixture*>(fixture);
self->SetupHandshakers();
}
@ -178,7 +179,7 @@ class CrlSslTransportSecurityTest
}
static void CheckHandshakerPeers(tsi_test_fixture* fixture) {
GPR_ASSERT(fixture != nullptr);
CHECK_NE(fixture, nullptr);
auto* self = reinterpret_cast<SslTsiTestFixture*>(fixture);
self->CheckHandshakerPeers();
}
@ -420,7 +421,7 @@ TEST_P(CrlSslTransportSecurityTest,
std::string TestNameSuffix(
const ::testing::TestParamInfo<tsi_tls_version>& version) {
if (version.param == tsi_tls_version::TSI_TLS1_2) return "TLS_1_2";
GPR_ASSERT(version.param == tsi_tls_version::TSI_TLS1_3);
CHECK(version.param == tsi_tls_version::TSI_TLS1_3);
return "TLS_1_3";
}

@ -23,6 +23,8 @@
#include <gtest/gtest.h>
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
@ -49,7 +51,7 @@ class SessionTracker {
tsi::SslSessionPtr NewSession(long id) {
static int ex_data_id = SSL_SESSION_get_ex_new_index(
0, nullptr, nullptr, nullptr, DestroyExData);
GPR_ASSERT(ex_data_id != -1);
CHECK_NE(ex_data_id, -1);
// OpenSSL and different version of BoringSSL don't agree on API
// so try both.
tsi::SslSessionPtr session = NewSessionInternal(SSL_SESSION_new);

@ -44,7 +44,10 @@ grpc_cc_test(
grpc_cc_test(
name = "certificate_provider_store_test",
srcs = ["certificate_provider_store_test.cc"],
external_deps = ["gtest"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
uses_event_engine = False,
uses_polling = False,
@ -151,6 +154,7 @@ grpc_cc_library(
srcs = ["xds_transport_fake.cc"],
hdrs = ["xds_transport_fake.h"],
external_deps = [
"absl/log:check",
"absl/strings",
"absl/types:optional",
],
@ -244,7 +248,10 @@ grpc_cc_test(
grpc_cc_test(
name = "xds_http_filters_test",
srcs = ["xds_http_filters_test.cc"],
external_deps = ["gtest"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
uses_event_engine = False,
uses_polling = False,

@ -23,6 +23,7 @@
#include <thread>
#include <vector>
#include "absl/log/check.h"
#include "gtest/gtest.h"
#include <grpc/grpc.h>
@ -47,7 +48,7 @@ class FakeCertificateProvider : public grpc_tls_certificate_provider {
public:
RefCountedPtr<grpc_tls_certificate_distributor> distributor() const override {
// never called
GPR_ASSERT(0);
CHECK(0);
return nullptr;
}

@ -24,6 +24,7 @@
#include <google/protobuf/duration.pb.h>
#include <google/protobuf/wrappers.pb.h>
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/strings/strip.h"
@ -191,7 +192,7 @@ class XdsRouterFilterTest : public XdsHttpFilterTest {
XdsRouterFilterTest() {
XdsExtension extension = MakeXdsExtension(Router());
filter_ = GetFilter(extension.type);
GPR_ASSERT(filter_ != nullptr);
CHECK_NE(filter_, nullptr);
}
const XdsHttpFilterImpl* filter_;
@ -275,7 +276,7 @@ class XdsFaultInjectionFilterTest : public XdsHttpFilterTest {
XdsFaultInjectionFilterTest() {
XdsExtension extension = MakeXdsExtension(HTTPFault());
filter_ = GetFilter(extension.type);
GPR_ASSERT(filter_ != nullptr);
CHECK_NE(filter_, nullptr);
}
const XdsHttpFilterImpl* filter_;
@ -480,7 +481,7 @@ class XdsRbacFilterTest : public XdsHttpFilterTest {
XdsRbacFilterTest() {
XdsExtension extension = MakeXdsExtension(RBAC());
filter_ = GetFilter(extension.type);
GPR_ASSERT(filter_ != nullptr);
CHECK_NE(filter_, nullptr);
}
const XdsHttpFilterImpl* filter_;
@ -1107,7 +1108,7 @@ class XdsStatefulSessionFilterTest : public XdsHttpFilterTest {
registry_ = XdsHttpFilterRegistry();
XdsExtension extension = MakeXdsExtension(StatefulSession());
filter_ = GetFilter(extension.type);
GPR_ASSERT(filter_ != nullptr);
CHECK_NE(filter_, nullptr);
}
const XdsHttpFilterImpl* filter_;

@ -23,6 +23,8 @@
#include <type_traits>
#include <utility>
#include "absl/log/check.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
@ -52,7 +54,7 @@ FakeXdsTransportFactory::FakeStreamingCall::~FakeStreamingCall() {
transport_->server()->server_uri().c_str(), this,
message.c_str());
}
GPR_ASSERT(from_client_messages_.empty());
CHECK(from_client_messages_.empty());
}
}
// Can't call event_handler_->OnStatusReceived() or unref event_handler_
@ -79,7 +81,7 @@ void FakeXdsTransportFactory::FakeStreamingCall::Orphan() {
void FakeXdsTransportFactory::FakeStreamingCall::SendMessage(
std::string payload) {
MutexLock lock(&mu_);
GPR_ASSERT(!orphaned_);
CHECK(!orphaned_);
from_client_messages_.push_back(std::move(payload));
cv_client_msg_.Signal();
if (transport_->auto_complete_messages_from_client()) {
@ -122,7 +124,7 @@ void FakeXdsTransportFactory::FakeStreamingCall::
void FakeXdsTransportFactory::FakeStreamingCall::CompleteSendMessageFromClient(
bool ok) {
GPR_ASSERT(!transport_->auto_complete_messages_from_client());
CHECK(!transport_->auto_complete_messages_from_client());
MutexLock lock(&mu_);
CompleteSendMessageFromClientLocked(ok);
}
@ -280,7 +282,7 @@ FakeXdsTransportFactory::Create(
absl::Status* /*status*/) {
MutexLock lock(&mu_);
auto& entry = transport_map_[server.Key()];
GPR_ASSERT(entry == nullptr);
CHECK(entry == nullptr);
auto transport = MakeOrphanable<FakeXdsTransport>(
RefAsSubclass<FakeXdsTransportFactory>(), server,
std::move(on_connectivity_failure), auto_complete_messages_from_client_,

Loading…
Cancel
Save