From 0e23c2259da967a037e839e80cafd62bc6f9f68e Mon Sep 17 00:00:00 2001
From: Tanvi Jagtap <tjagtap@google.com>
Date: Thu, 13 Jun 2024 03:09:29 -0700
Subject: [PATCH] [Gpr_To_Absl_Logging] Remove GPR_ASSERT macro. This was
 removed as a part of gpr to absl migration.

PiperOrigin-RevId: 642916172
---
 include/grpc/support/log.h      | 12 ------------
 src/cpp/ext/otel/otel_plugin.cc |  5 ++---
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h
index 57560029624..e5d81729823 100644
--- a/include/grpc/support/log.h
+++ b/include/grpc/support/log.h
@@ -88,18 +88,6 @@ GPRAPI void gpr_set_log_function(gpr_log_func func);
 GPRAPI void gpr_assertion_failed(const char* filename, int line,
                                  const char* message) GPR_ATTRIBUTE_NORETURN;
 
-/** abort() the process if x is zero, having written a line to the log.
-
-   Intended for internal invariants.  If the error can be recovered from,
-   without the possibility of corruption, or might best be reflected via
-   an exception in a higher-level language, consider returning error code.  */
-#define GPR_ASSERT(x)                               \
-  do {                                              \
-    if (GPR_UNLIKELY(!(x))) {                       \
-      gpr_assertion_failed(__FILE__, __LINE__, #x); \
-    }                                               \
-  } while (0)
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc
index 07bae2c06ca..4b2f313f466 100644
--- a/src/cpp/ext/otel/otel_plugin.cc
+++ b/src/cpp/ext/otel/otel_plugin.cc
@@ -30,7 +30,6 @@
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/ext/otel_plugin.h>
 #include <grpcpp/version_info.h>
@@ -611,14 +610,14 @@ OpenTelemetryPluginImpl::IsEnabledForServer(
 std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig>
 OpenTelemetryPluginImpl::GetChannelScopeConfig(
     const OpenTelemetryPluginBuilder::ChannelScope& scope) const {
-  GPR_ASSERT(channel_scope_filter_ == nullptr || channel_scope_filter_(scope));
+  CHECK(channel_scope_filter_ == nullptr || channel_scope_filter_(scope));
   return std::make_shared<ClientScopeConfig>(this, scope);
 }
 
 std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig>
 OpenTelemetryPluginImpl::GetServerScopeConfig(
     const grpc_core::ChannelArgs& args) const {
-  GPR_ASSERT(server_selector_ == nullptr || server_selector_(args));
+  CHECK(server_selector_ == nullptr || server_selector_(args));
   return std::make_shared<ServerScopeConfig>(this, args);
 }