grpc 1.68.1 → 1.69.0.pre1

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

@@ -22,7 +22,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr},
@@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint__fields[4] = {
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = {
-  &envoy_config_endpoint_v3_Endpoint_submsgs[0],
+  &envoy_config_endpoint_v3_Endpoint__submsgs[0],
   &envoy_config_endpoint_v3_Endpoint__fields[0],
   UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__Endpoint_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
 };
 
@@ -67,7 +67,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_HealthCheckCon
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init = {
-  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0],
+  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__submsgs[0],
   &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -86,7 +86,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
 };
 
@@ -95,7 +95,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_AdditionalAddr
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init = {
-  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0],
+  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__submsgs[0],
   &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -104,7 +104,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -119,7 +119,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LbEndpoint__fields[5] =
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = {
-  &envoy_config_endpoint_v3_LbEndpoint_submsgs[0],
+  &envoy_config_endpoint_v3_LbEndpoint__submsgs[0],
   &envoy_config_endpoint_v3_LbEndpoint__fields[0],
   UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -138,7 +138,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr = &envoy__config__endpoint__v3__LbEndpoint_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
 };
 
@@ -148,7 +148,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LedsClusterLocalityConf
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init = {
-  &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0],
+  &envoy_config_endpoint_v3_LedsClusterLocalityConfig__submsgs[0],
   &envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -163,7 +163,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init_ptr = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints__submsgs[7] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -185,7 +185,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fi
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = {
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0],
+  &envoy_config_endpoint_v3_LocalityLbEndpoints__submsgs[0],
   &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0],
   UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -212,7 +212,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init =
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr},
 };
 
@@ -221,7 +221,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints_LbE
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init = {
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0],
+  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__submsgs[0],
   &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__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/endpoint/v3/endpoint_components.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_prot
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1173,4 +1173,4 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_droppe
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_ */

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

@@ -22,7 +22,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats__submsgs[6] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init_ptr},
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init = {
-  &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0],
+  &envoy_config_endpoint_v3_UpstreamLocalityStats__submsgs[0],
   &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0],
   UPB_SIZE(96, 120), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -76,7 +76,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
@@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamEndpointStats__
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init = {
-  &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0],
+  &envoy_config_endpoint_v3_UpstreamEndpointStats__submsgs[0],
   &envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0],
   UPB_SIZE(56, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -155,7 +155,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_
 };
 
 const upb_MiniTable* envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init_ptr},
@@ -171,7 +171,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats__fields[6]
 };
 
 const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = {
-  &envoy_config_endpoint_v3_ClusterStats_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterStats__submsgs[0],
   &envoy_config_endpoint_v3_ClusterStats__fields[0],
   UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -39,4 +39,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_fi
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -103,4 +103,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ApiListener_muta
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.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_listener_v3_ApiListener_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ApiListener__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ApiListener__fields[1]
 };
 
 const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = {
-  &envoy_config_listener_v3_ApiListener_submsgs[0],
+  &envoy_config_listener_v3_ApiListener__submsgs[0],
   &envoy_config_listener_v3_ApiListener__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1743,4 +1743,4 @@ UPB_INLINE char* envoy_config_listener_v3_ApiListenerManager_serialize_ex(const
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_ */

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

@@ -32,7 +32,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr},
 };
@@ -43,7 +43,7 @@ static const upb_MiniTableField envoy_config_listener_v3_AdditionalAddress__fiel
 };
 
 const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = {
-  &envoy_config_listener_v3_AdditionalAddress_submsgs[0],
+  &envoy_config_listener_v3_AdditionalAddress__submsgs[0],
   &envoy_config_listener_v3_AdditionalAddress__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -52,7 +52,7 @@ const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__listener__v3__AdditionalAddress_msg_init_ptr = &envoy__config__listener__v3__AdditionalAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr},
 };
 
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerCollection__fie
 };
 
 const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = {
-  &envoy_config_listener_v3_ListenerCollection_submsgs[0],
+  &envoy_config_listener_v3_ListenerCollection__submsgs[0],
   &envoy_config_listener_v3_ListenerCollection__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -74,7 +74,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__listener__v3__ListenerCollection_msg_init_ptr = &envoy__config__listener__v3__ListenerCollection_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_submsgs[24] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener__submsgs[24] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -138,7 +138,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[33] =
 };
 
 const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = {
-  &envoy_config_listener_v3_Listener_submsgs[0],
+  &envoy_config_listener_v3_Listener__submsgs[0],
   &envoy_config_listener_v3_Listener__fields[0],
   UPB_SIZE(152, 256), 33, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -181,7 +181,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__listener__v3__Listener_msg_init_ptr = &envoy__config__listener__v3__Listener_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
 };
 
@@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener_DeprecatedV1__
 };
 
 const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init = {
-  &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0],
+  &envoy_config_listener_v3_Listener_DeprecatedV1__submsgs[0],
   &envoy_config_listener_v3_Listener_DeprecatedV1__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -199,7 +199,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init
 };
 
 const upb_MiniTable* envoy__config__listener__v3__Listener__DeprecatedV1_msg_init_ptr = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
 };
@@ -210,7 +210,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener_ConnectionBala
 };
 
 const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init = {
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0],
+  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__submsgs[0],
   &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -47,4 +47,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1533,4 +1533,4 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_liste
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_ */

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

@@ -25,7 +25,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr},
 };
@@ -37,7 +37,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Filter__fields[3] = {
 };
 
 const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = {
-  &envoy_config_listener_v3_Filter_submsgs[0],
+  &envoy_config_listener_v3_Filter__submsgs[0],
   &envoy_config_listener_v3_Filter__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -56,7 +56,7 @@ const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__listener__v3__Filter_msg_init_ptr = &envoy__config__listener__v3__Filter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
@@ -79,7 +79,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChainMatch__field
 };
 
 const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = {
-  &envoy_config_listener_v3_FilterChainMatch_submsgs[0],
+  &envoy_config_listener_v3_FilterChainMatch__submsgs[0],
   &envoy_config_listener_v3_FilterChainMatch__fields[0],
   UPB_SIZE(64, 112), 11, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__listener__v3__FilterChainMatch_msg_init_ptr = &envoy__config__listener__v3__FilterChainMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain__submsgs[7] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChainMatch_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Filter_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -128,7 +128,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChain__fields[8]
 };
 
 const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = {
-  &envoy_config_listener_v3_FilterChain_submsgs[0],
+  &envoy_config_listener_v3_FilterChain__submsgs[0],
   &envoy_config_listener_v3_FilterChain__fields[0],
   UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -147,7 +147,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__listener__v3__FilterChain_msg_init_ptr = &envoy__config__listener__v3__FilterChain_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
 };
 
@@ -156,7 +156,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChain_OnDemandCon
 };
 
 const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init = {
-  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0],
+  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__submsgs[0],
   &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -165,7 +165,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfigurat
 };
 
 const upb_MiniTable* envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init_ptr = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr},
@@ -181,7 +181,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatc
 };
 
 const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init = {
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0],
+  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__submsgs[0],
   &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0],
   UPB_SIZE(16, 24), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -200,7 +200,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica
 };
 
 const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr},
 };
 
@@ -209,7 +209,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatc
 };
 
 const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init = {
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0],
+  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__submsgs[0],
   &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -222,7 +222,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica
 };
 
 const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr},
@@ -236,7 +236,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilter__fields[
 };
 
 const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = {
-  &envoy_config_listener_v3_ListenerFilter_submsgs[0],
+  &envoy_config_listener_v3_ListenerFilter__submsgs[0],
   &envoy_config_listener_v3_ListenerFilter__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_listener_components_prot
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -414,4 +414,4 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_ */

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

@@ -23,7 +23,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions__submsgs[11] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fi
 };
 
 const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = {
-  &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0],
+  &envoy_config_listener_v3_QuicProtocolOptions__submsgs[0],
   &envoy_config_listener_v3_QuicProtocolOptions__fields[0],
   UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -206,4 +206,4 @@ UPB_INLINE char* envoy_config_listener_v3_ActiveRawUdpListenerConfig_serialize_e
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_ */