grpc 1.72.0 → 1.78.1

data/src/core/lib/channel/promise_based_filter.h

@@ -33,15 +33,10 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/container/inlined_vector.h"
-#include "absl/functional/function_ref.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/meta/type_traits.h"
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/call_filters.h"
 #include "src/core/call/call_finalization.h"
+#include "src/core/call/message.h"
+#include "src/core/call/metadata.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/filter/blackboard.h"
 #include "src/core/filter/filter_args.h"
@@ -59,6 +54,7 @@
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/context.h"
+#include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
@@ -70,8 +66,15 @@
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/match.h"
 #include "src/core/util/time.h"
+#include "absl/container/inlined_vector.h"
+#include "absl/functional/function_ref.h"
+#include "absl/log/log.h"
+#include "absl/meta/type_traits.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -108,55 +111,96 @@ namespace promise_filter_detail {
 // the promise. If so, we need to allocate a latch for the generated promise for
 // the original promise stack polyfill code that's generated.
 
-inline constexpr bool HasAsyncErrorInterceptor() { return false; }
+template <typename T>
+using EnableIfPromise = std::enable_if_t<std::is_invocable_v<T>, void>;
 
-inline constexpr bool HasAsyncErrorInterceptor(const NoInterceptor*) {
-  return false;
-}
+template <typename R, typename Ignored = void>
+struct HasAsyncErrorInterceptor;
+
+template <>
+struct HasAsyncErrorInterceptor<void> {
+  static constexpr bool value = false;
+};
+
+template <>
+struct HasAsyncErrorInterceptor<const NoInterceptor*> {
+  static constexpr bool value = false;
+};
 
 template <typename T, typename A0, typename... As>
-inline constexpr bool HasAsyncErrorInterceptor(A0 (T::*)(A0, As...)) {
-  return false;
-}
+struct HasAsyncErrorInterceptor<A0 (T::*)(A0, As...)> {
+  static constexpr bool value = false;
+};
 
 template <typename T, typename... A>
-inline constexpr bool HasAsyncErrorInterceptor(absl::Status (T::*)(A...)) {
-  return true;
-}
+struct HasAsyncErrorInterceptor<absl::Status (T::*)(A...)> {
+  static constexpr bool value = true;
+};
 
 template <typename R, typename T, typename... A>
-inline constexpr bool HasAsyncErrorInterceptor(absl::StatusOr<R> (T::*)(A...)) {
-  return true;
-}
+struct HasAsyncErrorInterceptor<absl::StatusOr<R> (T::*)(A...)> {
+  static constexpr bool value = true;
+};
 
 template <typename T, typename... A>
-inline constexpr bool HasAsyncErrorInterceptor(
-    ServerMetadataHandle (T::*)(A...)) {
-  return true;
-}
+struct HasAsyncErrorInterceptor<ServerMetadataHandle (T::*)(A...)> {
+  static constexpr bool value = true;
+};
 
 template <typename T, typename... A>
-inline constexpr bool HasAsyncErrorInterceptor(void (T::*)(A...)) {
-  return false;
-}
+struct HasAsyncErrorInterceptor<void (T::*)(A...)> {
+  static constexpr bool value = false;
+};
+
+template <typename T, typename Promise, typename... A>
+struct HasAsyncErrorInterceptor<Promise (T::*)(A...),
+                                EnableIfPromise<Promise>> {
+  // TODO(vigneshbabu): - For fused filters, this should be the OR of
+  // HasAsyncErrorInterceptor of all constituent filters.
+  static constexpr bool value = true;
+};
 
 // For the list case we do two interceptors to avoid amiguities with the single
 // argument forms above.
-template <typename I1, typename I2, typename... Interceptors>
-inline constexpr bool HasAsyncErrorInterceptor(I1 i1, I2 i2,
-                                               Interceptors... interceptors) {
-  return HasAsyncErrorInterceptor(i1) || HasAsyncErrorInterceptor(i2) ||
-         HasAsyncErrorInterceptor(interceptors...);
+template <typename... Interceptors>
+inline constexpr bool HasAnyAsyncErrorInterceptor(Interceptors...) {
+  return (HasAsyncErrorInterceptor<Interceptors>::value || ...);
 }
 
+// value is true if Derived has a member called IsFused.
+template <typename Derived>
+struct IsFusedFilter {
+  template <typename V>
+  static std::true_type test(decltype(&V::IsFused));  // SFINAE context
+  template <typename V>
+  static std::false_type test(...);
+
+  using type = decltype(test<Derived>(nullptr));
+  static constexpr bool value = std::is_same_v<type, std::true_type>;
+};
+
+template <typename Derived, typename Ignored = void>
+struct CallHasAsyncErrorInterceptor;
+
 // Composite for a given channel type to determine if any of its interceptors
 // fall into this category: later code should use this.
 template <typename Derived>
-inline constexpr bool CallHasAsyncErrorInterceptor() {
-  return HasAsyncErrorInterceptor(&Derived::Call::OnClientToServerMessage,
+struct CallHasAsyncErrorInterceptor<
+    Derived, std::enable_if_t<!IsFusedFilter<Derived>::value>> {
+  static constexpr bool value =
+      HasAnyAsyncErrorInterceptor(&Derived::Call::OnClientToServerMessage,
                                   &Derived::Call::OnServerInitialMetadata,
                                   &Derived::Call::OnServerToClientMessage);
-}
+};
+
+template <typename Derived>
+struct CallHasAsyncErrorInterceptor<
+    Derived, std::enable_if_t<IsFusedFilter<Derived>::value>> {
+  // Fused filter types return a promise, which resolves to a
+  // ServerMetadataHandle type. So we assume that an async error interceptor is
+  // always needed.
+  static constexpr bool value = true;
+};
 
 // Given a boolean X export a type:
 // either T if X is true
@@ -196,7 +240,7 @@ struct RaceAsyncCompletion<false> {
 template <>
 struct RaceAsyncCompletion<true> {
   template <typename Promise>
-  static Promise Run(Promise x, Latch<ServerMetadataHandle>* latch) {
+  static auto Run(Promise x, Latch<ServerMetadataHandle>* latch) {
     return Race(latch->Wait(), std::move(x));
   }
 };
@@ -228,7 +272,7 @@ struct FilterCallData {
   GPR_NO_UNIQUE_ADDRESS CallWrapper<Derived> call;
   GPR_NO_UNIQUE_ADDRESS
   typename TypeIfNeeded<Latch<ServerMetadataHandle>,
-                        CallHasAsyncErrorInterceptor<Derived>()>::Type
+                        CallHasAsyncErrorInterceptor<Derived>::value>::Type
       error_latch;
   GPR_NO_UNIQUE_ADDRESS
   typename TypeIfNeeded<
@@ -243,7 +287,7 @@ auto MapResult(const NoInterceptor*, Promise x, void*) {
 template <typename Promise, typename Derived>
 auto MapResult(absl::Status (Derived::Call::*fn)(ServerMetadata&), Promise x,
                FilterCallData<Derived>* call_data) {
-  DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
+  GRPC_DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
   return OnCancel(Map(std::move(x),
                       [call_data](ServerMetadataHandle md) {
                         auto status =
@@ -264,7 +308,7 @@ auto MapResult(absl::Status (Derived::Call::*fn)(ServerMetadata&), Promise x,
 template <typename Promise, typename Derived>
 auto MapResult(void (Derived::Call::*fn)(ServerMetadata&), Promise x,
                FilterCallData<Derived>* call_data) {
-  DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
+  GRPC_DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
   return OnCancel(Map(std::move(x),
                       [call_data](ServerMetadataHandle md) {
                         call_data->call.OnServerTrailingMetadata(*md);
@@ -281,7 +325,28 @@ auto MapResult(void (Derived::Call::*fn)(ServerMetadata&), Promise x,
 template <typename Promise, typename Derived>
 auto MapResult(void (Derived::Call::*fn)(ServerMetadata&, Derived*), Promise x,
                FilterCallData<Derived>* call_data) {
-  DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
+  GRPC_DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
+  return OnCancel(
+      Map(std::move(x),
+          [call_data](ServerMetadataHandle md) {
+            call_data->call.OnServerTrailingMetadata(*md, call_data->channel);
+            return md;
+          }),
+      [call_data]() {
+        grpc_metadata_batch b;
+        b.Set(GrpcStatusMetadata(), GRPC_STATUS_CANCELLED);
+        b.Set(GrpcCallWasCancelled(), true);
+        call_data->call.OnServerTrailingMetadata(b, call_data->channel);
+      });
+}
+
+// For fused filters whose OnServerTrailingMetadata takes pointer to the
+// channel.
+template <typename P, typename Call, typename Derived,
+          typename = std::enable_if_t<IsFusedFilter<Derived>::value>>
+auto MapResult(void (Call::*fn)(ServerMetadata&, Derived*), P x,
+               FilterCallData<Derived>* call_data) {
+  GRPC_DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
   return OnCancel(
       Map(std::move(x),
           [call_data](ServerMetadataHandle md) {
@@ -296,6 +361,40 @@ auto MapResult(void (Derived::Call::*fn)(ServerMetadata&, Derived*), Promise x,
       });
 }
 
+// For fused filters whose OnServerTrailingMetadata does not take pointer to the
+// channel.
+template <typename P, typename Call, typename Derived,
+          typename = std::enable_if_t<IsFusedFilter<Derived>::value>>
+auto MapResult(void (Call::*fn)(ServerMetadata&), P x,
+               FilterCallData<Derived>* call_data) {
+  GRPC_DCHECK(fn == &Derived::Call::OnServerTrailingMetadata);
+  return OnCancel(Map(std::move(x),
+                      [call_data](ServerMetadataHandle md) {
+                        call_data->call.OnServerTrailingMetadata(*md);
+                        return md;
+                      }),
+                  [call_data]() {
+                    grpc_metadata_batch b;
+                    b.Set(GrpcStatusMetadata(), GRPC_STATUS_CANCELLED);
+                    b.Set(GrpcCallWasCancelled(), true);
+                    call_data->call.OnServerTrailingMetadata(b);
+                  });
+}
+
+template <typename T, typename A>
+constexpr bool IsSameExcludingCVRef =
+    std::is_same<promise_detail::RemoveCVRef<A>, T>::value;
+
+template <typename T, typename A>
+using EnableIfSameExcludingCVRef =
+    std::enable_if_t<std::is_same<promise_detail::RemoveCVRef<A>, T>::value,
+                     void>;
+
+template <typename T, typename A>
+using EnableIfNotSameExcludingCVRef =
+    std::enable_if_t<!std::is_same<promise_detail::RemoveCVRef<A>, T>::value,
+                     void>;
+
 template <typename Interceptor, typename Derived, typename SfinaeVoid = void>
 struct RunCallImpl;
 
@@ -307,8 +406,9 @@ struct RunCallImpl<const NoInterceptor*, Derived> {
   }
 };
 
-template <typename Derived>
-struct RunCallImpl<void (Derived::Call::*)(ClientMetadata& md), Derived> {
+template <typename Derived, typename A>
+struct RunCallImpl<void (Derived::Call::*)(A md), Derived,
+                   EnableIfSameExcludingCVRef<ClientMetadata, A>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data) {
     call_data->call.OnClientInitialMetadata(*call_args.client_initial_metadata);
@@ -316,9 +416,9 @@ struct RunCallImpl<void (Derived::Call::*)(ClientMetadata& md), Derived> {
   }
 };
 
-template <typename Derived>
-struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(ClientMetadata& md),
-                   Derived> {
+template <typename Derived, typename A>
+struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(A md), Derived,
+                   EnableIfSameExcludingCVRef<ClientMetadata, A>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data)
       -> ArenaPromise<ServerMetadataHandle> {
@@ -329,10 +429,10 @@ struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(ClientMetadata& md),
   }
 };
 
-template <typename Derived>
-struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(ClientMetadata& md,
+template <typename Derived, typename A>
+struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(A md,
                                                            Derived* channel),
-                   Derived> {
+                   Derived, EnableIfSameExcludingCVRef<ClientMetadata, A>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data)
       -> ArenaPromise<ServerMetadataHandle> {
@@ -343,9 +443,9 @@ struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(ClientMetadata& md,
   }
 };
 
-template <typename Derived>
-struct RunCallImpl<absl::Status (Derived::Call::*)(ClientMetadata& md),
-                   Derived> {
+template <typename Derived, typename A>
+struct RunCallImpl<absl::Status (Derived::Call::*)(A md), Derived,
+                   EnableIfSameExcludingCVRef<ClientMetadata, A>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data)
       -> ArenaPromise<ServerMetadataHandle> {
@@ -356,10 +456,9 @@ struct RunCallImpl<absl::Status (Derived::Call::*)(ClientMetadata& md),
   }
 };
 
-template <typename Derived>
-struct RunCallImpl<absl::Status (Derived::Call::*)(ClientMetadata& md,
-                                                   Derived* channel),
-                   Derived> {
+template <typename Derived, typename A>
+struct RunCallImpl<absl::Status (Derived::Call::*)(A md, Derived* channel),
+                   Derived, EnableIfSameExcludingCVRef<ClientMetadata, A>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data)
       -> ArenaPromise<ServerMetadataHandle> {
@@ -370,9 +469,9 @@ struct RunCallImpl<absl::Status (Derived::Call::*)(ClientMetadata& md,
   }
 };
 
-template <typename Derived>
-struct RunCallImpl<
-    void (Derived::Call::*)(ClientMetadata& md, Derived* channel), Derived> {
+template <typename Derived, typename A>
+struct RunCallImpl<void (Derived::Call::*)(A md, Derived* channel), Derived,
+                   EnableIfSameExcludingCVRef<ClientMetadata, A>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data) {
     call_data->call.OnClientInitialMetadata(*call_args.client_initial_metadata,
@@ -381,11 +480,22 @@ struct RunCallImpl<
   }
 };
 
-template <typename Derived, typename Promise>
-struct RunCallImpl<
-    Promise (Derived::Call::*)(ClientMetadata& md, Derived* channel), Derived,
-    absl::void_t<decltype(StatusCast<ServerMetadataHandle>(
-        std::declval<PromiseResult<Promise>>))>> {
+template <typename T, typename AnyType = void>
+struct StatusCastExistsToServerMetadataHandle {
+  static constexpr bool value = false;
+};
+template <typename T>
+struct StatusCastExistsToServerMetadataHandle<
+    T,
+    absl::void_t<decltype(StatusCast<ServerMetadataHandle>(std::declval<T>))>> {
+  static constexpr bool value = true;
+};
+
+template <typename Derived, typename A, typename Promise>
+struct RunCallImpl<Promise (Derived::Call::*)(A, Derived* channel), Derived,
+                   std::enable_if_t<StatusCastExistsToServerMetadataHandle<
+                                        PromiseResult<Promise>>::value &&
+                                    IsSameExcludingCVRef<ClientMetadata, A>>> {
   static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
                   FilterCallData<Derived>* call_data) {
     ClientMetadata& md_ref = *call_args.client_initial_metadata;
@@ -418,288 +528,582 @@ struct RunCallImpl<
   }
 };
 
+template <typename Derived, typename Call, typename Promise>
+struct RunCallImpl<
+    Promise (Call::*)(ClientMetadataHandle md, Derived* channel), Derived,
+    std::enable_if_t<std::is_same_v<PromiseResult<Promise>,
+                                    ServerMetadataOrHandle<ClientMetadata>>,
+                     void>> {
+  static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
+                  FilterCallData<Derived>* call_data) {
+    ClientMetadataHandle md = std::move(call_args.client_initial_metadata);
+    return TrySeq(call_data->call.OnClientInitialMetadata(std::move(md),
+                                                          call_data->channel),
+                  [call_args = std::move(call_args),
+                   next_promise_factory = std::move(next_promise_factory)](
+                      ClientMetadataHandle md) mutable {
+                    call_args.client_initial_metadata = std::move(md);
+                    return next_promise_factory(std::move(call_args));
+                  });
+  }
+};
+
 template <typename Interceptor, typename Derived>
 auto RunCall(Interceptor interceptor, CallArgs call_args,
              NextPromiseFactory next_promise_factory,
              FilterCallData<Derived>* call_data) {
-  DCHECK(interceptor == &Derived::Call::OnClientInitialMetadata);
+  GRPC_DCHECK(interceptor == &Derived::Call::OnClientInitialMetadata);
   return RunCallImpl<Interceptor, Derived>::Run(
       std::move(call_args), std::move(next_promise_factory), call_data);
 }
 
-template <typename Derived>
-inline auto InterceptClientToServerMessageHandler(
-    void (Derived::Call::*fn)(const Message&),
-    FilterCallData<Derived>* call_data, const CallArgs&) {
-  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  return [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-    call_data->call.OnClientToServerMessage(*msg);
-    return std::move(msg);
-  };
-}
+template <typename Derived, typename MethodType, typename Ignored = void>
+class InterceptClientToServerMessageHandler;
 
 template <typename Derived>
-inline auto InterceptClientToServerMessageHandler(
-    ServerMetadataHandle (Derived::Call::*fn)(const Message&),
-    FilterCallData<Derived>* call_data, const CallArgs&) {
-  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  return [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-    auto return_md = call_data->call.OnClientToServerMessage(*msg);
-    if (return_md == nullptr) return std::move(msg);
-    if (call_data->error_latch.is_set()) return std::nullopt;
-    call_data->error_latch.Set(std::move(return_md));
-    return std::nullopt;
-  };
-}
+class InterceptClientToServerMessageHandler<Derived, const NoInterceptor*> {
+ public:
+  explicit InterceptClientToServerMessageHandler(FilterCallData<Derived>*,
+                                                 const CallArgs&) {}
+  auto operator()() {
+    return [](MessageHandle msg) -> std::optional<MessageHandle> {
+      return std::move(msg);
+    };
+  }
+};
 
-template <typename Derived>
-inline auto InterceptClientToServerMessageHandler(
-    ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs&) {
-  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  return [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-    auto return_md =
-        call_data->call.OnClientToServerMessage(*msg, call_data->channel);
-    if (return_md == nullptr) return std::move(msg);
-    if (call_data->error_latch.is_set()) return std::nullopt;
-    call_data->error_latch.Set(std::move(return_md));
-    return std::nullopt;
-  };
-}
+template <typename Derived, typename MessageType>
+class InterceptClientToServerMessageHandler<
+    Derived, void (Derived::Call::*)(MessageType),
+    EnableIfSameExcludingCVRef<Message, MessageType>> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+  auto operator()() {
+    return [call_data =
+                call_data_](MessageHandle msg) -> std::optional<MessageHandle> {
+      call_data->call.OnClientToServerMessage(*msg);
+      return std::move(msg);
+    };
+  }
 
-template <typename Derived>
-inline auto InterceptClientToServerMessageHandler(
-    void (Derived::Call::*fn)(const Message&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs&) {
-  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  return [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-    call_data->call.OnClientToServerMessage(*msg, call_data->channel);
-    return std::move(msg);
-  };
-}
+ private:
+  FilterCallData<Derived>* call_data_;
+};
 
-template <typename Derived>
-inline auto InterceptClientToServerMessageHandler(
-    MessageHandle (Derived::Call::*fn)(MessageHandle, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs&) {
-  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  return [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-    return call_data->call.OnClientToServerMessage(std::move(msg),
-                                                   call_data->channel);
-  };
-}
+template <typename Derived, typename MessageType>
+class InterceptClientToServerMessageHandler<
+    Derived, ServerMetadataHandle (Derived::Call::*)(MessageType),
+    EnableIfSameExcludingCVRef<Message, MessageType>> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data =
+                call_data_](MessageHandle msg) -> std::optional<MessageHandle> {
+      auto return_md = call_data->call.OnClientToServerMessage(*msg);
+      if (return_md == nullptr) return std::move(msg);
+      if (call_data->error_latch.is_set()) return std::nullopt;
+      call_data->error_latch.Set(std::move(return_md));
+      return std::nullopt;
+    };
+  }
+
+ private:
+  FilterCallData<Derived>* call_data_;
+};
+
+template <typename Derived, typename MessageType>
+class InterceptClientToServerMessageHandler<
+    Derived, ServerMetadataHandle (Derived::Call::*)(MessageType, Derived*),
+    EnableIfSameExcludingCVRef<Message, MessageType>> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data =
+                call_data_](MessageHandle msg) -> std::optional<MessageHandle> {
+      auto return_md =
+          call_data->call.OnClientToServerMessage(*msg, call_data->channel);
+      if (return_md == nullptr) return std::move(msg);
+      if (call_data->error_latch.is_set()) return std::nullopt;
+      call_data->error_latch.Set(std::move(return_md));
+      return std::nullopt;
+    };
+  }
+
+ private:
+  FilterCallData<Derived>* call_data_;
+};
+
+template <typename Derived, typename MessageType>
+class InterceptClientToServerMessageHandler<
+    Derived, void (Derived::Call::*)(MessageType, Derived*),
+    EnableIfSameExcludingCVRef<Message, MessageType>> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data =
+                call_data_](MessageHandle msg) -> std::optional<MessageHandle> {
+      call_data->call.OnClientToServerMessage(*msg, call_data->channel);
+      return std::move(msg);
+    };
+  }
+
+ private:
+  FilterCallData<Derived>* call_data_;
+};
 
 template <typename Derived>
-inline auto InterceptClientToServerMessageHandler(
-    absl::StatusOr<MessageHandle> (Derived::Call::*fn)(MessageHandle, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs&) {
-  DCHECK(fn == &Derived::Call::OnClientToServerMessage);
-  return [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-    auto r = call_data->call.OnClientToServerMessage(std::move(msg),
+class InterceptClientToServerMessageHandler<
+    Derived, MessageHandle (Derived::Call::*)(MessageHandle, Derived*)> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data =
+                call_data_](MessageHandle msg) -> std::optional<MessageHandle> {
+      return call_data->call.OnClientToServerMessage(std::move(msg),
                                                      call_data->channel);
-    if (r.ok()) return std::move(*r);
-    if (call_data->error_latch.is_set()) return std::nullopt;
-    call_data->error_latch.Set(ServerMetadataFromStatus(r.status()));
-    return std::nullopt;
-  };
-}
+    };
+  }
 
-template <typename Derived, typename HookFunction>
-inline void InterceptClientToServerMessage(HookFunction hook,
-                                           const NoInterceptor*,
-                                           FilterCallData<Derived>* call_data,
-                                           const CallArgs& call_args) {
-  call_args.client_to_server_messages->InterceptAndMap(
-      InterceptClientToServerMessageHandler(hook, call_data, call_args));
-}
+ private:
+  FilterCallData<Derived>* call_data_;
+};
 
-template <typename Derived, typename HookFunction>
-inline void InterceptClientToServerMessage(HookFunction hook,
-                                           void (Derived::Call::*)(),
-                                           FilterCallData<Derived>* call_data,
-                                           const CallArgs& call_args) {
-  call_args.client_to_server_messages->InterceptAndMapWithHalfClose(
-      InterceptClientToServerMessageHandler(hook, call_data, call_args),
-      [call_data]() { call_data->call.OnClientToServerHalfClose(); });
-}
+template <typename Derived>
+class InterceptClientToServerMessageHandler<
+    Derived,
+    absl::StatusOr<MessageHandle> (Derived::Call::*)(MessageHandle, Derived*)> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data =
+                call_data_](MessageHandle msg) -> std::optional<MessageHandle> {
+      auto r = call_data->call.OnClientToServerMessage(std::move(msg),
+                                                       call_data->channel);
+      if (r.ok()) return std::move(*r);
+      if (call_data->error_latch.is_set()) return std::nullopt;
+      call_data->error_latch.Set(ServerMetadataFromStatus(r.status()));
+      return std::nullopt;
+    };
+  }
+
+ private:
+  FilterCallData<Derived>* call_data_;
+};
+
+// For handling fused filters with a promise return type. This specialization is
+// only for fused filters not requiring a channel pointer.
+template <typename Derived, typename R, typename Call>
+class InterceptClientToServerMessageHandler<Derived, R (Call::*)(MessageHandle),
+                                            EnableIfPromise<R>> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data = call_data_](MessageHandle msg) {
+      return Map(call_data->call.OnClientToServerMessage(std::move(msg)),
+                 [call_data](ServerMetadataOrHandle<Message> md)
+                     -> std::optional<MessageHandle> {
+                   if (!md.ok()) {
+                     call_data->error_latch.Set(std::move(md).TakeMetadata());
+                     return std::nullopt;
+                   }
+                   return std::move(md).TakeValue();
+                 });
+    };
+  }
+
+ private:
+  FilterCallData<Derived>* call_data_;
+};
+
+// For handling fused filters with a promise return type. This specialization is
+// only for fused filters requiring a channel pointer.
+template <typename Derived, typename Call, typename R>
+class InterceptClientToServerMessageHandler<
+    Derived, R (Call::*)(MessageHandle, Derived*), EnableIfPromise<R>> {
+ public:
+  explicit InterceptClientToServerMessageHandler(
+      FilterCallData<Derived>* call_data, const CallArgs&)
+      : call_data_(call_data) {}
+
+  auto operator()() {
+    return [call_data = call_data_](MessageHandle msg) {
+      return Map(call_data->call.OnClientToServerMessage(std::move(msg),
+                                                         call_data->channel),
+                 [call_data](ServerMetadataOrHandle<Message> md)
+                     -> std::optional<MessageHandle> {
+                   if (!md.ok()) {
+                     call_data->error_latch.Set(std::move(md).TakeMetadata());
+                     return std::nullopt;
+                   }
+                   return std::move(md).TakeValue();
+                 });
+    };
+  }
+
+ private:
+  FilterCallData<Derived>* call_data_;
+};
+
+template <typename HookFn, typename HalfCloseFn, typename Derived,
+          typename Ignored = void>
+struct InterceptClientToServerMessage;
 
 template <typename Derived>
-inline void InterceptClientToServerMessage(const NoInterceptor*,
-                                           const NoInterceptor*,
-                                           FilterCallData<Derived>*,
-                                           const CallArgs&) {}
+struct InterceptClientToServerMessage<const NoInterceptor*,
+                                      const NoInterceptor*, Derived> {
+  static inline void Run(FilterCallData<Derived>*, const CallArgs&) {}
+};
 
-template <typename CallArgs>
-inline void InterceptServerInitialMetadata(const NoInterceptor*, void*,
-                                           const CallArgs&) {}
+template <typename HookFn, typename Call, typename Derived>
+struct InterceptClientToServerMessage<
+    HookFn, void (Call::*)(), Derived,
+    std::enable_if_t<!IsSameExcludingCVRef<HookFn, NoInterceptor*>, void>> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.client_to_server_messages->InterceptAndMapWithHalfClose(
+        InterceptClientToServerMessageHandler<Derived, HookFn>(call_data,
+                                                               call_args)(),
+        [call_data]() { call_data->call.OnClientToServerHalfClose(); });
+  }
+};
+
+template <typename HookFn, typename Derived>
+struct InterceptClientToServerMessage<
+    HookFn, const NoInterceptor*, Derived,
+    std::enable_if_t<!IsSameExcludingCVRef<HookFn, NoInterceptor*>, void>> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.client_to_server_messages->InterceptAndMap(
+        InterceptClientToServerMessageHandler<Derived, HookFn>(call_data,
+                                                               call_args)());
+  }
+};
+
+template <typename Derived, typename MethodType, typename Ignored = void>
+struct InterceptServerInitialMetadata;
 
 template <typename Derived>
-inline void InterceptServerInitialMetadata(
-    void (Derived::Call::*fn)(ServerMetadata&),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerInitialMetadata);
-  call_args.server_initial_metadata->InterceptAndMap(
-      [call_data](ServerMetadataHandle md) {
-        call_data->call.OnServerInitialMetadata(*md);
-        return md;
-      });
-}
+struct InterceptServerInitialMetadata<Derived, const NoInterceptor*> {
+  static inline void Run(FilterCallData<Derived>*, const CallArgs&) {}
+};
 
 template <typename Derived>
-inline void InterceptServerInitialMetadata(
-    absl::Status (Derived::Call::*fn)(ServerMetadata&),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerInitialMetadata);
-  call_args.server_initial_metadata->InterceptAndMap(
-      [call_data](
-          ServerMetadataHandle md) -> std::optional<ServerMetadataHandle> {
-        auto status = call_data->call.OnServerInitialMetadata(*md);
-        if (!status.ok() && !call_data->error_latch.is_set()) {
-          call_data->error_latch.Set(ServerMetadataFromStatus(status));
-          return std::nullopt;
-        }
-        return std::move(md);
-      });
-}
+struct InterceptServerInitialMetadata<Derived, void (Derived::Call::*)(
+                                                   ServerMetadata&)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_initial_metadata->InterceptAndMap(
+        [call_data](ServerMetadataHandle md) {
+          call_data->call.OnServerInitialMetadata(*md);
+          return md;
+        });
+  }
+};
 
 template <typename Derived>
-inline void InterceptServerInitialMetadata(
-    void (Derived::Call::*fn)(ServerMetadata&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerInitialMetadata);
-  call_args.server_initial_metadata->InterceptAndMap(
-      [call_data](ServerMetadataHandle md) {
-        call_data->call.OnServerInitialMetadata(*md, call_data->channel);
-        return md;
-      });
-}
+struct InterceptServerInitialMetadata<Derived, absl::Status (Derived::Call::*)(
+                                                   ServerMetadata&)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_initial_metadata->InterceptAndMap(
+        [call_data](
+            ServerMetadataHandle md) -> std::optional<ServerMetadataHandle> {
+          auto status = call_data->call.OnServerInitialMetadata(*md);
+          if (!status.ok() && !call_data->error_latch.is_set()) {
+            call_data->error_latch.Set(ServerMetadataFromStatus(status));
+            return std::nullopt;
+          }
+          return std::move(md);
+        });
+  }
+};
 
 template <typename Derived>
-inline void InterceptServerInitialMetadata(
-    absl::Status (Derived::Call::*fn)(ServerMetadata&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerInitialMetadata);
-  call_args.server_initial_metadata->InterceptAndMap(
-      [call_data](
-          ServerMetadataHandle md) -> std::optional<ServerMetadataHandle> {
-        auto status =
-            call_data->call.OnServerInitialMetadata(*md, call_data->channel);
-        if (!status.ok() && !call_data->error_latch.is_set()) {
-          call_data->error_latch.Set(ServerMetadataFromStatus(status));
-          return std::nullopt;
-        }
-        return std::move(md);
-      });
-}
+struct InterceptServerInitialMetadata<Derived, void (Derived::Call::*)(
+                                                   ServerMetadata&, Derived*)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_initial_metadata->InterceptAndMap(
+        [call_data](ServerMetadataHandle md) {
+          call_data->call.OnServerInitialMetadata(*md, call_data->channel);
+          return md;
+        });
+  }
+};
+
+template <typename Derived>
+struct InterceptServerInitialMetadata<Derived, absl::Status (Derived::Call::*)(
+                                                   ServerMetadata&, Derived*)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_initial_metadata->InterceptAndMap(
+        [call_data](
+            ServerMetadataHandle md) -> std::optional<ServerMetadataHandle> {
+          auto status =
+              call_data->call.OnServerInitialMetadata(*md, call_data->channel);
+          if (!status.ok() && !call_data->error_latch.is_set()) {
+            call_data->error_latch.Set(ServerMetadataFromStatus(status));
+            return std::nullopt;
+          }
+          return std::move(md);
+        });
+  }
+};
+
+// For handling fused filters with a promise return type. This specialization is
+// only for fused filters requiring a channel pointer.
+template <typename Derived, typename Call, typename R>
+struct InterceptServerInitialMetadata<
+    Derived, R (Call::*)(ServerMetadataHandle, Derived*), EnableIfPromise<R>> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_initial_metadata->InterceptAndMap(
+        [call_data](ServerMetadataHandle md) {
+          return Map(
+              call_data->call.OnServerInitialMetadata(std::move(md),
+                                                      call_data->channel),
+              [call_data](ServerMetadataOrHandle<ServerMetadata> md)
+                  -> std::optional<ServerMetadataHandle> {
+                if (!md.ok()) {
+                  call_data->error_latch.Set(std::move(md).TakeMetadata());
+                  return std::nullopt;
+                }
+                return std::move(md).TakeValue();
+              });
+        });
+  }
+};
+
+// For handling fused filters with a promise return type. This specialization is
+// only for fused filters not requiring a channel pointer.
+template <typename Derived, typename Call, typename R>
+struct InterceptServerInitialMetadata<
+    Derived, R (Call::*)(ServerMetadataHandle), EnableIfPromise<R>> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_initial_metadata->InterceptAndMap(
+        [call_data](ServerMetadataHandle md) {
+          return Map(
+              call_data->call.OnServerInitialMetadata(std::move(md)),
+              [call_data](ServerMetadataOrHandle<ServerMetadata> md)
+                  -> std::optional<ServerMetadataHandle> {
+                if (!md.ok()) {
+                  call_data->error_latch.Set(std::move(md).TakeMetadata());
+                  return std::nullopt;
+                }
+                return std::move(md).TakeValue();
+              });
+        });
+  }
+};
 
-inline void InterceptServerToClientMessage(const NoInterceptor*, void*,
-                                           const CallArgs&) {}
+template <typename Derived, typename MethodType, typename Ignored = void>
+struct InterceptServerToClientMessage;
 
 template <typename Derived>
-inline void InterceptServerToClientMessage(
-    void (Derived::Call::*fn)(const Message&),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
-  call_args.server_to_client_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-        call_data->call.OnServerToClientMessage(*msg);
-        return std::move(msg);
-      });
-}
+struct InterceptServerToClientMessage<Derived, const NoInterceptor*> {
+  static inline void Run(FilterCallData<Derived>*, const CallArgs&) {}
+};
 
 template <typename Derived>
-inline void InterceptServerToClientMessage(
-    ServerMetadataHandle (Derived::Call::*fn)(const Message&),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
-  call_args.server_to_client_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-        auto return_md = call_data->call.OnServerToClientMessage(*msg);
-        if (return_md == nullptr) return std::move(msg);
-        if (call_data->error_latch.is_set()) return std::nullopt;
-        call_data->error_latch.Set(std::move(return_md));
-        return std::nullopt;
-      });
-}
+struct InterceptServerToClientMessage<Derived,
+                                      void (Derived::Call::*)(const Message&)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          call_data->call.OnServerToClientMessage(*msg);
+          return std::move(msg);
+        });
+  }
+};
 
 template <typename Derived>
-inline void InterceptServerToClientMessage(
-    void (Derived::Call::*fn)(const Message&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
-  call_args.server_to_client_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-        call_data->call.OnServerToClientMessage(*msg, call_data->channel);
-        return std::move(msg);
-      });
-}
+struct InterceptServerToClientMessage<Derived,
+                                      void (Derived::Call::*)(Message&)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          call_data->call.OnServerToClientMessage(*msg);
+          return std::move(msg);
+        });
+  }
+};
 
 template <typename Derived>
-inline void InterceptServerToClientMessage(
-    ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
-  call_args.server_to_client_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-        auto return_md =
-            call_data->call.OnServerToClientMessage(*msg, call_data->channel);
-        if (return_md == nullptr) return std::move(msg);
-        if (call_data->error_latch.is_set()) return std::nullopt;
-        call_data->error_latch.Set(std::move(return_md));
-        return std::nullopt;
-      });
-}
+struct InterceptServerToClientMessage<
+    Derived, ServerMetadataHandle (Derived::Call::*)(const Message&)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          auto return_md = call_data->call.OnServerToClientMessage(*msg);
+          if (return_md == nullptr) return std::move(msg);
+          if (call_data->error_latch.is_set()) return std::nullopt;
+          call_data->error_latch.Set(std::move(return_md));
+          return std::nullopt;
+        });
+  }
+};
 
 template <typename Derived>
-inline void InterceptServerToClientMessage(
-    MessageHandle (Derived::Call::*fn)(MessageHandle, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
-  call_args.server_to_client_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-        return call_data->call.OnServerToClientMessage(std::move(msg),
-                                                       call_data->channel);
-      });
-}
+struct InterceptServerToClientMessage<Derived, void (Derived::Call::*)(
+                                                   const Message&, Derived*)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          call_data->call.OnServerToClientMessage(*msg, call_data->channel);
+          return std::move(msg);
+        });
+  }
+};
 
 template <typename Derived>
-inline void InterceptServerToClientMessage(
-    absl::StatusOr<MessageHandle> (Derived::Call::*fn)(MessageHandle, Derived*),
-    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
-  DCHECK(fn == &Derived::Call::OnServerToClientMessage);
-  call_args.server_to_client_messages->InterceptAndMap(
-      [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
-        auto r = call_data->call.OnServerToClientMessage(std::move(msg),
+struct InterceptServerToClientMessage<Derived,
+                                      ServerMetadataHandle (Derived::Call::*)(
+                                          const Message&, Derived*)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          auto return_md =
+              call_data->call.OnServerToClientMessage(*msg, call_data->channel);
+          if (return_md == nullptr) return std::move(msg);
+          if (call_data->error_latch.is_set()) return std::nullopt;
+          call_data->error_latch.Set(std::move(return_md));
+          return std::nullopt;
+        });
+  }
+};
+
+template <typename Derived>
+struct InterceptServerToClientMessage<Derived, MessageHandle (Derived::Call::*)(
+                                                   MessageHandle, Derived*)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          return call_data->call.OnServerToClientMessage(std::move(msg),
                                                          call_data->channel);
-        if (r.ok()) return std::move(*r);
-        if (call_data->error_latch.is_set()) return std::nullopt;
-        call_data->error_latch.Set(ServerMetadataFromStatus(r.status()));
-        return std::nullopt;
-      });
-}
+        });
+  }
+};
 
-inline void InterceptFinalize(const NoInterceptor*, void*, void*) {}
+template <typename Derived>
+struct InterceptServerToClientMessage<Derived, absl::StatusOr<MessageHandle> (
+                                                   Derived::Call::*)(
+                                                   MessageHandle, Derived*)> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) -> std::optional<MessageHandle> {
+          auto r = call_data->call.OnServerToClientMessage(std::move(msg),
+                                                           call_data->channel);
+          if (r.ok()) return std::move(*r);
+          if (call_data->error_latch.is_set()) return std::nullopt;
+          call_data->error_latch.Set(ServerMetadataFromStatus(r.status()));
+          return std::nullopt;
+        });
+  }
+};
 
-template <class Call>
-inline void InterceptFinalize(void (Call::*fn)(const grpc_call_final_info*),
-                              void*, Call* call) {
-  DCHECK(fn == &Call::OnFinalize);
-  GetContext<CallFinalization>()->Add(
-      [call](const grpc_call_final_info* final_info) {
-        call->OnFinalize(final_info);
-      });
-}
+// For handling fused filters with a promise return type. This specialization is
+// only for fused filters not requiring a channel pointer.
+template <typename Derived, typename Call, typename R>
+struct InterceptServerToClientMessage<Derived, R (Call::*)(MessageHandle),
+                                      EnableIfPromise<R>> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) {
+          return Map(
+              call_data->call.OnServerToClientMessage(std::move(msg)),
+              [call_data](ServerMetadataOrHandle<Message> msg)
+                  -> std::optional<MessageHandle> {
+                if (!msg.ok()) {
+                  call_data->error_latch.Set(std::move(msg).TakeMetadata());
+                  return std::nullopt;
+                }
+                return std::move(msg).TakeValue();
+              });
+        });
+  }
+};
 
-template <class Derived>
-inline void InterceptFinalize(
-    void (Derived::Call::*fn)(const grpc_call_final_info*, Derived*),
-    Derived* channel, typename Derived::Call* call) {
-  DCHECK(fn == &Derived::Call::OnFinalize);
-  GetContext<CallFinalization>()->Add(
-      [call, channel](const grpc_call_final_info* final_info) {
-        call->OnFinalize(final_info, channel);
-      });
-}
+// For handling fused filters with a promise return type. This specialization is
+// only for fused filters requiring a channel pointer.
+template <typename Derived, typename Call, typename R>
+struct InterceptServerToClientMessage<
+    Derived, R (Call::*)(MessageHandle, Derived*), EnableIfPromise<R>> {
+  static inline void Run(FilterCallData<Derived>* call_data,
+                         const CallArgs& call_args) {
+    call_args.server_to_client_messages->InterceptAndMap(
+        [call_data](MessageHandle msg) {
+          return Map(
+              call_data->call.OnServerToClientMessage(std::move(msg),
+                                                      call_data->channel),
+              [call_data](ServerMetadataOrHandle<Message> msg)
+                  -> std::optional<MessageHandle> {
+                if (!msg.ok()) {
+                  call_data->error_latch.Set(std::move(msg).TakeMetadata());
+                  return std::nullopt;
+                }
+                return std::move(msg).TakeValue();
+              });
+        });
+  }
+};
+
+template <typename Derived, typename MethodType, typename Ignored = void>
+struct InterceptFinalize;
+
+template <typename Derived>
+struct InterceptFinalize<Derived, const NoInterceptor*> {
+  static inline void Run(void*, void*) {}
+};
+
+template <typename Derived, typename Call>
+struct InterceptFinalize<Derived, void (Call::*)(const grpc_call_final_info*)> {
+  static inline void Run(void*, Call* call) {
+    GetContext<CallFinalization>()->Add(
+        [call](const grpc_call_final_info* final_info) {
+          call->OnFinalize(final_info);
+        });
+  }
+};
+
+template <class Derived, typename Call>
+struct InterceptFinalize<Derived, void (Call::*)(const grpc_call_final_info*,
+                                                 Derived*)> {
+  static inline void Run(Derived* channel, Call* call) {
+    GetContext<CallFinalization>()->Add(
+        [call, channel](const grpc_call_final_info* final_info) {
+          call->OnFinalize(final_info, channel);
+        });
+  }
+};
 
 template <typename Derived>
 absl::enable_if_t<std::is_empty<FilterCallData<Derived>>::value,
@@ -786,20 +1190,27 @@ class ImplementChannelFilter : public ChannelFilter,
       CallArgs call_args, NextPromiseFactory next_promise_factory) final {
     auto* call = promise_filter_detail::MakeFilterCall<Derived>(
         static_cast<Derived*>(this));
-    promise_filter_detail::InterceptClientToServerMessage(
-        &Derived::Call::OnClientToServerMessage,
-        &Derived::Call::OnClientToServerHalfClose, call, call_args);
-    promise_filter_detail::InterceptServerInitialMetadata(
-        &Derived::Call::OnServerInitialMetadata, call, call_args);
-    promise_filter_detail::InterceptServerToClientMessage(
-        &Derived::Call::OnServerToClientMessage, call, call_args);
-    promise_filter_detail::InterceptFinalize(
-        &Derived::Call::OnFinalize, static_cast<Derived*>(this),
-        static_cast<typename Derived::Call*>(&call->call));
+    promise_filter_detail::InterceptClientToServerMessage<
+        decltype(&Derived::Call::OnClientToServerMessage),
+        decltype(&Derived::Call::OnClientToServerHalfClose),
+        Derived>::Run(call, call_args);
+    promise_filter_detail::InterceptServerInitialMetadata<
+        Derived,
+        decltype(&Derived::Call::OnServerInitialMetadata)>::Run(call,
+                                                                call_args);
+    promise_filter_detail::InterceptServerToClientMessage<
+        Derived,
+        decltype(&Derived::Call::OnServerToClientMessage)>::Run(call,
+                                                                call_args);
+    promise_filter_detail::
+        InterceptFinalize<Derived, decltype(&Derived::Call::OnFinalize)>::Run(
+            static_cast<Derived*>(this),
+            static_cast<typename Derived::Call*>(&call->call));
     return promise_filter_detail::MapResult(
         &Derived::Call::OnServerTrailingMetadata,
         promise_filter_detail::RaceAsyncCompletion<
-            promise_filter_detail::CallHasAsyncErrorInterceptor<Derived>()>::
+            promise_filter_detail::CallHasAsyncErrorInterceptor<
+                Derived>::value>::
             Run(promise_filter_detail::RunCall(
                     &Derived::Call::OnClientInitialMetadata,
                     std::move(call_args), std::move(next_promise_factory),
@@ -837,7 +1248,9 @@ class InvalidChannelFilter : public ChannelFilter {
 };
 
 // Call data shared between all implementations of promise-based filters.
-class BaseCallData : public Activity, private Wakeable {
+class BaseCallData : public Activity,
+                     private Wakeable,
+                     public channelz::DataSource {
  protected:
   // Hook to allow interception of messages on the send/receive path by
   // PipeSender and PipeReceiver, as appropriate according to whether we're
@@ -862,7 +1275,8 @@ class BaseCallData : public Activity, private Wakeable {
   ~BaseCallData() override;
 
   void set_pollent(grpc_polling_entity* pollent) {
-    CHECK(nullptr == pollent_.exchange(pollent, std::memory_order_release));
+    GRPC_CHECK(nullptr ==
+               pollent_.exchange(pollent, std::memory_order_release));
   }
 
   // Activity implementation (partial).
@@ -881,6 +1295,8 @@ class BaseCallData : public Activity, private Wakeable {
 
   Call* call() { return arena_->GetContext<Call>(); }
 
+  void AddData(channelz::DataSink sink) final;
+
  protected:
   class ScopedContext : public promise_detail::Context<Arena>,
                         public promise_detail::Context<grpc_polling_entity>,
@@ -896,16 +1312,14 @@ class BaseCallData : public Activity, private Wakeable {
     }
   };
 
-  class Flusher : public latent_see::InnerScope {
+  class Flusher {
    public:
-    explicit Flusher(BaseCallData* call,
-                     latent_see::Metadata* desc = GRPC_LATENT_SEE_METADATA(
-                         "PromiseBasedFilter::Flusher"));
+    explicit Flusher(BaseCallData* call);
     // Calls closures, schedules batches, relinquishes call combiner.
     ~Flusher();
 
     void Resume(grpc_transport_stream_op_batch* batch) {
-      CHECK(!call_->is_last());
+      GRPC_CHECK(!call_->is_last());
       if (batch->HasOp()) {
         release_.push_back(batch);
       } else if (batch->on_complete != nullptr) {
@@ -984,7 +1398,7 @@ class BaseCallData : public Activity, private Wakeable {
     PipeSender<MessageHandle>* original_sender() override { abort(); }
 
     void GotPipe(PipeReceiver<MessageHandle>* receiver) override {
-      CHECK_EQ(receiver_, nullptr);
+      GRPC_CHECK_EQ(receiver_, nullptr);
       receiver_ = receiver;
     }
 
@@ -992,7 +1406,7 @@ class BaseCallData : public Activity, private Wakeable {
 
     PipeSender<MessageHandle>* Push() override { return &pipe_.sender; }
     PipeReceiver<MessageHandle>* Pull() override {
-      CHECK_NE(receiver_, nullptr);
+      GRPC_CHECK_NE(receiver_, nullptr);
       return receiver_;
     }
 
@@ -1013,12 +1427,12 @@ class BaseCallData : public Activity, private Wakeable {
     void GotPipe(PipeReceiver<MessageHandle>*) override { abort(); }
 
     void GotPipe(PipeSender<MessageHandle>* sender) override {
-      CHECK_EQ(sender_, nullptr);
+      GRPC_CHECK_EQ(sender_, nullptr);
       sender_ = sender;
     }
 
     PipeSender<MessageHandle>* Push() override {
-      CHECK_NE(sender_, nullptr);
+      GRPC_CHECK_NE(sender_, nullptr);
       return sender_;
     }
     PipeReceiver<MessageHandle>* Pull() override { return &pipe_.receiver; }
@@ -1061,6 +1475,10 @@ class BaseCallData : public Activity, private Wakeable {
     // Return true if we've released the message for forwarding down the stack.
     bool IsForwarded() const { return state_ == State::kForwardedBatch; }
 
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList().Set("state", StateString(state_));
+    }
+
    private:
     enum class State : uint8_t {
       // Starting state: no batch started, no outgoing pipe configured.
@@ -1134,6 +1552,10 @@ class BaseCallData : public Activity, private Wakeable {
     // Call is completed, we have trailing metadata. Close things out.
     void Done(const ServerMetadata& metadata, Flusher* flusher);
 
+    channelz::PropertyList ChannelzProperties() {
+      return channelz::PropertyList().Set("state", StateString(state_));
+    }
+
    private:
     enum class State : uint8_t {
       // Starting state: no batch started, no incoming pipe configured.
@@ -1216,6 +1638,7 @@ class BaseCallData : public Activity, private Wakeable {
   }
   SendMessage* send_message() const { return send_message_; }
   ReceiveMessage* receive_message() const { return receive_message_; }
+  virtual channelz::PropertyList ChannelzProperties() const;
 
   bool is_last() const {
     return grpc_call_stack_element(call_stack_, call_stack_->count - 1) ==
@@ -1297,6 +1720,7 @@ class ClientCallData : public BaseCallData {
   static const char* StateString(SendInitialState);
   static const char* StateString(RecvTrailingState);
   std::string DebugString() const;
+  channelz::PropertyList ChannelzProperties() const override;
 
   struct RecvInitialMetadata;
   class PollContext;
@@ -1413,6 +1837,7 @@ class ServerCallData : public BaseCallData {
   static const char* StateString(RecvInitialState state);
   static const char* StateString(SendTrailingState state);
   std::string DebugString() const;
+  channelz::PropertyList ChannelzProperties() const override;
 
   class PollContext;
   struct SendInitialMetadata;
@@ -1533,7 +1958,7 @@ struct CallDataFilterWithFlagsMethods {
     if ((kFlags & kFilterIsLast) != 0) {
       ExecCtx::Run(DEBUG_LOCATION, then_schedule_closure, absl::OkStatus());
     } else {
-      CHECK_EQ(then_schedule_closure, nullptr);
+      GRPC_CHECK_EQ(then_schedule_closure, nullptr);
     }
   }
 };
@@ -1570,12 +1995,12 @@ template <typename F, uint8_t kFlags>
 struct ChannelFilterWithFlagsMethods {
   static absl::Status InitChannelElem(grpc_channel_element* elem,
                                       grpc_channel_element_args* args) {
-    CHECK(args->is_last == ((kFlags & kFilterIsLast) != 0));
-    auto status = F::Create(
-        args->channel_args,
-        ChannelFilter::Args(args->channel_stack, elem,
-                            grpc_channel_stack_filter_instance_number,
-                            args->old_blackboard, args->new_blackboard));
+    GRPC_CHECK(args->is_last == ((kFlags & kFilterIsLast) != 0));
+    auto status =
+        F::Create(args->channel_args,
+                  ChannelFilter::Args(args->channel_stack, elem,
+                                      grpc_channel_stack_filter_instance_number,
+                                      args->config, args->blackboard));
     if (!status.ok()) {
       new (elem->channel_data) F*(nullptr);
       return absl_status_to_grpc_error(status.status());