grpc 1.68.1 → 1.69.0.pre1

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

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

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

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

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1011,4 +1011,4 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_parent_st
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/server_info.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_admin_v3_ServerInfo_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ServerInfo__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CommandLineOptions_msg_init_ptr},
@@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = {
 };
 
 const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = {
-  &envoy_admin_v3_ServerInfo_submsgs[0],
+  &envoy_admin_v3_ServerInfo__submsgs[0],
   &envoy_admin_v3_ServerInfo__fields[0],
   UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__ServerInfo_msg_init_ptr = &envoy__admin__v3__ServerInfo_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions__submsgs[3] = {
   {.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},
@@ -101,7 +101,7 @@ static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[36] =
 };
 
 const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = {
-  &envoy_admin_v3_CommandLineOptions_submsgs[0],
+  &envoy_admin_v3_CommandLineOptions__submsgs[0],
   &envoy_admin_v3_CommandLineOptions__fields[0],
   UPB_SIZE(192, 304), 36, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -120,4 +120,4 @@ UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutab
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/tap.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_admin_v3_TapRequest_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_TapRequest__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__TapConfig_msg_init_ptr},
 };
 
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = {
 };
 
 const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = {
-  &envoy_admin_v3_TapRequest_submsgs[0],
+  &envoy_admin_v3_TapRequest__submsgs[0],
   &envoy_admin_v3_TapRequest__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

data/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_
-#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_
+#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_
+#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -128,4 +128,4 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ */
+#endif  /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h

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

data/src/core/ext/upb-gen/envoy/annotations/resource.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
-#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -91,7 +91,7 @@ UPB_INLINE const envoy_annotations_ResourceAnnotation* envoy_annotations_resourc
   const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const envoy_annotations_ResourceAnnotation* default_val = NULL;
   const envoy_annotations_ResourceAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -101,7 +101,7 @@ UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOpt
   const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -120,4 +120,4 @@ UPB_INLINE struct envoy_annotations_ResourceAnnotation* envoy_annotations_mutabl
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ */
+#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c

@@ -35,7 +35,7 @@ const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = {
 const upb_MiniTable* envoy__annotations__ResourceAnnotation_msg_init_ptr = &envoy__annotations__ResourceAnnotation_msg_init;
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension envoy_annotations_resource_ext = {
-  {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__ServiceOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &envoy__annotations__ResourceAnnotation_msg_init},
 

data/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1851,4 +1851,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.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_accesslog_v3_AccessLog_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLog__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
@@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] =
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = {
-  &envoy_config_accesslog_v3_AccessLog_submsgs[0],
+  &envoy_config_accesslog_v3_AccessLog__submsgs[0],
   &envoy_config_accesslog_v3_AccessLog__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__AccessLog_msg_init_ptr = &envoy__config__accesslog__v3__AccessLog_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter__submsgs[13] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__DurationFilter_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init_ptr},
@@ -88,7 +88,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__field
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = {
-  &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0],
+  &envoy_config_accesslog_v3_AccessLogFilter__submsgs[0],
   &envoy_config_accesslog_v3_AccessLogFilter__fields[0],
   UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -115,7 +115,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr = &envoy__config__accesslog__v3__AccessLogFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeUInt32_msg_init_ptr},
 };
 
@@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fiel
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = {
-  &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0],
+  &envoy_config_accesslog_v3_ComparisonFilter__submsgs[0],
   &envoy_config_accesslog_v3_ComparisonFilter__fields[0],
   24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -138,7 +138,7 @@ const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr = &envoy__config__accesslog__v3__ComparisonFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr},
 };
 
@@ -147,7 +147,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fiel
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = {
-  &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0],
+  &envoy_config_accesslog_v3_StatusCodeFilter__submsgs[0],
   &envoy_config_accesslog_v3_StatusCodeFilter__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -156,7 +156,7 @@ const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr},
 };
 
@@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = {
-  &envoy_config_accesslog_v3_DurationFilter_submsgs[0],
+  &envoy_config_accesslog_v3_DurationFilter__submsgs[0],
   &envoy_config_accesslog_v3_DurationFilter__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -194,7 +194,7 @@ const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__TraceableFilter_msg_init_ptr = &envoy__config__accesslog__v3__TraceableFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
 };
 
@@ -205,7 +205,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = {
-  &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0],
+  &envoy_config_accesslog_v3_RuntimeFilter__submsgs[0],
   &envoy_config_accesslog_v3_RuntimeFilter__fields[0],
   UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__RuntimeFilter_msg_init_ptr = &envoy__config__accesslog__v3__RuntimeFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
 };
 
@@ -229,7 +229,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] =
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = {
-  &envoy_config_accesslog_v3_AndFilter_submsgs[0],
+  &envoy_config_accesslog_v3_AndFilter__submsgs[0],
   &envoy_config_accesslog_v3_AndFilter__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -242,7 +242,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__AndFilter_msg_init_ptr = &envoy__config__accesslog__v3__AndFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
 };
 
@@ -251,7 +251,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] =
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = {
-  &envoy_config_accesslog_v3_OrFilter_submsgs[0],
+  &envoy_config_accesslog_v3_OrFilter__submsgs[0],
   &envoy_config_accesslog_v3_OrFilter__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -266,7 +266,7 @@ const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__OrFilter_msg_init_ptr = &envoy__config__accesslog__v3__OrFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
 };
 
@@ -275,7 +275,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = {
-  &envoy_config_accesslog_v3_HeaderFilter_submsgs[0],
+  &envoy_config_accesslog_v3_HeaderFilter__submsgs[0],
   &envoy_config_accesslog_v3_HeaderFilter__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -323,7 +323,7 @@ const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__GrpcStatusFilter_msg_init_ptr = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
 };
@@ -334,7 +334,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = {
-  &envoy_config_accesslog_v3_MetadataFilter_submsgs[0],
+  &envoy_config_accesslog_v3_MetadataFilter__submsgs[0],
   &envoy_config_accesslog_v3_MetadataFilter__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -364,7 +364,7 @@ const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__accesslog__v3__LogTypeFilter_msg_init_ptr = &envoy__config__accesslog__v3__LogTypeFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -374,7 +374,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__field
 };
 
 const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = {
-  &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0],
+  &envoy_config_accesslog_v3_ExtensionFilter__submsgs[0],
   &envoy_config_accesslog_v3_ExtensionFilter__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/accesslog/v3/accesslog.upb_minitable.h

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_
-#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -3993,4 +3993,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllo
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_ */