grpc 1.71.0 → 1.72.0

data/src/core/{lib/transport → call}/call_destination.h

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_DESTINATION_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_DESTINATION_H
+#ifndef GRPC_SRC_CORE_CALL_CALL_DESTINATION_H
+#define GRPC_SRC_CORE_CALL_CALL_DESTINATION_H
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/transport/call_spine.h"
+#include "src/core/call/call_spine.h"
 #include "src/core/util/orphanable.h"
 
 namespace grpc_core {
@@ -73,4 +73,4 @@ auto MakeCallDestinationFromHandlerFunction(HC handle_call) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_DESTINATION_H
+#endif  // GRPC_SRC_CORE_CALL_CALL_DESTINATION_H

data/src/core/{lib/transport → call}/call_filters.cc

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/call_filters.h"
+#include "src/core/call/call_filters.h"
 
 #include <grpc/support/port_platform.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-#include "src/core/lib/transport/metadata.h"
+#include "src/core/call/metadata.h"
 #include "src/core/util/crash.h"
 
 namespace grpc_core {

data/src/core/{lib/transport → call}/call_filters.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
+#ifndef GRPC_SRC_CORE_CALL_CALL_FILTERS_H
+#define GRPC_SRC_CORE_CALL_CALL_FILTERS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -24,6 +24,9 @@
 #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"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/latch.h"
@@ -33,9 +36,6 @@
 #include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/transport/call_final_info.h"
-#include "src/core/lib/transport/call_state.h"
-#include "src/core/lib/transport/message.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/util/dump_args.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
@@ -186,6 +186,12 @@ class NextMessage {
     DCHECK(has_value());
     return *message_;
   }
+  const Message& value() const {
+    DCHECK_NE(message_, taken());
+    DCHECK(ok());
+    DCHECK(has_value());
+    return *message_;
+  }
   MessageHandle TakeValue() {
     DCHECK_NE(message_, taken());
     DCHECK(ok());
@@ -200,6 +206,19 @@ class NextMessage {
     call_state_ = nullptr;
   }
 
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const NextMessage& msg) {
+    if (!msg.ok()) {
+      sink.Append("<failure>");
+      return;
+    }
+    if (!msg.has_value()) {
+      sink.Append("<end-of-stream>");
+      return;
+    }
+    AbslStringify(sink, msg.value());
+  }
+
  private:
   static Message* end_of_stream() { return nullptr; }
   static Message* error() { return reinterpret_cast<Message*>(1); }
@@ -1945,4 +1964,4 @@ static_assert(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
+#endif  // GRPC_SRC_CORE_CALL_CALL_FILTERS_H

data/src/core/{lib/channel → call}/call_finalization.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
-#define GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
+#ifndef GRPC_SRC_CORE_CALL_CALL_FINALIZATION_H
+#define GRPC_SRC_CORE_CALL_CALL_FINALIZATION_H
 
 #include <grpc/support/port_platform.h>
 
@@ -85,4 +85,4 @@ struct ContextType<CallFinalization> {};
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
+#endif  // GRPC_SRC_CORE_CALL_CALL_FINALIZATION_H

data/src/core/{lib/transport → call}/call_spine.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/call_spine.h"
+#include "src/core/call/call_spine.h"
 
 #include <grpc/support/port_platform.h>
 

data/src/core/{lib/transport → call}/call_spine.h

@@ -12,12 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
+#ifndef GRPC_SRC_CORE_CALL_CALL_SPINE_H
+#define GRPC_SRC_CORE_CALL_CALL_SPINE_H
 
 #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"
+#include "src/core/call/metadata.h"
 #include "src/core/lib/promise/detail/status.h"
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/latch.h"
@@ -27,10 +31,6 @@
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/promise/try_seq.h"
-#include "src/core/lib/transport/call_arena_allocator.h"
-#include "src/core/lib/transport/call_filters.h"
-#include "src/core/lib/transport/message.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/util/dual_ref_counted.h"
 
 namespace grpc_core {
@@ -106,7 +106,8 @@ class CallSpine final : public Party {
 
   void PushServerTrailingMetadata(ServerMetadataHandle md) {
     GRPC_TRACE_LOG(call_state, INFO)
-        << "[call_state] PushServerTrailingMetadata: " << md->DebugString();
+        << "[call_state] PushServerTrailingMetadata: " << this << " "
+        << md->DebugString();
     call_filters().PushServerTrailingMetadata(std::move(md));
   }
 
@@ -134,10 +135,10 @@ class CallSpine final : public Party {
     DCHECK(GetContext<Activity>() == this);
     using P = promise_detail::PromiseLike<Promise>;
     using ResultType = typename P::Result;
-    return Map(std::move(promise), [this](ResultType r) {
-      CancelIfFailed(r);
-      return r;
-    });
+    return Map(std::move(promise),
+               [self = RefAsSubclass<CallSpine>()](ResultType r) {
+                 self->CancelIfFailed(r);
+               });
   }
 
   template <typename StatusType>
@@ -220,18 +221,16 @@ class CallSpine final : public Party {
   void SpawnPushServerToClientMessage(MessageHandle msg) {
     server_to_client_serializer()->Spawn(
         [msg = std::move(msg), self = RefAsSubclass<CallSpine>()]() mutable {
-          return Map(self->CancelIfFails(
-                         self->PushServerToClientMessage(std::move(msg))),
-                     [](auto) { return Empty{}; });
+          return self->CancelIfFails(
+              self->PushServerToClientMessage(std::move(msg)));
         });
   }
 
   void SpawnPushClientToServerMessage(MessageHandle msg) {
     client_to_server_serializer()->Spawn(
         [msg = std::move(msg), self = RefAsSubclass<CallSpine>()]() mutable {
-          return Map(self->CancelIfFails(
-                         self->PushClientToServerMessage(std::move(msg))),
-                     [](auto) { return Empty{}; });
+          return self->CancelIfFails(
+              self->PushClientToServerMessage(std::move(msg)));
         });
   }
 
@@ -322,36 +321,56 @@ class CallInitiator {
 
   CallInitiator() = default;
   explicit CallInitiator(RefCountedPtr<CallSpine> spine)
-      : spine_(std::move(spine)) {}
+      : spine_(std::move(spine)) {
+    DCHECK_NE(spine_.get(), nullptr);
+  }
 
+  // Wrap a promise so that if it returns failure it automatically cancels
+  // the rest of the call.
+  // The resulting (returned) promise will resolve to Empty.
   template <typename Promise>
   auto CancelIfFails(Promise promise) {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->CancelIfFails(std::move(promise));
   }
 
   auto PullServerInitialMetadata() {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->PullServerInitialMetadata();
   }
 
   auto PushMessage(MessageHandle message) {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->PushClientToServerMessage(std::move(message));
   }
 
   void SpawnPushMessage(MessageHandle message) {
+    DCHECK_NE(spine_.get(), nullptr);
     spine_->SpawnPushClientToServerMessage(std::move(message));
   }
 
-  void FinishSends() { spine_->FinishSends(); }
+  void FinishSends() {
+    DCHECK_NE(spine_.get(), nullptr);
+    spine_->FinishSends();
+  }
 
-  void SpawnFinishSends() { spine_->SpawnFinishSends(); }
+  void SpawnFinishSends() {
+    DCHECK_NE(spine_.get(), nullptr);
+    spine_->SpawnFinishSends();
+  }
 
-  auto PullMessage() { return spine_->PullServerToClientMessage(); }
+  auto PullMessage() {
+    DCHECK_NE(spine_.get(), nullptr);
+    return spine_->PullServerToClientMessage();
+  }
 
   auto PullServerTrailingMetadata() {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->PullServerTrailingMetadata();
   }
 
   void Cancel(absl::Status error) {
+    DCHECK_NE(spine_.get(), nullptr);
     CHECK(!error.ok());
     auto status = ServerMetadataFromStatus(error);
     status->Set(GrpcCallWasCancelled(), true);
@@ -359,52 +378,72 @@ class CallInitiator {
   }
 
   void SpawnCancel(absl::Status error) {
+    DCHECK_NE(spine_.get(), nullptr);
     CHECK(!error.ok());
     auto status = ServerMetadataFromStatus(error);
     status->Set(GrpcCallWasCancelled(), true);
     spine_->SpawnPushServerTrailingMetadata(std::move(status));
   }
 
-  void Cancel() { spine_->Cancel(); }
+  void Cancel() {
+    DCHECK_NE(spine_.get(), nullptr);
+    spine_->Cancel();
+  }
 
-  void SpawnCancel() { spine_->SpawnCancel(); }
+  void SpawnCancel() {
+    DCHECK_NE(spine_.get(), nullptr);
+    spine_->SpawnCancel();
+  }
 
   GRPC_MUST_USE_RESULT bool OnDone(absl::AnyInvocable<void(bool)> fn) {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->OnDone(std::move(fn));
   }
 
   template <typename Promise>
   auto UntilCallCompletes(Promise promise) {
+    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);
     spine_->SpawnGuarded(name, std::move(promise_factory));
   }
 
   template <typename PromiseFactory>
   void SpawnGuardedUntilCallCompletes(absl::string_view name,
                                       PromiseFactory promise_factory) {
+    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);
     spine_->SpawnInfallible(name, std::move(promise_factory));
   }
 
   template <typename PromiseFactory>
   auto SpawnWaitable(absl::string_view name, PromiseFactory promise_factory) {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->SpawnWaitable(name, std::move(promise_factory));
   }
 
   bool WasCancelledPushed() const {
+    DCHECK_NE(spine_.get(), nullptr);
     return spine_->call_filters().WasCancelledPushed();
   }
 
-  Arena* arena() { return spine_->arena(); }
-  Party* party() { return spine_.get(); }
+  Arena* arena() {
+    DCHECK_NE(spine_.get(), nullptr);
+    return spine_->arena();
+  }
+  Party* party() {
+    DCHECK_NE(spine_.get(), nullptr);
+    return spine_.get();
+  }
 
  private:
   friend class CallHandler;
@@ -442,6 +481,9 @@ class CallHandler {
     return spine_->OnDone(std::move(fn));
   }
 
+  // Wrap a promise so that if it returns failure it automatically cancels
+  // the rest of the call.
+  // The resulting (returned) promise will resolve to Empty.
   template <typename Promise>
   auto CancelIfFails(Promise promise) {
     return spine_->CancelIfFails(std::move(promise));
@@ -599,4 +641,4 @@ void ForwardCall(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
+#endif  // GRPC_SRC_CORE_CALL_CALL_SPINE_H

data/src/core/{lib/transport → call}/call_state.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/call_state.h"
+#include "src/core/call/call_state.h"
 
 namespace grpc_core {
 

data/src/core/{lib/transport → call}/call_state.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
+#ifndef GRPC_SRC_CORE_CALL_CALL_STATE_H
+#define GRPC_SRC_CORE_CALL_CALL_STATE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -1151,4 +1151,4 @@ CallState::PollServerTrailingMetadataWasPushed() {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
+#endif  // GRPC_SRC_CORE_CALL_CALL_STATE_H

data/src/core/{lib/surface → call}/client_call.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/surface/client_call.h"
+#include "src/core/call/client_call.h"
 
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
@@ -42,6 +42,7 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/status_flag.h"
@@ -49,7 +50,6 @@
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/bitset.h"
@@ -404,12 +404,14 @@ void ClientCall::OnReceivedStatus(ServerMetadataHandle server_trailing_metadata,
   const auto status = server_trailing_metadata->get(GrpcStatusMetadata())
                           .value_or(GRPC_STATUS_UNKNOWN);
   *out_status = status;
-  Slice message_slice;
-  if (Slice* message =
-          server_trailing_metadata->get_pointer(GrpcMessageMetadata())) {
-    message_slice = message->Ref();
+  if (!IsErrorFlattenEnabled() || status != GRPC_STATUS_OK) {
+    Slice message_slice;
+    if (Slice* message =
+            server_trailing_metadata->get_pointer(GrpcMessageMetadata())) {
+      message_slice = message->Ref();
+    }
+    *out_status_details = message_slice.TakeCSlice();
   }
-  *out_status_details = message_slice.TakeCSlice();
   if (out_error_string != nullptr) {
     if (status != GRPC_STATUS_OK) {
       *out_error_string =

data/src/core/{lib/surface → call}/client_call.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
-#define GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
+#ifndef GRPC_SRC_CORE_CALL_CLIENT_CALL_H
+#define GRPC_SRC_CORE_CALL_CLIENT_CALL_H
 
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
@@ -40,11 +40,11 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata.h"
 #include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/call_utils.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
@@ -189,4 +189,4 @@ grpc_call* MakeClientCall(grpc_call* parent_call, uint32_t propagation_mask,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
+#endif  // GRPC_SRC_CORE_CALL_CLIENT_CALL_H

data/src/core/{lib/transport → call}/custom_metadata.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CUSTOM_METADATA_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_CUSTOM_METADATA_H
+#ifndef GRPC_SRC_CORE_CALL_CUSTOM_METADATA_H
+#define GRPC_SRC_CORE_CALL_CUSTOM_METADATA_H
 
 // This file defines two macros: GRPC_CUSTOM_CLIENT_METADATA and
 // GRPC_CUSTOM_SERVER_METADATA.
@@ -27,4 +27,4 @@
 #define GRPC_CUSTOM_CLIENT_METADATA
 #define GRPC_CUSTOM_SERVER_METADATA
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_CUSTOM_METADATA_H
+#endif  // GRPC_SRC_CORE_CALL_CUSTOM_METADATA_H

data/src/core/{lib/transport → call}/interception_chain.cc

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/interception_chain.h"
+#include "src/core/call/interception_chain.h"
 
 #include <grpc/support/port_platform.h>
 
 #include <cstddef>
 
+#include "src/core/call/call_destination.h"
+#include "src/core/call/call_filters.h"
+#include "src/core/call/call_spine.h"
+#include "src/core/call/metadata.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/transport/call_destination.h"
-#include "src/core/lib/transport/call_filters.h"
-#include "src/core/lib/transport/call_spine.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/util/match.h"
 
 namespace grpc_core {

data/src/core/{lib/transport → call}/interception_chain.h

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
+#ifndef GRPC_SRC_CORE_CALL_INTERCEPTION_CHAIN_H
+#define GRPC_SRC_CORE_CALL_INTERCEPTION_CHAIN_H
 
 #include <grpc/support/port_platform.h>
 
 #include <memory>
 #include <vector>
 
-#include "src/core/lib/transport/call_destination.h"
-#include "src/core/lib/transport/call_filters.h"
-#include "src/core/lib/transport/call_spine.h"
-#include "src/core/lib/transport/metadata.h"
+#include "src/core/call/call_destination.h"
+#include "src/core/call/call_filters.h"
+#include "src/core/call/call_spine.h"
+#include "src/core/call/metadata.h"
 #include "src/core/util/ref_counted.h"
 
 namespace grpc_core {
@@ -279,4 +279,4 @@ class InterceptionChainBuilder final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
+#endif  // GRPC_SRC_CORE_CALL_INTERCEPTION_CHAIN_H

data/src/core/{lib/transport → call}/message.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/message.h"
+#include "src/core/call/message.h"
 
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>

data/src/core/{lib/transport → call}/message.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_MESSAGE_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_MESSAGE_H
+#ifndef GRPC_SRC_CORE_CALL_MESSAGE_H
+#define GRPC_SRC_CORE_CALL_MESSAGE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -47,6 +47,10 @@ class Message {
   SliceBuffer* payload() { return &payload_; }
   const SliceBuffer* payload() const { return &payload_; }
 
+  Arena::PoolPtr<Message> Clone() const {
+    return Arena::MakePooled<Message>(payload_.Copy(), flags_);
+  }
+
   std::string DebugString() const;
 
   template <typename Sink>
@@ -63,4 +67,4 @@ using MessageHandle = Arena::PoolPtr<Message>;
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_MESSAGE_H
+#endif  // GRPC_SRC_CORE_CALL_MESSAGE_H

data/src/core/{lib/transport → call}/metadata.cc

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/metadata.h"
+#include "src/core/call/metadata.h"
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/transport/error_utils.h"
-#include "src/core/lib/transport/metadata_batch.h"
 
 namespace grpc_core {
 

data/src/core/{lib/transport → call}/metadata.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_H
+#ifndef GRPC_SRC_CORE_CALL_METADATA_H
+#define GRPC_SRC_CORE_CALL_METADATA_H
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/promise/try_seq.h"
-#include "src/core/lib/transport/metadata_batch.h"
 
 namespace grpc_core {
 
@@ -198,4 +198,4 @@ struct StatusCastImpl<
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_H
+#endif  // GRPC_SRC_CORE_CALL_METADATA_H

data/src/core/{lib/transport → call}/metadata_batch.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/call/metadata_batch.h"
 
 #include <grpc/support/port_platform.h>
 #include <string.h>

data/src/core/{lib/transport → call}/metadata_batch.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
+#ifndef GRPC_SRC_CORE_CALL_METADATA_BATCH_H
+#define GRPC_SRC_CORE_CALL_METADATA_BATCH_H
 
 #include <grpc/impl/compression_types.h>
 #include <grpc/status.h>
@@ -36,14 +36,14 @@
 #include "absl/meta/type_traits.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/custom_metadata.h"
+#include "src/core/call/metadata_compression_traits.h"
+#include "src/core/call/parsed_metadata.h"
+#include "src/core/call/simple_slice_based_metadata.h"
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/slice/slice.h"
-#include "src/core/lib/transport/custom_metadata.h"
-#include "src/core/lib/transport/metadata_compression_traits.h"
-#include "src/core/lib/transport/parsed_metadata.h"
-#include "src/core/lib/transport/simple_slice_based_metadata.h"
 #include "src/core/util/chunked_vector.h"
 #include "src/core/util/if_list.h"
 #include "src/core/util/packed_table.h"
@@ -1665,4 +1665,4 @@ struct grpc_metadata_batch : public grpc_metadata_batch_base {
   using grpc_metadata_batch_base::grpc_metadata_batch_base;
 };
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
+#endif  // GRPC_SRC_CORE_CALL_METADATA_BATCH_H