grpc 1.75.0.pre1 → 1.76.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 516f4496ce835ff6db4e07a5b043918fe52df2b3b0ee2ccefa22de8529fd75b0
-  data.tar.gz: cee5c9ddfef313f77ee3ce64e0d31ad22bf60412554419f7a3d1239f5b51e865
+  metadata.gz: d455b23434382eb727e7c8181e40de0f84503c73d79af628863f6ebfabd6c983
+  data.tar.gz: 856a8a574cfc3c57beb4219463ea6b634a3cd149406ca17bd8ca03957142521a
 SHA512:
-  metadata.gz: 1c46fae8d75f768243d890b80cbeaa705fb5e8a3799130bfd24bdcc31cbaa09a8b1bea3025d38f8487954fb7293ec6fe7a9e56b5deba46dbd5a7de027ba62a35
-  data.tar.gz: 47071a131ce1abfd08594dcfcd4f9dfc081d03f71a9fe314cb52d75a1ba053adf24754ee21481e57e4e28b62f5e4d3776ac1453ba51ad2dc7759c86ac115db89
+  metadata.gz: 7ed2df9988f821b7b755d7e1d8192902402e5703c3ebe65740d44fbe689a25ba0de97588a21cdd7d795c0b26bc09ddac3edf469f73a4da906984fc4b72a4ddb7
+  data.tar.gz: a43f9d3b3fead6491649a8e7bbfb8045c1f00eb72f4beb67a72bfaa052371f2f1d1c2350dd9266cc5e81c2ba82e0940697118c31f71c8de73e43e952c8914727

data/Makefile

@@ -367,8 +367,8 @@ E = @echo
 Q = @
 endif
 
-CORE_VERSION = 50.0.0
-CPP_VERSION = 1.75.0-pre1
+CORE_VERSION = 51.0.0
+CPP_VERSION = 1.76.0-pre1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -404,7 +404,7 @@ SHARED_EXT_CORE = dll
 SHARED_EXT_CPP = dll
 
 SHARED_PREFIX =
-SHARED_VERSION_CORE = -50
+SHARED_VERSION_CORE = -51
 SHARED_VERSION_CPP = -1
 else ifeq ($(SYSTEM),Darwin)
 EXECUTABLE_SUFFIX =
@@ -685,6 +685,7 @@ LIBGRPC_SRC = \
     src/core/channelz/channelz.cc \
     src/core/channelz/channelz_registry.cc \
     src/core/channelz/property_list.cc \
+    src/core/channelz/text_encode.cc \
     src/core/channelz/v2tov1/convert.cc \
     src/core/channelz/v2tov1/legacy_api.cc \
     src/core/channelz/v2tov1/property_list.cc \
@@ -962,6 +963,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/channelz.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/promise.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/channelz/v2/property_list.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/channelz/v2/service.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c \
     src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c \
@@ -1125,8 +1127,10 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
     src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/channelz.upbdefs.c \
+    src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/channelz.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/promise.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/property_list.upbdefs.c \
+    src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/service.upbdefs.c \
     src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
     src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c \
     src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c \
@@ -1325,6 +1329,7 @@ LIBGRPC_SRC = \
     src/core/lib/resource_quota/periodic_update.cc \
     src/core/lib/resource_quota/resource_quota.cc \
     src/core/lib/resource_quota/thread_quota.cc \
+    src/core/lib/resource_tracker/resource_tracker.cc \
     src/core/lib/security/authorization/audit_logging.cc \
     src/core/lib/security/authorization/authorization_policy_provider_vtable.cc \
     src/core/lib/security/authorization/evaluate_args.cc \
@@ -1431,6 +1436,7 @@ LIBGRPC_SRC = \
     src/core/telemetry/context_list_entry.cc \
     src/core/telemetry/default_tcp_tracer.cc \
     src/core/telemetry/histogram_view.cc \
+    src/core/telemetry/instrument.cc \
     src/core/telemetry/metrics.cc \
     src/core/telemetry/stats.cc \
     src/core/telemetry/stats_data.cc \
@@ -1479,6 +1485,7 @@ LIBGRPC_SRC = \
     src/core/util/gethostname_sysconf.cc \
     src/core/util/glob.cc \
     src/core/util/gpr_time.cc \
+    src/core/util/grpc_check.cc \
     src/core/util/grpc_if_nametoindex_posix.cc \
     src/core/util/grpc_if_nametoindex_unsupported.cc \
     src/core/util/host_port.cc \
@@ -1509,6 +1516,7 @@ LIBGRPC_SRC = \
     src/core/util/posix/thd.cc \
     src/core/util/posix/time.cc \
     src/core/util/posix/tmpfile.cc \
+    src/core/util/postmortem_emit.cc \
     src/core/util/random_early_detection.cc \
     src/core/util/ref_counted_string.cc \
     src/core/util/shared_bit_gen.cc \
@@ -1559,6 +1567,11 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/xds_lb_policy_registry.cc \
     src/core/xds/grpc/xds_listener.cc \
     src/core/xds/grpc/xds_listener_parser.cc \
+    src/core/xds/grpc/xds_matcher.cc \
+    src/core/xds/grpc/xds_matcher_action.cc \
+    src/core/xds/grpc/xds_matcher_context.cc \
+    src/core/xds/grpc/xds_matcher_input.cc \
+    src/core/xds/grpc/xds_matcher_parse.cc \
     src/core/xds/grpc/xds_metadata.cc \
     src/core/xds/grpc/xds_metadata_parser.cc \
     src/core/xds/grpc/xds_route_config.cc \
@@ -1872,8 +1885,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.50 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.50
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.51 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.51
 	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
 endif
 endif

data/include/grpc/credentials.h

@@ -214,19 +214,27 @@ GRPCAPI void grpc_call_credentials_release(grpc_call_credentials* creds);
    identity of the default service account of the machine. Supplying any other
    sort of call credential will result in undefined behavior, up to and
    including the sudden and unexpected failure of RPCs.
+   It is in the caller's responsibility to ensure that both specified
+   credentials assert the correct identities.
 
    If nullptr is supplied, the returned channel credentials object will use a
    default call credentials object based on the Application Default Credentials
    mechanism.
 
    The caller may choose to create the default credential with a secondary alts
-   credentials object to attach to the channel for ALTS connections. If an alts
-   credentials object is specified, it will be used if the underlying channel
-   type is ALTS.
+   credentials object to attach to the channel for ALTS connections. If
+   credentials options are specified, it will be used to configure an underlying
+   channel which type is ALTS. If the field create_hard_bound_credentials is
+   true, the call_creds_for_alts field will be ignored.
 */
+typedef struct {
+  bool create_hard_bound_credentials;
+  grpc_call_credentials* call_creds_for_alts;
+} grpc_google_default_credentials_options;
+
 GRPCAPI 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);
 
 /** Server certificate config object holds the server's public certificates and
    associated private keys, as well as any CA certificates needed for client
@@ -485,11 +493,19 @@ GRPCAPI grpc_call_credentials* grpc_composite_call_credentials_create(
     grpc_call_credentials* creds1, grpc_call_credentials* creds2,
     void* reserved);
 
+/** Context that can be used by the google compute engine create credentials api
+   in order to configure the desired credentials. */
+typedef struct {
+  /// Indicates if the created credentials should be ALTS with hard bound
+  /// tokens.
+  bool alts_hard_bound;
+} grpc_google_compute_engine_credentials_options;
+
 /** Creates a compute engine credentials object for connecting to Google.
    WARNING: Do NOT use this credentials to connect to a non-google service as
    this could result in an oauth2 token leak. */
 GRPCAPI grpc_call_credentials* grpc_google_compute_engine_credentials_create(
-    void* reserved);
+    grpc_google_compute_engine_credentials_options* options);
 
 /** Creates a composite channel credentials object. The security level of
  * resulting connection is determined by channel_creds. */

data/src/core/call/call_filters.cc

@@ -16,10 +16,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "src/core/call/metadata.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/grpc_check.h"
 
 namespace grpc_core {
 // Call data for those calls that don't have any call data
@@ -30,7 +30,7 @@ char CallFilters::g_empty_call_data_;
 // CallFilters
 
 void CallFilters::Start() {
-  CHECK_EQ(call_data_, nullptr);
+  GRPC_CHECK_EQ(call_data_, nullptr);
   size_t call_data_alignment = 1;
   for (const auto& stack : stacks_) {
     call_data_alignment =
@@ -83,11 +83,11 @@ void CallFilters::CancelDueToFailedPipeOperation(SourceLocation but_where) {
 }
 
 void CallFilters::PushServerTrailingMetadata(ServerMetadataHandle md) {
-  CHECK(md != nullptr);
+  GRPC_CHECK(md != nullptr);
   GRPC_TRACE_LOG(call, INFO)
       << GetContext<Activity>()->DebugTag() << " PushServerTrailingMetadata["
       << this << "]: " << md->DebugString() << " into " << DebugString();
-  CHECK(md != nullptr);
+  GRPC_CHECK(md != nullptr);
   if (call_state_.PushServerTrailingMetadata(
           md->get(GrpcCallWasCancelled()).value_or(false))) {
     push_server_trailing_metadata_ = std::move(md);

data/src/core/call/call_filters.h

@@ -23,7 +23,6 @@
 #include <ostream>
 #include <type_traits>
 
-#include "absl/log/check.h"
 #include "src/core/call/call_state.h"
 #include "src/core/call/message.h"
 #include "src/core/call/metadata.h"
@@ -37,6 +36,7 @@
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/transport/call_final_info.h"
 #include "src/core/util/dump_args.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
@@ -146,9 +146,9 @@ class NextMessage {
   NextMessage() = default;
   explicit NextMessage(Failure) : message_(error()), call_state_(nullptr) {}
   NextMessage(MessageHandle message, CallState* call_state) {
-    DCHECK_NE(call_state, nullptr);
-    DCHECK_NE(message.get(), nullptr);
-    DCHECK(message.get_deleter().has_freelist());
+    GRPC_DCHECK_NE(call_state, nullptr);
+    GRPC_DCHECK_NE(message.get(), nullptr);
+    GRPC_DCHECK(message.get_deleter().has_freelist());
     message_ = message.release();
     call_state_ = call_state;
   }
@@ -171,37 +171,37 @@ class NextMessage {
   }
 
   bool ok() const {
-    DCHECK_NE(message_, taken());
+    GRPC_DCHECK_NE(message_, taken());
     return message_ != error();
   }
   bool has_value() const {
-    DCHECK_NE(message_, taken());
-    DCHECK(ok());
+    GRPC_DCHECK_NE(message_, taken());
+    GRPC_DCHECK(ok());
     return message_ != end_of_stream();
   }
   StatusFlag status() const { return StatusFlag(ok()); }
   Message& value() {
-    DCHECK_NE(message_, taken());
-    DCHECK(ok());
-    DCHECK(has_value());
+    GRPC_DCHECK_NE(message_, taken());
+    GRPC_DCHECK(ok());
+    GRPC_DCHECK(has_value());
     return *message_;
   }
   const Message& value() const {
-    DCHECK_NE(message_, taken());
-    DCHECK(ok());
-    DCHECK(has_value());
+    GRPC_DCHECK_NE(message_, taken());
+    GRPC_DCHECK(ok());
+    GRPC_DCHECK(has_value());
     return *message_;
   }
   MessageHandle TakeValue() {
-    DCHECK_NE(message_, taken());
-    DCHECK(ok());
-    DCHECK(has_value());
+    GRPC_DCHECK_NE(message_, taken());
+    GRPC_DCHECK(ok());
+    GRPC_DCHECK(has_value());
     return MessageHandle(std::exchange(message_, taken()),
                          Arena::PooledDeleter());
   }
   bool progressed() const { return call_state_ == nullptr; }
   void Progress() {
-    DCHECK(!progressed());
+    GRPC_DCHECK(!progressed());
     (call_state_->*on_progress)();
     call_state_ = nullptr;
   }
@@ -283,7 +283,7 @@ template <typename T>
 struct ResultOr {
   ResultOr(T ok, ServerMetadataHandle error)
       : ok(std::move(ok)), error(std::move(error)) {
-    CHECK((this->ok == nullptr) ^ (this->error == nullptr));
+    GRPC_CHECK((this->ok == nullptr) ^ (this->error == nullptr));
   }
   T ok;
   ServerMetadataHandle error;
@@ -1221,13 +1221,13 @@ struct StackData {
 
   template <typename FilterType>
   void AddFinalizer(FilterType*, size_t, const NoInterceptor* p) {
-    DCHECK(p == &FilterType::Call::OnFinalize);
+    GRPC_DCHECK(p == &FilterType::Call::OnFinalize);
   }
 
   template <typename FilterType>
   void AddFinalizer(FilterType* channel_data, size_t call_offset,
                     void (FilterType::Call::*p)(const grpc_call_final_info*)) {
-    DCHECK(p == &FilterType::Call::OnFinalize);
+    GRPC_DCHECK(p == &FilterType::Call::OnFinalize);
     finalizers.push_back(Finalizer{
         channel_data,
         call_offset,
@@ -1242,7 +1242,7 @@ struct StackData {
   void AddFinalizer(FilterType* channel_data, size_t call_offset,
                     void (FilterType::Call::*p)(const grpc_call_final_info*,
                                                 FilterType*)) {
-    DCHECK(p == &FilterType::Call::OnFinalize);
+    GRPC_DCHECK(p == &FilterType::Call::OnFinalize);
     finalizers.push_back(Finalizer{
         channel_data,
         call_offset,
@@ -1272,11 +1272,11 @@ class OperationExecutor {
   OperationExecutor(OperationExecutor&& other) noexcept
       : ops_(other.ops_), end_ops_(other.end_ops_) {
     // Movable iff we're not running.
-    DCHECK_EQ(other.promise_data_, nullptr);
+    GRPC_DCHECK_EQ(other.promise_data_, nullptr);
   }
   OperationExecutor& operator=(OperationExecutor&& other) noexcept {
-    DCHECK_EQ(other.promise_data_, nullptr);
-    DCHECK_EQ(promise_data_, nullptr);
+    GRPC_DCHECK_EQ(other.promise_data_, nullptr);
+    GRPC_DCHECK_EQ(promise_data_, nullptr);
     ops_ = other.ops_;
     end_ops_ = other.end_ops_;
     return *this;
@@ -1329,7 +1329,7 @@ OperationExecutor<T>::Start(const Layout<T>* layout, T input, void* call_data) {
   if (layout->promise_size == 0) {
     // No call state ==> instantaneously ready
     auto r = InitStep(std::move(input), call_data);
-    CHECK(r.ready());
+    GRPC_CHECK(r.ready());
     return r;
   }
   promise_data_ =
@@ -1340,7 +1340,7 @@ OperationExecutor<T>::Start(const Layout<T>* layout, T input, void* call_data) {
 template <typename T>
 GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<ResultOr<T>>
 OperationExecutor<T>::InitStep(T input, void* call_data) {
-  CHECK(input != nullptr);
+  GRPC_CHECK(input != nullptr);
   while (true) {
     if (ops_ == end_ops_) {
       return ResultOr<T>{std::move(input), nullptr};
@@ -1364,7 +1364,7 @@ OperationExecutor<T>::InitStep(T input, void* call_data) {
 template <typename T>
 GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<ResultOr<T>>
 OperationExecutor<T>::Step(void* call_data) {
-  DCHECK_NE(promise_data_, nullptr);
+  GRPC_DCHECK_NE(promise_data_, nullptr);
   auto p = ContinueStep(call_data);
   if (p.ready()) {
     gpr_free_aligned(promise_data_);
@@ -1489,7 +1489,7 @@ struct FailureStatusCastImpl<filters_detail::NextMessage<on_progress>,
   GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static filters_detail::NextMessage<
       on_progress>
   Cast(StatusFlag flag) {
-    DCHECK_EQ(flag, Failure{});
+    GRPC_DCHECK_EQ(flag, Failure{});
     return filters_detail::NextMessage<on_progress>(Failure{});
   }
 };
@@ -1509,12 +1509,12 @@ struct TrySeqTraitsWithSfinae<filters_detail::NextMessage<on_progress>> {
     return value.ok();
   }
   static const char* ErrorString(const WrappedType& status) {
-    DCHECK(!status.ok());
+    GRPC_DCHECK(!status.ok());
     return "failed";
   }
   template <typename R>
   static R ReturnValue(WrappedType&& status) {
-    DCHECK(!status.ok());
+    GRPC_DCHECK(!status.ok());
     return WrappedType(Failure{});
   }
   template <typename F, typename Elem>
@@ -1658,13 +1658,13 @@ class CallFilters {
         : stack_current_(stack_begin),
           stack_end_(stack_end),
           filters_(filters) {
-      DCHECK_NE((filters_->*input_location).get(), nullptr);
+      GRPC_DCHECK_NE((filters_->*input_location).get(), nullptr);
     }
 
     Poll<ValueOrFailure<Output>> operator()() {
       if ((filters_->*input_location) != nullptr) {
         if (stack_current_ == stack_end_) {
-          DCHECK_NE((filters_->*input_location).get(), nullptr);
+          GRPC_DCHECK_NE((filters_->*input_location).get(), nullptr);
           (filters_->call_state_.*on_done)();
           return Output(std::move(filters_->*input_location));
         }
@@ -1718,13 +1718,13 @@ class CallFilters {
         : stack_current_(stack_begin),
           stack_end_(stack_end),
           filters_(filters) {
-      DCHECK_NE((filters_->*input_location).get(), nullptr);
+      GRPC_DCHECK_NE((filters_->*input_location).get(), nullptr);
     }
 
     Poll<NextMsg> operator()() {
       if ((filters_->*input_location) != nullptr) {
         if (stack_current_ == stack_end_) {
-          DCHECK_NE((filters_->*input_location).get(), nullptr);
+          GRPC_DCHECK_NE((filters_->*input_location).get(), nullptr);
           return NextMsg(std::move(filters_->*input_location),
                          &filters_->call_state_);
         }
@@ -1815,8 +1815,8 @@ class CallFilters {
   // Returns a promise that resolves to a StatusFlag indicating success
   GRPC_MUST_USE_RESULT auto PushClientToServerMessage(MessageHandle message) {
     call_state_.BeginPushClientToServerMessage();
-    DCHECK_NE(message.get(), nullptr);
-    DCHECK_EQ(push_client_to_server_message_.get(), nullptr);
+    GRPC_DCHECK_NE(message.get(), nullptr);
+    GRPC_DCHECK_EQ(push_client_to_server_message_.get(), nullptr);
     push_client_to_server_message_ = std::move(message);
     return [this]() { return call_state_.PollPushClientToServerMessage(); };
   }

data/src/core/call/call_spine.h

@@ -17,7 +17,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/check.h"
 #include "src/core/call/call_arena_allocator.h"
 #include "src/core/call/call_filters.h"
 #include "src/core/call/message.h"
@@ -32,6 +31,7 @@
 #include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/util/dual_ref_counted.h"
+#include "src/core/util/grpc_check.h"
 
 namespace grpc_core {
 
@@ -132,7 +132,7 @@ class CallSpine final : public Party {
   // The resulting (returned) promise will resolve to Empty.
   template <typename Promise>
   auto CancelIfFails(Promise promise) {
-    DCHECK(GetContext<Activity>() == this);
+    GRPC_DCHECK(GetContext<Activity>() == this);
     using P = promise_detail::PromiseLike<Promise>;
     using ResultType = typename P::Result;
     return Map(std::move(promise),
@@ -324,7 +324,7 @@ class CallInitiator {
   CallInitiator() = default;
   explicit CallInitiator(RefCountedPtr<CallSpine> spine)
       : spine_(std::move(spine)) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
   }
 
   // Wrap a promise so that if it returns failure it automatically cancels
@@ -332,118 +332,118 @@ class CallInitiator {
   // The resulting (returned) promise will resolve to Empty.
   template <typename Promise>
   auto CancelIfFails(Promise promise) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->CancelIfFails(std::move(promise));
   }
 
   auto PullServerInitialMetadata() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->PullServerInitialMetadata();
   }
 
   auto PushMessage(MessageHandle message) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->PushClientToServerMessage(std::move(message));
   }
 
   void SpawnPushMessage(MessageHandle message) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnPushClientToServerMessage(std::move(message));
   }
 
   void FinishSends() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->FinishSends();
   }
 
   void SpawnFinishSends() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnFinishSends();
   }
 
   auto PullMessage() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->PullServerToClientMessage();
   }
 
   auto PullServerTrailingMetadata() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->PullServerTrailingMetadata();
   }
 
   void Cancel(absl::Status error) {
-    DCHECK_NE(spine_.get(), nullptr);
-    CHECK(!error.ok());
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
+    GRPC_CHECK(!error.ok());
     auto status = ServerMetadataFromStatus(error);
     status->Set(GrpcCallWasCancelled(), true);
     spine_->PushServerTrailingMetadata(std::move(status));
   }
 
   void SpawnCancel(absl::Status error) {
-    DCHECK_NE(spine_.get(), nullptr);
-    CHECK(!error.ok());
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
+    GRPC_CHECK(!error.ok());
     auto status = ServerMetadataFromStatus(error);
     status->Set(GrpcCallWasCancelled(), true);
     spine_->SpawnPushServerTrailingMetadata(std::move(status));
   }
 
   void Cancel() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->Cancel();
   }
 
   void SpawnCancel() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnCancel();
   }
 
   GRPC_MUST_USE_RESULT bool OnDone(absl::AnyInvocable<void(bool)> fn) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->OnDone(std::move(fn));
   }
 
   template <typename Promise>
   auto UntilCallCompletes(Promise promise) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->UntilCallCompletes(std::move(promise));
   }
 
   template <typename PromiseFactory>
   void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnGuarded(name, std::move(promise_factory));
   }
 
   template <typename PromiseFactory>
   void SpawnGuardedUntilCallCompletes(absl::string_view name,
                                       PromiseFactory promise_factory) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnGuardedUntilCallCompletes(name, std::move(promise_factory));
   }
 
   template <typename PromiseFactory>
   void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnInfallible(name, std::move(promise_factory));
   }
 
   template <typename PromiseFactory>
   auto SpawnWaitable(absl::string_view name, PromiseFactory promise_factory) {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->SpawnWaitable(name, std::move(promise_factory));
   }
 
   bool WasCancelledPushed() const {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->call_filters().WasCancelledPushed();
   }
 
   Arena* arena() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_->arena();
   }
   Party* party() {
-    DCHECK_NE(spine_.get(), nullptr);
+    GRPC_DCHECK_NE(spine_.get(), nullptr);
     return spine_.get();
   }
 
@@ -535,7 +535,7 @@ class CallHandler {
   }
 
   void AddChildCall(const CallInitiator& initiator) {
-    CHECK(initiator.spine_ != nullptr);
+    GRPC_CHECK(initiator.spine_ != nullptr);
     spine_->AddChildCall(initiator.spine_);
   }
 

data/src/core/call/client_call.cc

@@ -39,7 +39,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "src/core/call/metadata.h"
@@ -54,6 +53,7 @@
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/bitset.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/latent_see.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
@@ -376,7 +376,7 @@ void ClientCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
             [this, out_status, out_status_details, out_error_string,
              out_trailing_metadata]() {
               auto* status = cancel_status_.Get();
-              CHECK_NE(status, nullptr);
+              GRPC_CHECK_NE(status, nullptr);
               *out_status = static_cast<grpc_status_code>(status->code());
               *out_status_details =
                   Slice::FromCopiedString(status->message()).TakeCSlice();
@@ -445,9 +445,10 @@ grpc_call* MakeClientCall(grpc_call* parent_call, uint32_t propagation_mask,
                           grpc_compression_options compression_options,
                           RefCountedPtr<Arena> arena,
                           RefCountedPtr<UnstartedCallDestination> destination) {
-  DCHECK_NE(arena.get(), nullptr);
-  DCHECK_NE(arena->GetContext<grpc_event_engine::experimental::EventEngine>(),
-            nullptr);
+  GRPC_DCHECK_NE(arena.get(), nullptr);
+  GRPC_DCHECK_NE(
+      arena->GetContext<grpc_event_engine::experimental::EventEngine>(),
+      nullptr);
   return arena
       ->New<ClientCall>(parent_call, propagation_mask, cq, std::move(path),
                         std::move(authority), registered_method, deadline,