grpc 1.68.1 → 1.69.0.pre1

data/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c

@@ -33,7 +33,7 @@ const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__TcpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__TcpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
 };
@@ -44,7 +44,7 @@ static const upb_MiniTableField envoy_config_core_v3_QuicKeepAliveSettings__fiel
 };
 
 const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = {
-  &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0],
+  &envoy_config_core_v3_QuicKeepAliveSettings__submsgs[0],
   &envoy_config_core_v3_QuicKeepAliveSettings__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -53,7 +53,7 @@ const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__QuicKeepAliveSettings_msg_init_ptr = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions__submsgs[6] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields
 };
 
 const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = {
-  &envoy_config_core_v3_QuicProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_QuicProtocolOptions__submsgs[0],
   &envoy_config_core_v3_QuicProtocolOptions__fields[0],
   UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -115,7 +115,7 @@ const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_ini
 };
 
 const upb_MiniTable* envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr},
@@ -130,7 +130,7 @@ static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOpti
 };
 
 const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init = {
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0],
+  &envoy_config_core_v3_AlternateProtocolsCacheOptions__submsgs[0],
   &envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0],
   UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -170,7 +170,7 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__Alt
 };
 
 const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpProtocolOptions__fields
 };
 
 const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = {
-  &envoy_config_core_v3_HttpProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_HttpProtocolOptions__submsgs[0],
   &envoy_config_core_v3_HttpProtocolOptions__fields[0],
   UPB_SIZE(40, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -207,7 +207,7 @@ const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__HttpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -228,7 +228,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions__field
 };
 
 const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = {
-  &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_Http1ProtocolOptions__submsgs[0],
   &envoy_config_core_v3_Http1ProtocolOptions__fields[0],
   UPB_SIZE(56, 64), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -255,7 +255,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
 };
@@ -266,7 +266,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions_Header
 };
 
 const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init = {
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0],
+  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__submsgs[0],
   &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -303,7 +303,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm
 };
 
 const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -318,7 +318,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeepaliveSettings__fields[4
 };
 
 const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = {
-  &envoy_config_core_v3_KeepaliveSettings_submsgs[0],
+  &envoy_config_core_v3_KeepaliveSettings__submsgs[0],
   &envoy_config_core_v3_KeepaliveSettings__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -327,7 +327,7 @@ const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__KeepaliveSettings_msg_init_ptr = &envoy__config__core__v3__KeepaliveSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions__submsgs[13] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -363,7 +363,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions__field
 };
 
 const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = {
-  &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_Http2ProtocolOptions__submsgs[0],
   &envoy_config_core_v3_Http2ProtocolOptions__fields[0],
   UPB_SIZE(72, 120), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -390,7 +390,7 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
 };
@@ -401,7 +401,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions_Settin
 };
 
 const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init = {
-  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0],
+  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__submsgs[0],
   &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -410,7 +410,7 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParam
 };
 
 const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr},
 };
 
@@ -419,7 +419,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcProtocolOptions__fields
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = {
-  &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_GrpcProtocolOptions__submsgs[0],
   &envoy_config_core_v3_GrpcProtocolOptions__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -428,7 +428,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcProtocolOptions_msg_init_ptr = &envoy__config__core__v3__GrpcProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
 };
@@ -441,7 +441,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__field
 };
 
 const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = {
-  &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_Http3ProtocolOptions__submsgs[0],
   &envoy_config_core_v3_Http3ProtocolOptions__fields[0],
   UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layo
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -242,4 +242,4 @@ UPB_INLINE struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_confi
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c

@@ -37,7 +37,7 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_in
 };
 
 const upb_MiniTable* envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr},
 };
 
@@ -47,7 +47,7 @@ static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolConfig__fields
 };
 
 const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = {
-  &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0],
+  &envoy_config_core_v3_ProxyProtocolConfig__submsgs[0],
   &envoy_config_core_v3_ProxyProtocolConfig__fields[0],
   24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_fil
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -241,4 +241,4 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c

@@ -38,7 +38,7 @@ const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__DnsResolverOptions_msg_init_ptr = &envoy__config__core__v3__DnsResolverOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolverOptions_msg_init_ptr},
 };
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_core_v3_DnsResolutionConfig__fields
 };
 
 const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = {
-  &envoy_config_core_v3_DnsResolutionConfig_submsgs[0],
+  &envoy_config_core_v3_DnsResolutionConfig__submsgs[0],
   &envoy_config_core_v3_DnsResolutionConfig__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layo
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -298,4 +298,4 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_Socket
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c

@@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__SocketOption_msg_init_ptr = &envoy__config__core__v3__SocketOption_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr},
 };
 
@@ -55,7 +55,7 @@ static const upb_MiniTableField envoy_config_core_v3_SocketOptionsOverride__fiel
 };
 
 const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = {
-  &envoy_config_core_v3_SocketOptionsOverride_submsgs[0],
+  &envoy_config_core_v3_SocketOptionsOverride__submsgs[0],
   &envoy_config_core_v3_SocketOptionsOverride__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -353,4 +353,4 @@ UPB_INLINE struct envoy_config_core_v3_JsonFormatOptions* envoy_config_core_v3_S
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c

@@ -38,7 +38,7 @@ const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__JsonFormatOptions_msg_init_ptr = &envoy__config__core__v3__JsonFormatOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -56,7 +56,7 @@ static const upb_MiniTableField envoy_config_core_v3_SubstitutionFormatString__f
 };
 
 const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = {
-  &envoy_config_core_v3_SubstitutionFormatString_submsgs[0],
+  &envoy_config_core_v3_SubstitutionFormatString__submsgs[0],
   &envoy_config_core_v3_SubstitutionFormatString__fields[0],
   UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_p
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -134,4 +134,4 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocketConfi
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.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_config_core_v3_UdpSocketConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_UdpSocketConfig__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
 };
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_config_core_v3_UdpSocketConfig__fields[2]
 };
 
 const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = {
-  &envoy_config_core_v3_UdpSocketConfig_submsgs[0],
+  &envoy_config_core_v3_UdpSocketConfig__submsgs[0],
   &envoy_config_core_v3_UdpSocketConfig__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/config/core/v3/udp_socket_config.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -549,4 +549,4 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEnt
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c

@@ -21,7 +21,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init_ptr},
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment__
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment__submsgs[0],
   &envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0],
   UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_P
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__submsgs[0],
   &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0],
   UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -83,7 +83,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_m
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
 };
 
@@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_P
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__submsgs[0],
   &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr},
 };
 
@@ -116,7 +116,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_N
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__submsgs[0],
   &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0],
   48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h

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

data/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1089,4 +1089,4 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_ */