grpc 1.68.1 → 1.69.0.pre1

data/src/core/ext/transport/chttp2/transport/frame_window_update.cc

@@ -29,6 +29,8 @@
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/stream_lists.h"
+#include "src/core/telemetry/stats.h"
+#include "src/core/util/time.h"
 
 grpc_slice grpc_chttp2_window_update_create(
     uint32_t id, uint32_t window_delta,
@@ -101,9 +103,17 @@ grpc_error_handle grpc_chttp2_window_update_parser_parse(
 
     if (t->incoming_stream_id != 0) {
       if (s != nullptr) {
+        grpc_core::Timestamp now = grpc_core::Timestamp::Now();
+        if (s->last_window_update_time != grpc_core::Timestamp::InfPast()) {
+          grpc_core::global_stats().IncrementHttp2StreamWindowUpdatePeriod(
+              (now - s->last_window_update_time).millis());
+        }
+        s->last_window_update_time = now;
         grpc_core::chttp2::StreamFlowControl::OutgoingUpdateContext(
             &s->flow_control)
             .RecvUpdate(received_update);
+        grpc_core::global_stats().IncrementHttp2StreamRemoteWindowUpdate(
+            received_update);
         if (grpc_chttp2_list_remove_stalled_by_stream(t, s)) {
           grpc_chttp2_mark_stream_writable(t, s);
           grpc_chttp2_initiate_write(
@@ -113,6 +123,14 @@ grpc_error_handle grpc_chttp2_window_update_parser_parse(
     } else {
       grpc_core::chttp2::TransportFlowControl::OutgoingUpdateContext upd(
           &t->flow_control);
+      grpc_core::Timestamp now = grpc_core::Timestamp::Now();
+      if (t->last_window_update_time != grpc_core::Timestamp::InfPast()) {
+        grpc_core::global_stats().IncrementHttp2TransportWindowUpdatePeriod(
+            (now - t->last_window_update_time).millis());
+      }
+      t->last_window_update_time = now;
+      grpc_core::global_stats().IncrementHttp2TransportRemoteWindowUpdate(
+          received_update);
       upd.RecvUpdate(received_update);
       if (upd.Finish() == grpc_core::chttp2::StallEdge::kUnstalled) {
         grpc_chttp2_initiate_write(

data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc

@@ -328,7 +328,7 @@ void SliceIndex::EmitTo(absl::string_view key, const Slice& value,
   for (It it = values_.begin(); it != values_.end(); ++it) {
     if (value == it->value) {
       // Got a hit... is it still in the decode table?
-      if (table.ConvertableToDynamicIndex(it->index)) {
+      if (table.ConvertibleToDynamicIndex(it->index)) {
         // Yes, emit the index and proceed to cleanup.
         encoder->EmitIndexed(table.DynamicIndex(it->index));
       } else {
@@ -342,7 +342,7 @@ void SliceIndex::EmitTo(absl::string_view key, const Slice& value,
       // If there are entries at the end of the array, and those entries are no
       // longer in the table, remove them.
       while (!values_.empty() &&
-             !table.ConvertableToDynamicIndex(values_.back().index)) {
+             !table.ConvertibleToDynamicIndex(values_.back().index)) {
         values_.pop_back();
       }
       // All done, early out.
@@ -440,7 +440,7 @@ void Compressor<HttpMethodMetadata, HttpMethodCompressor>::EncodeWith(
 
 void Encoder::EncodeAlwaysIndexed(uint32_t* index, absl::string_view key,
                                   Slice value, size_t) {
-  if (compressor_->table_.ConvertableToDynamicIndex(*index)) {
+  if (compressor_->table_.ConvertibleToDynamicIndex(*index)) {
     EmitIndexed(compressor_->table_.DynamicIndex(*index));
   } else {
     *index = EmitLitHdrWithNonBinaryStringKeyIncIdx(
@@ -451,7 +451,7 @@ void Encoder::EncodeAlwaysIndexed(uint32_t* index, absl::string_view key,
 void Encoder::EncodeIndexedKeyWithBinaryValue(uint32_t* index,
                                               absl::string_view key,
                                               Slice value) {
-  if (compressor_->table_.ConvertableToDynamicIndex(*index)) {
+  if (compressor_->table_.ConvertibleToDynamicIndex(*index)) {
     EmitLitHdrWithBinaryStringKeyNotIdx(
         compressor_->table_.DynamicIndex(*index), std::move(value));
   } else {
@@ -478,7 +478,7 @@ void TimeoutCompressorImpl::EncodeWith(absl::string_view key,
   auto& table = encoder->hpack_table();
   for (size_t i = 0; i < kNumPreviousValues; i++) {
     const auto& previous = previous_timeouts_[i];
-    if (!table.ConvertableToDynamicIndex(previous.index)) continue;
+    if (!table.ConvertibleToDynamicIndex(previous.index)) continue;
     const double ratio = timeout.RatioVersus(previous.timeout);
     // If the timeout we're sending is shorter than a previous timeout, but
     // within 3% of it, we'll consider sending it.

data/src/core/ext/transport/chttp2/transport/hpack_encoder.h

@@ -103,7 +103,7 @@ class Encoder {
 // void EncodeWith(MetadataTrait, const MetadataTrait::ValueType, Encoder*);
 // This method figures out how to encode the value, and then delegates to
 // Encoder to perform the encoding.
-template <typename MetadataTrait, typename CompressonTraits>
+template <typename MetadataTrait, typename CompressionTraits>
 class Compressor;
 
 // No compression encoder: just emit the key and value as literals.
@@ -173,7 +173,7 @@ class Compressor<MetadataTrait, StableValueCompressor> {
                   Encoder* encoder) {
     auto& table = encoder->hpack_table();
     if (previously_sent_value_ == value &&
-        table.ConvertableToDynamicIndex(previously_sent_index_)) {
+        table.ConvertibleToDynamicIndex(previously_sent_index_)) {
       encoder->EmitIndexed(table.DynamicIndex(previously_sent_index_));
       return;
     }
@@ -231,7 +231,7 @@ class Compressor<MetadataTrait, SmallIntegralValuesCompressor<N>> {
     auto& table = encoder->hpack_table();
     if (static_cast<size_t>(value) < N) {
       index = &previously_sent_[static_cast<uint32_t>(value)];
-      if (table.ConvertableToDynamicIndex(*index)) {
+      if (table.ConvertibleToDynamicIndex(*index)) {
         encoder->EmitIndexed(table.DynamicIndex(*index));
         return;
       }

data/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h

@@ -56,9 +56,9 @@ class HPackEncoderTable {
     return 1 + hpack_constants::kLastStaticEntry + tail_remote_index_ +
            table_elems_ - index;
   }
-  // Check if an element index is convertable to a dynamic index
-  // Note that 0 is always not convertable
-  bool ConvertableToDynamicIndex(uint32_t index) const {
+  // Check if an element index is convertible to a dynamic index
+  // Note that 0 is always not convertible
+  bool ConvertibleToDynamicIndex(uint32_t index) const {
     return index > tail_remote_index_;
   }
 

data/src/core/ext/transport/chttp2/transport/hpack_parser.cc

@@ -403,7 +403,7 @@ absl::optional<std::vector<uint8_t>> HPackParser::String::Unbase64Loop(
   }
 
   std::vector<uint8_t> out;
-  out.reserve(3 * (end - cur) / 4 + 3);
+  out.reserve((3 * (end - cur) / 4) + 3);
 
   // Decode 4 bytes at a time while we can
   while (end - cur >= 4) {

data/src/core/ext/transport/chttp2/transport/http2_settings.cc

@@ -58,6 +58,9 @@ void Http2Settings::Diff(
     cb(kGrpcPreferredReceiveCryptoFrameSizeWireId,
        preferred_receive_crypto_message_size_);
   }
+  if (allow_security_frame_ != old.allow_security_frame_) {
+    cb(kGrpcAllowSecurityFrameWireId, allow_security_frame_);
+  }
 }
 
 std::string Http2Settings::WireIdToName(uint16_t wire_id) {
@@ -78,6 +81,8 @@ std::string Http2Settings::WireIdToName(uint16_t wire_id) {
       return std::string(allow_true_binary_metadata_name());
     case kGrpcPreferredReceiveCryptoFrameSizeWireId:
       return std::string(preferred_receive_crypto_message_size_name());
+    case kGrpcAllowSecurityFrameWireId:
+      return std::string(allow_security_frame_name());
     default:
       return absl::StrCat("UNKNOWN (", wire_id, ")");
   }
@@ -119,6 +124,10 @@ grpc_http2_error_code Http2Settings::Apply(uint16_t key, uint32_t value) {
           Clamp(value, min_preferred_receive_crypto_message_size(),
                 max_preferred_receive_crypto_message_size());
       break;
+    case kGrpcAllowSecurityFrameWireId:
+      if (value > 1) return GRPC_HTTP2_PROTOCOL_ERROR;
+      allow_security_frame_ = value != 0;
+      break;
   }
   return GRPC_HTTP2_NO_ERROR;
 }

data/src/core/ext/transport/chttp2/transport/http2_settings.h

@@ -42,6 +42,7 @@ class Http2Settings {
     kMaxHeaderListSizeWireId = 6,
     kGrpcAllowTrueBinaryMetadataWireId = 65027,
     kGrpcPreferredReceiveCryptoFrameSizeWireId = 65028,
+    kGrpcAllowSecurityFrameWireId = 65029,
   };
 
   void Diff(bool is_first_send, const Http2Settings& old,
@@ -60,6 +61,7 @@ class Http2Settings {
   bool allow_true_binary_metadata() const {
     return allow_true_binary_metadata_;
   }
+  bool allow_security_frame() const { return allow_security_frame_; }
 
   void SetHeaderTableSize(uint32_t x) { header_table_size_ = x; }
   void SetMaxConcurrentStreams(uint32_t x) { max_concurrent_streams_ = x; }
@@ -79,6 +81,7 @@ class Http2Settings {
         Clamp(x, min_preferred_receive_crypto_message_size(),
               max_preferred_receive_crypto_message_size());
   }
+  void SetAllowSecurityFrame(bool x) { allow_security_frame_ = x; }
 
   static absl::string_view header_table_size_name() {
     return "HEADER_TABLE_SIZE";
@@ -100,6 +103,9 @@ class Http2Settings {
   static absl::string_view preferred_receive_crypto_message_size_name() {
     return "GRPC_PREFERRED_RECEIVE_MESSAGE_SIZE";
   }
+  static absl::string_view allow_security_frame_name() {
+    return "GRPC_ALLOW_SECURITY_FRAME";
+  }
 
   static uint32_t max_initial_window_size() { return 2147483647u; }
   static uint32_t max_max_frame_size() { return 16777215u; }
@@ -120,7 +126,8 @@ class Http2Settings {
            preferred_receive_crypto_message_size_ ==
                rhs.preferred_receive_crypto_message_size_ &&
            enable_push_ == rhs.enable_push_ &&
-           allow_true_binary_metadata_ == rhs.allow_true_binary_metadata_;
+           allow_true_binary_metadata_ == rhs.allow_true_binary_metadata_ &&
+           allow_security_frame_ == rhs.allow_security_frame_;
   }
 
   bool operator!=(const Http2Settings& rhs) const { return !operator==(rhs); }
@@ -134,6 +141,7 @@ class Http2Settings {
   uint32_t preferred_receive_crypto_message_size_ = 0u;
   bool enable_push_ = true;
   bool allow_true_binary_metadata_ = false;
+  bool allow_security_frame_ = false;
 };
 
 class Http2SettingsManager {

data/src/core/ext/transport/chttp2/transport/internal.h

@@ -45,6 +45,7 @@
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 #include "src/core/ext/transport/chttp2/transport/frame_ping.h"
 #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h"
+#include "src/core/ext/transport/chttp2/transport/frame_security.h"
 #include "src/core/ext/transport/chttp2/transport/frame_settings.h"
 #include "src/core/ext/transport/chttp2/transport/frame_window_update.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
@@ -70,6 +71,7 @@
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/lib/transport/transport_framing_endpoint_extension.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/telemetry/tcp_tracer.h"
 #include "src/core/util/bitset.h"
@@ -255,12 +257,19 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport,
   void SetPollsetSet(grpc_stream* stream,
                      grpc_pollset_set* pollset_set) override;
   void PerformOp(grpc_transport_op* op) override;
+  // Callback for transport framing endpoint extension to send security frames
+  // received directly from the endpoint on wire.
+  void WriteSecurityFrame(grpc_core::SliceBuffer* data);
+  void WriteSecurityFrameLocked(grpc_core::SliceBuffer* data);
 
   grpc_core::OrphanablePtr<grpc_endpoint> ep;
   grpc_core::Mutex ep_destroy_mu;  // Guards endpoint destruction only.
 
   grpc_core::Slice peer_string;
 
+  grpc_core::TransportFramingEndpointExtension*
+      transport_framing_endpoint_extension = nullptr;
+
   grpc_core::MemoryOwner memory_owner;
   const grpc_core::MemoryAllocator::Reservation self_reservation;
   grpc_core::ReclamationSweep active_reclamation;
@@ -397,6 +406,8 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport,
   } simple;
   /// parser for goaway frames
   grpc_chttp2_goaway_parser goaway_parser;
+  // parser for secure frames
+  grpc_chttp2_security_frame_parser security_frame_parser;
 
   grpc_core::chttp2::TransportFlowControl flow_control;
   /// initial window change. This is tracked as we parse settings frames from
@@ -537,11 +548,16 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport,
   /// True if we count stream allocation (instead of HTTP2 concurrency) for
   /// MAX_CONCURRENT_STREAMS
   bool max_concurrent_streams_overload_protection = false;
+  bool max_concurrent_streams_reject_on_client = false;
 
   // What percentage of rst_stream frames on the server should cause a ping
   // frame to be generated.
   uint8_t ping_on_rst_stream_percent;
 
+  // The last time a transport window update was received.
+  grpc_core::Timestamp last_window_update_time =
+      grpc_core::Timestamp::InfPast();
+
   GPR_NO_UNIQUE_ADDRESS grpc_core::latent_see::Flow write_flow;
 };
 
@@ -677,6 +693,10 @@ struct grpc_chttp2_stream {
 
   /// Whether the bytes needs to be traced using Fathom
   bool traced = false;
+
+  // The last time a stream window update was received.
+  grpc_core::Timestamp last_window_update_time =
+      grpc_core::Timestamp::InfPast();
 };
 
 #define GRPC_ARG_PING_TIMEOUT_MS "grpc.http2.ping_timeout_ms"
@@ -687,6 +707,11 @@ struct grpc_chttp2_stream {
 #define GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION \
   "grpc.http.overload_protection"
 
+// EXPERIMENTAL: Fail requests at the client if the client is over max
+// concurrent streams, so they may be retried elsewhere.
+#define GRPC_ARG_MAX_CONCURRENT_STREAMS_REJECT_ON_CLIENT \
+  "grpc.http.max_concurrent_streams_reject_on_client"
+
 /// Transport writing call flow:
 /// grpc_chttp2_initiate_write() is called anywhere that we know bytes need to
 /// go out on the wire.

data/src/core/ext/transport/chttp2/transport/legacy_frame.h

@@ -33,6 +33,7 @@ typedef struct grpc_chttp2_transport grpc_chttp2_transport;
 #define GRPC_CHTTP2_FRAME_PING 6
 #define GRPC_CHTTP2_FRAME_GOAWAY 7
 #define GRPC_CHTTP2_FRAME_WINDOW_UPDATE 8
+#define GRPC_CHTTP2_FRAME_SECURITY 200
 
 #define GRPC_CHTTP2_DATA_FLAG_END_STREAM 1
 #define GRPC_CHTTP2_FLAG_ACK 1

data/src/core/ext/transport/chttp2/transport/parsing.cc

@@ -47,6 +47,7 @@
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 #include "src/core/ext/transport/chttp2/transport/frame_ping.h"
 #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h"
+#include "src/core/ext/transport/chttp2/transport/frame_security.h"
 #include "src/core/ext/transport/chttp2/transport/frame_settings.h"
 #include "src/core/ext/transport/chttp2/transport/frame_window_update.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
@@ -88,6 +89,7 @@ static grpc_error_handle init_window_update_frame_parser(
     grpc_chttp2_transport* t);
 static grpc_error_handle init_ping_parser(grpc_chttp2_transport* t);
 static grpc_error_handle init_goaway_parser(grpc_chttp2_transport* t);
+static grpc_error_handle init_security_frame_parser(grpc_chttp2_transport* t);
 static grpc_error_handle init_non_header_skip_frame_parser(
     grpc_chttp2_transport* t);
 
@@ -194,6 +196,8 @@ std::string FrameTypeString(uint8_t frame_type, uint8_t flags) {
       return MakeFrameTypeString("GOAWAY", flags, {});
     case GRPC_CHTTP2_FRAME_WINDOW_UPDATE:
       return MakeFrameTypeString("WINDOW_UPDATE", flags, {});
+    case GRPC_CHTTP2_FRAME_SECURITY:
+      return MakeFrameTypeString("SECURITY", flags, {});
     default:
       return MakeFrameTypeString(
           absl::StrCat("UNKNOWN_FRAME_TYPE_", static_cast<int>(frame_type)),
@@ -451,6 +455,14 @@ static grpc_error_handle init_frame_parser(grpc_chttp2_transport* t,
       return init_ping_parser(t);
     case GRPC_CHTTP2_FRAME_GOAWAY:
       return init_goaway_parser(t);
+    case GRPC_CHTTP2_FRAME_SECURITY:
+      if (!t->settings.peer().allow_security_frame()) {
+        if (GRPC_TRACE_FLAG_ENABLED(http)) {
+          LOG(ERROR) << "Security frame received but not allowed, ignoring";
+        }
+        return init_non_header_skip_frame_parser(t);
+      }
+      return init_security_frame_parser(t);
     default:
       GRPC_TRACE_LOG(http, ERROR)
           << "Unknown frame type "
@@ -882,6 +894,16 @@ static grpc_error_handle init_settings_frame_parser(grpc_chttp2_transport* t) {
   return absl::OkStatus();
 }
 
+static grpc_error_handle init_security_frame_parser(grpc_chttp2_transport* t) {
+  grpc_error_handle err =
+      grpc_chttp2_security_frame_parser_begin_frame(&t->security_frame_parser);
+  if (!err.ok()) return err;
+  t->parser = grpc_chttp2_transport::Parser{
+      "security_frame", grpc_chttp2_security_frame_parser_parse,
+      &t->security_frame_parser};
+  return absl::OkStatus();
+}
+
 static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t,
                                            const grpc_slice& slice,
                                            int is_last) {

data/src/core/ext/transport/chttp2/transport/write_size_policy.h

@@ -39,7 +39,7 @@ class Chttp2WriteSizePolicy {
     return Duration::Milliseconds(300);
   }
 
-  // What size should be targetted for the next write.
+  // What size should be targeted for the next write.
   size_t WriteTargetSize();
   // Notify the policy that a write of some size has begun.
   // EndWrite must be called when the write completes.

data/src/core/ext/transport/inproc/inproc_transport.cc

@@ -23,8 +23,8 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/ext/transport/inproc/legacy_inproc_transport.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/promise.h"

data/src/core/ext/transport/inproc/legacy_inproc_transport.cc

@@ -42,9 +42,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"

data/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -766,4 +766,4 @@ UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c

@@ -17,7 +17,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_Certificates_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Certificates__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__Certificate_msg_init_ptr},
 };
 
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = {
 };
 
 const upb_MiniTable envoy__admin__v3__Certificates_msg_init = {
-  &envoy_admin_v3_Certificates_submsgs[0],
+  &envoy_admin_v3_Certificates__submsgs[0],
   &envoy_admin_v3_Certificates__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable envoy__admin__v3__Certificates_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__Certificates_msg_init_ptr = &envoy__admin__v3__Certificates_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_Certificate_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Certificate__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr},
 };
@@ -50,7 +50,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = {
 };
 
 const upb_MiniTable envoy__admin__v3__Certificate_msg_init = {
-  &envoy_admin_v3_Certificate_submsgs[0],
+  &envoy_admin_v3_Certificate__submsgs[0],
   &envoy_admin_v3_Certificate__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -65,7 +65,7 @@ const upb_MiniTable envoy__admin__v3__Certificate_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__Certificate_msg_init_ptr = &envoy__admin__v3__Certificate_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SubjectAlternateName_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
@@ -83,7 +83,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = {
 };
 
 const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = {
-  &envoy_admin_v3_CertificateDetails_submsgs[0],
+  &envoy_admin_v3_CertificateDetails__submsgs[0],
   &envoy_admin_v3_CertificateDetails__fields[0],
   UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -102,7 +102,7 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__CertificateDetails_msg_init_ptr = &envoy__admin__v3__CertificateDetails_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -113,7 +113,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__f
 };
 
 const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = {
-  &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0],
+  &envoy_admin_v3_CertificateDetails_OcspDetails__submsgs[0],
   &envoy_admin_v3_CertificateDetails_OcspDetails__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -880,4 +880,4 @@ UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admi
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c

@@ -22,7 +22,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_Clusters_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Clusters__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClusterStatus_msg_init_ptr},
 };
 
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = {
 };
 
 const upb_MiniTable envoy__admin__v3__Clusters_msg_init = {
-  &envoy_admin_v3_Clusters_submsgs[0],
+  &envoy_admin_v3_Clusters__submsgs[0],
   &envoy_admin_v3_Clusters__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -44,7 +44,7 @@ const upb_MiniTable envoy__admin__v3__Clusters_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__Clusters_msg_init_ptr = &envoy__admin__v3__Clusters_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostStatus_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -63,7 +63,7 @@ static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = {
 };
 
 const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = {
-  &envoy_admin_v3_ClusterStatus_submsgs[0],
+  &envoy_admin_v3_ClusterStatus__submsgs[0],
   &envoy_admin_v3_ClusterStatus__fields[0],
   UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__ClusterStatus_msg_init_ptr = &envoy__admin__v3__ClusterStatus_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus__submsgs[6] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SimpleMetric_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostHealthStatus_msg_init_ptr},
@@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = {
 };
 
 const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = {
-  &envoy_admin_v3_HostStatus_submsgs[0],
+  &envoy_admin_v3_HostStatus__submsgs[0],
   &envoy_admin_v3_HostStatus__fields[0],
   UPB_SIZE(56, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -777,4 +777,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSe
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_ */