grpc 1.68.1 → 1.69.0.pre1

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1892,4 +1892,4 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntr
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_ */

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

@@ -24,7 +24,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -41,7 +41,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[5] = {
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = {
-  &envoy_config_core_v3_GrpcService_submsgs[0],
+  &envoy_config_core_v3_GrpcService__submsgs[0],
   &envoy_config_core_v3_GrpcService__fields[0],
   UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -60,7 +60,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService_msg_init_ptr = &envoy__config__core__v3__GrpcService_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
 };
@@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fiel
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = {
-  &envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[0],
+  &envoy_config_core_v3_GrpcService_EnvoyGrpc__submsgs[0],
   &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0],
   UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -93,7 +93,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
@@ -113,7 +113,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc__fie
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0],
   UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -132,7 +132,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init =
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
@@ -145,7 +145,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_SslC
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -164,7 +164,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLoca
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr},
@@ -177,7 +177,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0],
   UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCre
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr},
@@ -211,7 +211,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Call
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0],
   UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -272,7 +272,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Call
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -337,7 +337,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init_ptr},
 };
 
@@ -346,7 +346,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -376,7 +376,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg
 };
 
 const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr},
 };
 
@@ -386,7 +386,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan
 };
 
 const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__submsgs[0],
   &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__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/core/v3/grpc_service.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -55,4 +55,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -2109,4 +2109,4 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_TlsOptions_add_alpn_protocols(e
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_ */

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

@@ -47,7 +47,7 @@ const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__HealthStatusSet_msg_init_ptr = &envoy__config__core__v3__HealthStatusSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_submsgs[21] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck__submsgs[21] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -100,7 +100,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[25] = {
 };
 
 const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck__submsgs[0],
   &envoy_config_core_v3_HealthCheck__fields[0],
   UPB_SIZE(112, 184), 25, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -164,7 +164,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr = &envoy__config__core__v3__HealthCheck__Payload_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck__submsgs[7] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
@@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_HttpHealthCheck
 };
 
 const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_HttpHealthCheck__submsgs[0],
   &envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0],
   UPB_SIZE(72, 120), 12, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -217,7 +217,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in
 };
 
 const upb_MiniTable* envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr},
@@ -230,7 +230,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck_
 };
 
 const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_TcpHealthCheck__submsgs[0],
   &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -263,7 +263,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_i
 };
 
 const upb_MiniTable* envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
 };
 
@@ -274,7 +274,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_GrpcHealthCheck
 };
 
 const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__submsgs[0],
   &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -289,7 +289,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_in
 };
 
 const upb_MiniTable* envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -299,7 +299,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_CustomHealthChe
 };
 
 const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_CustomHealthCheck__submsgs[0],
   &envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -45,4 +45,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -172,4 +172,4 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_H
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_ */

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

@@ -18,7 +18,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
 };
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpService__fields[2] = {
 };
 
 const upb_MiniTable envoy__config__core__v3__HttpService_msg_init = {
-  &envoy_config_core_v3_HttpService_submsgs[0],
+  &envoy_config_core_v3_HttpService__submsgs[0],
   &envoy_config_core_v3_HttpService__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -149,4 +149,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_mutable
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_ */

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

@@ -18,7 +18,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
 };
 
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpUri__fields[3] = {
 };
 
 const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = {
-  &envoy_config_core_v3_HttpUri_submsgs[0],
+  &envoy_config_core_v3_HttpUri__submsgs[0],
   &envoy_config_core_v3_HttpUri__fields[0],
   UPB_SIZE(40, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -2503,4 +2503,4 @@ UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_match_upstre
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_ */