grpc 1.52.0.pre2 → 1.53.0.pre2

data/src/core/lib/transport/metadata_batch.cc

@@ -168,6 +168,17 @@ StaticSlice HttpSchemeMetadata::Encode(ValueType x) {
   }
 }
 
+size_t EncodedSizeOfKey(HttpSchemeMetadata, HttpSchemeMetadata::ValueType x) {
+  switch (x) {
+    case HttpSchemeMetadata::kHttp:
+      return 4;
+    case HttpSchemeMetadata::kHttps:
+      return 5;
+    default:
+      return 0;
+  }
+}
+
 const char* HttpSchemeMetadata::DisplayValue(MementoType content_type) {
   switch (content_type) {
     case kHttp:

data/src/core/lib/transport/metadata_batch.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
-#define GRPC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
 
 #include <grpc/support/port_platform.h>
 
@@ -49,6 +49,16 @@
 
 namespace grpc_core {
 
+// Given a metadata key and a value, return the encoded size.
+// Defaults to calling the key's Encode() method and then calculating the size
+// of that, but can be overridden for specific keys if there's a better way of
+// doing this.
+// May return 0 if the size is unknown/unknowable.
+template <typename Key>
+size_t EncodedSizeOfKey(Key, const typename Key::ValueType& value) {
+  return Key::Encode(value).size();
+}
+
 // grpc-timeout metadata trait.
 // ValueType is defined as Timestamp - an absolute timestamp (i.e. a
 // deadline!), that is converted to a duration by transports before being
@@ -88,6 +98,10 @@ struct TeMetadata {
   static const char* DisplayValue(MementoType te);
 };
 
+inline size_t EncodedSizeOfKey(TeMetadata, TeMetadata::ValueType x) {
+  return x == TeMetadata::kTrailers ? 8 : 0;
+}
+
 // content-type metadata trait.
 struct ContentTypeMetadata {
   static constexpr bool kRepeatable = false;
@@ -132,6 +146,8 @@ struct HttpSchemeMetadata {
   static const char* DisplayValue(MementoType content_type);
 };
 
+size_t EncodedSizeOfKey(HttpSchemeMetadata, HttpSchemeMetadata::ValueType x);
+
 // method metadata trait.
 struct HttpMethodMetadata {
   static constexpr bool kRepeatable = false;
@@ -339,6 +355,11 @@ struct GrpcLbClientStatsMetadata {
   }
 };
 
+inline size_t EncodedSizeOfKey(GrpcLbClientStatsMetadata,
+                               GrpcLbClientStatsMetadata::ValueType) {
+  return 0;
+}
+
 // lb-token metadata
 struct LbTokenMetadata : public SimpleSliceBasedMetadata {
   static constexpr bool kRepeatable = false;
@@ -1333,4 +1354,4 @@ struct grpc_metadata_batch : public grpc_metadata_batch_base {
   using grpc_metadata_batch_base::grpc_metadata_batch_base;
 };
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H

data/src/core/lib/transport/parsed_metadata.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
-#define GRPC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
 
 #include <grpc/support/port_platform.h>
 
@@ -407,4 +407,4 @@ ParsedMetadata<MetadataContainer>::KeyValueVTable(absl::string_view key) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H

data/src/core/lib/transport/pid_controller.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
-#define GRPC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -113,4 +113,4 @@ class PidController {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H

data/src/core/lib/transport/status_conversion.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H
-#define GRPC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H
 
 #include <grpc/support/port_platform.h>
 
@@ -35,4 +35,4 @@ grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error,
 grpc_status_code grpc_http2_status_to_grpc_status(int status);
 int grpc_status_to_http2_status(grpc_status_code status);
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H

data/src/core/lib/transport/tcp_connect_handshaker.cc

@@ -152,7 +152,6 @@ void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/,
   // we don't want to pass args->endpoint directly.
   // Instead pass endpoint_ and swap this endpoint to
   // args endpoint on success.
-  // TODO(hork): use EventEngine::Connect if(IsEventEngineClientEnabled())
   grpc_tcp_client_connect(
       &connected_, &endpoint_to_destroy_, interested_parties_,
       grpc_event_engine::experimental::ChannelArgsEndpointConfig(args->args),

data/src/core/lib/transport/tcp_connect_handshaker.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
-#define GRPC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -36,4 +36,4 @@ void RegisterTCPConnectHandshaker(CoreConfiguration::Builder* builder);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_TCP_CONNECT_HANDSHAKER_H

data/src/core/lib/transport/timeout_encoding.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
-#define GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -69,4 +69,4 @@ absl::optional<Duration> ParseTimeout(const Slice& text);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H

data/src/core/lib/transport/transport.cc

@@ -32,7 +32,6 @@
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/gpr/alloc.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/promise/context.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/transport_impl.h"
 
@@ -172,8 +171,6 @@ void grpc_transport_stream_op_batch_finish_with_failure(
 void grpc_transport_stream_op_batch_queue_finish_with_failure(
     grpc_transport_stream_op_batch* batch, grpc_error_handle error,
     grpc_core::CallCombinerClosureList* closures) {
-  if (batch->cancel_stream) {
-  }
   // Construct a list of closures to execute.
   if (batch->recv_initial_metadata) {
     closures->Add(
@@ -196,8 +193,6 @@ void grpc_transport_stream_op_batch_queue_finish_with_failure(
 
 void grpc_transport_stream_op_batch_finish_with_failure_from_transport(
     grpc_transport_stream_op_batch* batch, grpc_error_handle error) {
-  if (batch->cancel_stream) {
-  }
   // Construct a list of closures to execute.
   if (batch->recv_initial_metadata) {
     grpc_core::ExecCtx::Run(
@@ -273,9 +268,9 @@ grpc_transport_stream_op_batch* grpc_make_transport_stream_op(
 
 namespace grpc_core {
 
-ServerMetadataHandle ServerMetadataFromStatus(const absl::Status& status) {
-  auto hdl =
-      GetContext<Arena>()->MakePooled<ServerMetadata>(GetContext<Arena>());
+ServerMetadataHandle ServerMetadataFromStatus(const absl::Status& status,
+                                              Arena* arena) {
+  auto hdl = arena->MakePooled<ServerMetadata>(arena);
   hdl->Set(GrpcStatusMetadata(), static_cast<grpc_status_code>(status.code()));
   if (!status.ok()) {
     hdl->Set(GrpcMessageMetadata(), Slice::FromCopiedString(status.message()));

data/src/core/lib/transport/transport.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_TRANSPORT_H
-#define GRPC_CORE_LIB_TRANSPORT_TRANSPORT_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -52,8 +52,8 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/promise/arena_promise.h"
+#include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/status.h"
-#include "src/core/lib/promise/latch.h"
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
@@ -120,7 +120,8 @@ inline bool IsStatusOk(const ServerMetadataHandle& m) {
          GRPC_STATUS_OK;
 }
 
-ServerMetadataHandle ServerMetadataFromStatus(const absl::Status& status);
+ServerMetadataHandle ServerMetadataFromStatus(
+    const absl::Status& status, Arena* arena = GetContext<Arena>());
 
 template <>
 struct StatusCastImpl<ServerMetadataHandle, absl::Status> {
@@ -136,6 +137,13 @@ struct StatusCastImpl<ServerMetadataHandle, const absl::Status&> {
   }
 };
 
+template <>
+struct StatusCastImpl<ServerMetadataHandle, absl::Status&> {
+  static ServerMetadataHandle Cast(const absl::Status& m) {
+    return ServerMetadataFromStatus(m);
+  }
+};
+
 struct CallArgs {
   // Initial metadata from the client to the server.
   // During promise setup this can be manipulated by filters (and then
@@ -145,11 +153,11 @@ struct CallArgs {
   // Set once when it's available.
   // During promise setup filters can substitute their own latch for this
   // and consequently intercept the sent value and mutate/observe it.
-  Latch<ServerMetadata*>* server_initial_metadata;
+  PipeSender<ServerMetadataHandle>* server_initial_metadata;
   // Messages travelling from the application to the transport.
-  PipeReceiver<MessageHandle>* outgoing_messages;
+  PipeReceiver<MessageHandle>* client_to_server_messages;
   // Messages travelling from the transport to the application.
-  PipeSender<MessageHandle>* incoming_messages;
+  PipeSender<MessageHandle>* server_to_client_messages;
 };
 
 using NextPromiseFactory =
@@ -589,4 +597,4 @@ constexpr const char* kKeepaliveThrottlingKey =
     "grpc.internal.keepalive_throttling";
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_TRANSPORT_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H

data/src/core/lib/transport/transport_fwd.h

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_TRANSPORT_FWD_H
-#define GRPC_CORE_LIB_TRANSPORT_TRANSPORT_FWD_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_FWD_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_FWD_H
 
 typedef struct grpc_transport grpc_transport;
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_TRANSPORT_FWD_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_FWD_H

data/src/core/lib/transport/transport_impl.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
-#define GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
+#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
+#define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -92,4 +92,4 @@ struct grpc_transport {
   const grpc_transport_vtable* vtable;
 };
 
-#endif  // GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
+#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H

data/src/core/lib/transport/transport_op_string.cc

@@ -19,6 +19,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <memory>
 #include <string>
 #include <vector>

data/src/core/lib/uri/uri_parser.cc

@@ -23,6 +23,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <initializer_list>
 #include <map>
 #include <string>
 #include <utility>
@@ -207,7 +208,6 @@ std::string URI::PercentDecode(absl::string_view str) {
 }
 
 absl::StatusOr<URI> URI::Parse(absl::string_view uri_text) {
-  absl::StatusOr<std::string> decoded;
   absl::string_view remaining = uri_text;
   // parse scheme
   size_t offset = remaining.find(':');

data/src/core/lib/uri/uri_parser.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_URI_URI_PARSER_H
-#define GRPC_CORE_LIB_URI_URI_PARSER_H
+#ifndef GRPC_SRC_CORE_LIB_URI_URI_PARSER_H
+#define GRPC_SRC_CORE_LIB_URI_URI_PARSER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -98,4 +98,4 @@ class URI {
 };
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_URI_URI_PARSER_H
+#endif  // GRPC_SRC_CORE_LIB_URI_URI_PARSER_H

data/src/core/plugin_registry/grpc_plugin_registry.cc

@@ -50,6 +50,7 @@ extern void RegisterServiceConfigChannelArgFilter(
 extern void RegisterExtraFilters(CoreConfiguration::Builder* builder);
 extern void RegisterResourceQuota(CoreConfiguration::Builder* builder);
 extern void FaultInjectionFilterRegister(CoreConfiguration::Builder* builder);
+extern void RegisterBackendMetricFilter(CoreConfiguration::Builder* builder);
 extern void RegisterNativeDnsResolver(CoreConfiguration::Builder* builder);
 extern void RegisterAresDnsResolver(CoreConfiguration::Builder* builder);
 extern void RegisterSockaddrResolver(CoreConfiguration::Builder* builder);
@@ -60,6 +61,8 @@ extern void RegisterOutlierDetectionLbPolicy(
 extern void RegisterWeightedTargetLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterPickFirstLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterRoundRobinLbPolicy(CoreConfiguration::Builder* builder);
+extern void RegisterWeightedRoundRobinLbPolicy(
+    CoreConfiguration::Builder* builder);
 extern void RegisterRingHashLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
 #ifndef GRPC_NO_RLS
@@ -82,6 +85,7 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   RegisterWeightedTargetLbPolicy(builder);
   RegisterPickFirstLbPolicy(builder);
   RegisterRoundRobinLbPolicy(builder);
+  RegisterWeightedRoundRobinLbPolicy(builder);
   RegisterRingHashLbPolicy(builder);
   BuildClientChannelConfiguration(builder);
   SecurityRegisterHandshakerFactories(builder);
@@ -107,6 +111,7 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
 #endif  // !GRPC_NO_RLS
   // Run last so it gets a consistent location.
   // TODO(ctiller): Is this actually necessary?
+  RegisterBackendMetricFilter(builder);
   RegisterSecurityFilters(builder);
   RegisterExtraFilters(builder);
   RegisterBuiltins(builder);

data/src/core/tsi/alts/crypt/gsec.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_CRYPT_GSEC_H
-#define GRPC_CORE_TSI_ALTS_CRYPT_GSEC_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H
+#define GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H
 
 #include <grpc/support/port_platform.h>
 
@@ -456,4 +456,4 @@ grpc_status_code gsec_aes_gcm_aead_crypter_create(const uint8_t* key,
                                                   gsec_aead_crypter** crypter,
                                                   char** error_details);
 
-#endif  // GRPC_CORE_TSI_ALTS_CRYPT_GSEC_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H

data/src/core/tsi/alts/frame_protector/alts_counter.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
-#define GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
+#define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -95,4 +95,4 @@ unsigned char* alts_counter_get_counter(alts_counter* crypter_counter);
 ///
 void alts_counter_destroy(alts_counter* crypter_counter);
 
-#endif  // GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H

data/src/core/tsi/alts/frame_protector/alts_crypter.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
-#define GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
+#define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -252,4 +252,4 @@ grpc_status_code alts_unseal_crypter_create(gsec_aead_crypter* gc,
 ///
 void alts_crypter_destroy(alts_crypter* crypter);
 
-#endif  // GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H

data/src/core/tsi/alts/frame_protector/alts_frame_protector.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
-#define GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
+#define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -52,4 +52,4 @@ tsi_result alts_create_frame_protector(const uint8_t* key, size_t key_size,
                                        size_t* max_protected_frame_size,
                                        tsi_frame_protector** self);
 
-#endif  // GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H

data/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H
-#define GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H
+#define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H
 
 #include <grpc/support/port_platform.h>
 
@@ -110,4 +110,4 @@ size_t alts_record_protocol_crypter_num_overhead_bytes(const alts_crypter* c);
 
 void alts_record_protocol_crypter_destruct(alts_crypter* c);
 
-#endif  // GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H

data/src/core/tsi/alts/frame_protector/frame_handler.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
-#define GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
+#define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -233,4 +233,4 @@ unsigned char* alts_get_output_buffer(alts_frame_reader* reader);
 ///
 void alts_destroy_frame_reader(alts_frame_reader* reader);
 
-#endif  // GRPC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H

data/src/core/tsi/alts/handshaker/alts_handshaker_client.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H
-#define GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H
+#define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -157,4 +157,4 @@ alts_handshaker_client* alts_grpc_handshaker_client_create(
 void alts_handshaker_client_handle_response(alts_handshaker_client* client,
                                             bool is_ok);
 
-#endif  // GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H

data/src/core/tsi/alts/handshaker/alts_shared_resource.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H
-#define GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H
+#define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -69,4 +69,4 @@ void grpc_alts_shared_resource_dedicated_init();
 void grpc_alts_shared_resource_dedicated_start(
     const char* handshaker_service_url);
 
-#endif  // GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H

data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H
-#define GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H
+#define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -101,4 +101,4 @@ void alts_tsi_handshaker_result_set_unused_bytes(tsi_handshaker_result* result,
 ///
 bool alts_tsi_handshaker_has_shutdown(alts_tsi_handshaker* handshaker);
 
-#endif  // GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H

data/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_PRIVATE_H
-#define GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_PRIVATE_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_PRIVATE_H
+#define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_PRIVATE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -86,4 +86,4 @@ void alts_handshaker_client_ref_for_testing(alts_handshaker_client* c);
 }  // namespace internal
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_PRIVATE_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_PRIVATE_H

data/src/core/tsi/alts/handshaker/alts_tsi_utils.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H
-#define GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H
+#define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -50,4 +50,4 @@ tsi_result alts_tsi_utils_convert_to_tsi_result(grpc_status_code code);
 grpc_gcp_HandshakerResp* alts_tsi_utils_deserialize_response(
     grpc_byte_buffer* resp_buffer, upb_Arena* arena);
 
-#endif  // GRPC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H

data/src/core/tsi/alts/handshaker/transport_security_common_api.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H
-#define GRPC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H
+#define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H
 
 #include <grpc/support/port_platform.h>
 
@@ -169,4 +169,4 @@ int grpc_gcp_rpc_protocol_version_compare(
 }  // namespace internal
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
-#define GRPC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
+#define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -50,4 +50,4 @@ tsi_result alts_grpc_integrity_only_record_protocol_create(
     gsec_aead_crypter* crypter, size_t overflow_size, bool is_client,
     bool is_protect, bool enable_extra_copy, alts_grpc_record_protocol** rp);
 
-#endif  // GRPC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
-#define GRPC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
+#ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
+#define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -45,4 +45,4 @@ tsi_result alts_grpc_privacy_integrity_record_protocol_create(
     gsec_aead_crypter* crypter, size_t overflow_size, bool is_client,
     bool is_protect, alts_grpc_record_protocol** rp);
 
-#endif  // GRPC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
+#endif  // GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H