grpc 1.68.1 → 1.69.0.pre1

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

@@ -19,7 +19,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UdpSocketConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__QuicProtocolOptions_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_listener_v3_UdpListenerConfig__fiel
 };
 
 const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = {
-  &envoy_config_listener_v3_UdpListenerConfig_submsgs[0],
+  &envoy_config_listener_v3_UdpListenerConfig__submsgs[0],
   &envoy_config_listener_v3_UdpListenerConfig__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -191,4 +191,4 @@ UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_histogram_emit_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.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_config_metrics_v3_MetricsServiceConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_MetricsServiceConfig__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
 };
@@ -34,7 +34,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_MetricsServiceConfig__fi
 };
 
 const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = {
-  &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0],
+  &envoy_config_metrics_v3_MetricsServiceConfig__submsgs[0],
   &envoy_config_metrics_v3_MetricsServiceConfig__fields[0],
   UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_
-#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1028,4 +1028,4 @@ UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_ */

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

@@ -21,7 +21,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsSink__fields[2] = {
 };
 
 const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = {
-  &envoy_config_metrics_v3_StatsSink_submsgs[0],
+  &envoy_config_metrics_v3_StatsSink__submsgs[0],
   &envoy_config_metrics_v3_StatsSink__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__metrics__v3__StatsSink_msg_init_ptr = &envoy__config__metrics__v3__StatsSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__TagSpecifier_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsMatcher_msg_init_ptr},
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsConfig__fields[4] =
 };
 
 const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = {
-  &envoy_config_metrics_v3_StatsConfig_submsgs[0],
+  &envoy_config_metrics_v3_StatsConfig__submsgs[0],
   &envoy_config_metrics_v3_StatsConfig__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -80,7 +80,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__metrics__v3__StatsConfig_msg_init_ptr = &envoy__config__metrics__v3__StatsConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr},
 };
@@ -92,7 +92,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsMatcher__fields[3]
 };
 
 const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = {
-  &envoy_config_metrics_v3_StatsMatcher_submsgs[0],
+  &envoy_config_metrics_v3_StatsMatcher__submsgs[0],
   &envoy_config_metrics_v3_StatsMatcher__fields[0],
   UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -129,7 +129,7 @@ const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__metrics__v3__TagSpecifier_msg_init_ptr = &envoy__config__metrics__v3__TagSpecifier_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
 };
 
@@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_HistogramBucketSettings_
 };
 
 const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init = {
-  &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0],
+  &envoy_config_metrics_v3_HistogramBucketSettings__submsgs[0],
   &envoy_config_metrics_v3_HistogramBucketSettings__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -154,7 +154,7 @@ const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init
 };
 
 const upb_MiniTable* envoy__config__metrics__v3__HistogramBucketSettings_msg_init_ptr = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
 };
 
@@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsdSink__fields[3] =
 };
 
 const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = {
-  &envoy_config_metrics_v3_StatsdSink_submsgs[0],
+  &envoy_config_metrics_v3_StatsdSink__submsgs[0],
   &envoy_config_metrics_v3_StatsdSink__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -180,7 +180,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__metrics__v3__StatsdSink_msg_init_ptr = &envoy__config__metrics__v3__StatsdSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
 };
@@ -192,7 +192,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_DogStatsdSink__fields[3]
 };
 
 const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = {
-  &envoy_config_metrics_v3_DogStatsdSink_submsgs[0],
+  &envoy_config_metrics_v3_DogStatsdSink__submsgs[0],
   &envoy_config_metrics_v3_DogStatsdSink__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layo
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_
-#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1251,4 +1251,4 @@ UPB_INLINE struct envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/overload/v3/overload.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_config_overload_v3_ResourceMonitor_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_ResourceMonitor__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ResourceMonitor__fields
 };
 
 const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = {
-  &envoy_config_overload_v3_ResourceMonitor_submsgs[0],
+  &envoy_config_overload_v3_ResourceMonitor__submsgs[0],
   &envoy_config_overload_v3_ResourceMonitor__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -84,7 +84,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__overload__v3__ScaledTrigger_msg_init_ptr = &envoy__config__overload__v3__ScaledTrigger_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ThresholdTrigger_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaledTrigger_msg_init_ptr},
 };
@@ -96,7 +96,7 @@ static const upb_MiniTableField envoy_config_overload_v3_Trigger__fields[3] = {
 };
 
 const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = {
-  &envoy_config_overload_v3_Trigger_submsgs[0],
+  &envoy_config_overload_v3_Trigger__submsgs[0],
   &envoy_config_overload_v3_Trigger__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -111,7 +111,7 @@ const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__overload__v3__Trigger_msg_init_ptr = &envoy__config__overload__v3__Trigger_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr},
 };
 
@@ -120,7 +120,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActi
 };
 
 const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init = {
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0],
+  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__submsgs[0],
   &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -133,7 +133,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig
 };
 
 const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
 };
@@ -145,7 +145,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActi
 };
 
 const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init = {
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0],
+  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__submsgs[0],
   &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0],
   24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -160,7 +160,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig
 };
 
 const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
@@ -172,7 +172,7 @@ static const upb_MiniTableField envoy_config_overload_v3_OverloadAction__fields[
 };
 
 const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = {
-  &envoy_config_overload_v3_OverloadAction_submsgs[0],
+  &envoy_config_overload_v3_OverloadAction__submsgs[0],
   &envoy_config_overload_v3_OverloadAction__fields[0],
   UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -187,7 +187,7 @@ const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__overload__v3__OverloadAction_msg_init_ptr = &envoy__config__overload__v3__OverloadAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr},
 };
 
@@ -197,7 +197,7 @@ static const upb_MiniTableField envoy_config_overload_v3_LoadShedPoint__fields[2
 };
 
 const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = {
-  &envoy_config_overload_v3_LoadShedPoint_submsgs[0],
+  &envoy_config_overload_v3_LoadShedPoint__submsgs[0],
   &envoy_config_overload_v3_LoadShedPoint__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -230,7 +230,7 @@ const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init =
 };
 
 const upb_MiniTable* envoy__config__overload__v3__BufferFactoryConfig_msg_init_ptr = &envoy__config__overload__v3__BufferFactoryConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ResourceMonitor_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadAction_msg_init_ptr},
@@ -247,7 +247,7 @@ static const upb_MiniTableField envoy_config_overload_v3_OverloadManager__fields
 };
 
 const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = {
-  &envoy_config_overload_v3_OverloadManager_submsgs[0],
+  &envoy_config_overload_v3_OverloadManager__submsgs[0],
   &envoy_config_overload_v3_OverloadManager__fields[0],
   UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
-#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1872,4 +1872,4 @@ UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Acti
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ */

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

@@ -29,7 +29,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr},
 };
@@ -41,7 +41,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC__fields[3] = {
 };
 
 const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = {
-  &envoy_config_rbac_v3_RBAC_submsgs[0],
+  &envoy_config_rbac_v3_RBAC__submsgs[0],
   &envoy_config_rbac_v3_RBAC__fields[0],
   UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -54,7 +54,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__RBAC_msg_init_ptr = &envoy__config__rbac__v3__RBAC_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr},
 };
 
@@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions__f
 };
 
 const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init = {
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[0],
+  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__submsgs[0],
   &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -79,7 +79,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
 };
 
@@ -89,7 +89,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions_Au
 };
 
 const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init = {
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0],
+  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__submsgs[0],
   &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[0],
   24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -104,7 +104,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLog
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Policy_msg_init_ptr},
 };
 
@@ -114,7 +114,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[
 };
 
 const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = {
-  &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0],
+  &envoy_config_rbac_v3_RBAC_PoliciesEntry__submsgs[0],
   &envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0],
   48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -127,7 +127,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
@@ -142,7 +142,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Policy__fields[4] = {
 };
 
 const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = {
-  &envoy_config_rbac_v3_Policy_submsgs[0],
+  &envoy_config_rbac_v3_Policy__submsgs[0],
   &envoy_config_rbac_v3_Policy__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -157,7 +157,7 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__Policy_msg_init_ptr = &envoy__config__rbac__v3__Policy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission__submsgs[11] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
@@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[13] = {
 };
 
 const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = {
-  &envoy_config_rbac_v3_Permission_submsgs[0],
+  &envoy_config_rbac_v3_Permission__submsgs[0],
   &envoy_config_rbac_v3_Permission__fields[0],
   UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -215,7 +215,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__Permission_msg_init_ptr = &envoy__config__rbac__v3__Permission_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr},
 };
 
@@ -224,7 +224,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission_Set__fields[1] =
 };
 
 const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = {
-  &envoy_config_rbac_v3_Permission_Set_submsgs[0],
+  &envoy_config_rbac_v3_Permission_Set__submsgs[0],
   &envoy_config_rbac_v3_Permission_Set__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -237,7 +237,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__Permission__Set_msg_init_ptr = &envoy__config__rbac__v3__Permission__Set_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal__submsgs[11] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Authenticated_msg_init_ptr},
@@ -267,7 +267,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal__fields[12] = {
 };
 
 const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = {
-  &envoy_config_rbac_v3_Principal_submsgs[0],
+  &envoy_config_rbac_v3_Principal__submsgs[0],
   &envoy_config_rbac_v3_Principal__fields[0],
   UPB_SIZE(16, 24), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -294,7 +294,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__Principal_msg_init_ptr = &envoy__config__rbac__v3__Principal_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr},
 };
 
@@ -303,7 +303,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal_Set__fields[1] =
 };
 
 const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = {
-  &envoy_config_rbac_v3_Principal_Set_submsgs[0],
+  &envoy_config_rbac_v3_Principal_Set__submsgs[0],
   &envoy_config_rbac_v3_Principal_Set__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -316,7 +316,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__rbac__v3__Principal__Set_msg_init_ptr = &envoy__config__rbac__v3__Principal__Set_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
 };
 
@@ -325,7 +325,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal_Authenticated__fi
 };
 
 const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init = {
-  &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0],
+  &envoy_config_rbac_v3_Principal_Authenticated__submsgs[0],
   &envoy_config_rbac_v3_Principal_Authenticated__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -942,4 +942,4 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3_Vhds_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_ */