grpc 1.68.1 → 1.69.0.pre1

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

@@ -20,7 +20,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = {
 };
 
 const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = {
-  &envoy_admin_v3_ConfigDump_submsgs[0],
+  &envoy_admin_v3_ConfigDump__submsgs[0],
   &envoy_admin_v3_ConfigDump__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -42,7 +42,7 @@ const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__ConfigDump_msg_init_ptr = &envoy__admin__v3__ConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -53,7 +53,7 @@ static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] =
 };
 
 const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = {
-  &envoy_admin_v3_BootstrapConfigDump_submsgs[0],
+  &envoy_admin_v3_BootstrapConfigDump__submsgs[0],
   &envoy_admin_v3_BootstrapConfigDump__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -62,7 +62,7 @@ const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__BootstrapConfigDump_msg_init_ptr = &envoy__admin__v3__BootstrapConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr},
@@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = {
 };
 
 const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = {
-  &envoy_admin_v3_SecretsConfigDump_submsgs[0],
+  &envoy_admin_v3_SecretsConfigDump__submsgs[0],
   &envoy_admin_v3_SecretsConfigDump__fields[0],
   UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__SecretsConfigDump_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -106,7 +106,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__
 };
 
 const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init = {
-  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0],
+  &envoy_admin_v3_SecretsConfigDump_DynamicSecret__submsgs[0],
   &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0],
   UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -125,7 +125,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init
 };
 
 const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
@@ -137,7 +137,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__f
 };
 
 const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = {
-  &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0],
+  &envoy_admin_v3_SecretsConfigDump_StaticSecret__submsgs[0],
   &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -2957,4 +2957,4 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_client_status
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.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_UpdateFailureState_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_UpdateFailureState__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = {
 };
 
 const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = {
-  &envoy_admin_v3_UpdateFailureState_submsgs[0],
+  &envoy_admin_v3_UpdateFailureState__submsgs[0],
   &envoy_admin_v3_UpdateFailureState__fields[0],
   UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__UpdateFailureState_msg_init_ptr = &envoy__admin__v3__UpdateFailureState_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr},
 };
@@ -62,7 +62,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] =
 };
 
 const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump__submsgs[0],
   &envoy_admin_v3_ListenersConfigDump__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -77,7 +77,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__ListenersConfigDump_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -88,7 +88,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListene
 };
 
 const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump_StaticListener__submsgs[0],
   &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -97,7 +97,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_in
 };
 
 const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -109,7 +109,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen
 };
 
 const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__submsgs[0],
   &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -122,7 +122,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_
 };
 
 const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr},
@@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen
 };
 
 const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump_DynamicListener__submsgs[0],
   &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0],
   UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -158,7 +158,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_i
 };
 
 const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr},
@@ -172,7 +172,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = {
 };
 
 const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = {
-  &envoy_admin_v3_ClustersConfigDump_submsgs[0],
+  &envoy_admin_v3_ClustersConfigDump__submsgs[0],
   &envoy_admin_v3_ClustersConfigDump__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -191,7 +191,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__ClustersConfigDump_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -202,7 +202,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster_
 };
 
 const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init = {
-  &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0],
+  &envoy_admin_v3_ClustersConfigDump_StaticCluster__submsgs[0],
   &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -211,7 +211,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init
 };
 
 const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -226,7 +226,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster
 };
 
 const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init = {
-  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0],
+  &envoy_admin_v3_ClustersConfigDump_DynamicCluster__submsgs[0],
   &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0],
   UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -245,7 +245,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_ini
 };
 
 const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr},
 };
@@ -256,7 +256,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = {
 };
 
 const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = {
-  &envoy_admin_v3_RoutesConfigDump_submsgs[0],
+  &envoy_admin_v3_RoutesConfigDump__submsgs[0],
   &envoy_admin_v3_RoutesConfigDump__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -271,7 +271,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__RoutesConfigDump_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfi
 };
 
 const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init = {
-  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0],
+  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__submsgs[0],
   &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -291,7 +291,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_in
 };
 
 const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -306,7 +306,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConf
 };
 
 const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init = {
-  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0],
+  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__submsgs[0],
   &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0],
   UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -325,7 +325,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_i
 };
 
 const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr},
 };
@@ -336,7 +336,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2]
 };
 
 const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = {
-  &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0],
+  &envoy_admin_v3_ScopedRoutesConfigDump__submsgs[0],
   &envoy_admin_v3_ScopedRoutesConfigDump__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -351,7 +351,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -363,7 +363,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScop
 };
 
 const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init = {
-  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0],
+  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__submsgs[0],
   &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -378,7 +378,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteC
 };
 
 const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -394,7 +394,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicSco
 };
 
 const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init = {
-  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0],
+  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__submsgs[0],
   &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0],
   UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -413,7 +413,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRoute
 };
 
 const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr},
 };
@@ -424,7 +424,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] =
 };
 
 const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = {
-  &envoy_admin_v3_EndpointsConfigDump_submsgs[0],
+  &envoy_admin_v3_EndpointsConfigDump__submsgs[0],
   &envoy_admin_v3_EndpointsConfigDump__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -439,7 +439,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
 };
@@ -450,7 +450,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpoin
 };
 
 const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init = {
-  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0],
+  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__submsgs[0],
   &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -459,7 +459,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_
 };
 
 const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -474,7 +474,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpoi
 };
 
 const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init = {
-  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0],
+  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__submsgs[0],
   &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0],
   UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -493,7 +493,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig
 };
 
 const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init_ptr},
 };
 
@@ -502,7 +502,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = {
 };
 
 const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = {
-  &envoy_admin_v3_EcdsConfigDump_submsgs[0],
+  &envoy_admin_v3_EcdsConfigDump__submsgs[0],
   &envoy_admin_v3_EcdsConfigDump__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -515,7 +515,7 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__EcdsConfigDump_msg_init_ptr = &envoy__admin__v3__EcdsConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -530,7 +530,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__
 };
 
 const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init = {
-  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0],
+  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__submsgs[0],
   &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0],
   UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -65,4 +65,4 @@ extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -252,4 +252,4 @@ UPB_INLINE bool envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_add_target
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_ */

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

@@ -15,7 +15,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init_ptr},
 };
 
@@ -24,7 +24,7 @@ static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] =
 };
 
 const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = {
-  &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0],
+  &envoy_admin_v3_UnreadyTargetsDumps__submsgs[0],
   &envoy_admin_v3_UnreadyTargetsDumps__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -292,4 +292,4 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_ad
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/admin/v3/listeners.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_Listeners_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Listeners__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenerStatus_msg_init_ptr},
 };
 
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = {
 };
 
 const upb_MiniTable envoy__admin__v3__Listeners_msg_init = {
-  &envoy_admin_v3_Listeners_submsgs[0],
+  &envoy_admin_v3_Listeners__submsgs[0],
   &envoy_admin_v3_Listeners__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__Listeners_msg_init = {
 };
 
 const upb_MiniTable* envoy__admin__v3__Listeners_msg_init_ptr = &envoy__admin__v3__Listeners_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
 };
@@ -51,7 +51,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = {
 };
 
 const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = {
-  &envoy_admin_v3_ListenerStatus_submsgs[0],
+  &envoy_admin_v3_ListenerStatus__submsgs[0],
   &envoy_admin_v3_ListenerStatus__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -167,4 +167,4 @@ UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Me
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_ */

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -124,4 +124,4 @@ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ */
+#endif  /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_ */