grpc 1.68.1 → 1.69.0.pre1

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -143,4 +143,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_
-#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -357,4 +357,4 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_set_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.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_route_v3_ScopedRouteConfiguration_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr},
 };
@@ -33,7 +33,7 @@ static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration__
 };
 
 const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init = {
-  &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0],
+  &envoy_config_route_v3_ScopedRouteConfiguration__submsgs[0],
   &envoy_config_route_v3_ScopedRouteConfiguration__fields[0],
   UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -52,7 +52,7 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init
 };
 
 const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init_ptr},
 };
 
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_K
 };
 
 const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init = {
-  &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0],
+  &envoy_config_route_v3_ScopedRouteConfiguration_Key__submsgs[0],
   &envoy_config_route_v3_ScopedRouteConfiguration_Key__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/route/v3/scoped_route.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ */
+#endif  /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -1649,4 +1649,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_Streamin
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/tap/v3/common.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_tap_v3_TapConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_TapConfig__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr},
@@ -40,7 +40,7 @@ static const upb_MiniTableField envoy_config_tap_v3_TapConfig__fields[4] = {
 };
 
 const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = {
-  &envoy_config_tap_v3_TapConfig_submsgs[0],
+  &envoy_config_tap_v3_TapConfig__submsgs[0],
   &envoy_config_tap_v3_TapConfig__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -49,7 +49,7 @@ const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__tap__v3__TapConfig_msg_init_ptr = &envoy__config__tap__v3__TapConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_submsgs[9] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate__submsgs[9] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr},
@@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate__fields[10] =
 };
 
 const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = {
-  &envoy_config_tap_v3_MatchPredicate_submsgs[0],
+  &envoy_config_tap_v3_MatchPredicate__submsgs[0],
   &envoy_config_tap_v3_MatchPredicate__fields[0],
   UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -102,7 +102,7 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__tap__v3__MatchPredicate_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr},
 };
 
@@ -111,7 +111,7 @@ static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate_MatchSet__fie
 };
 
 const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = {
-  &envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[0],
+  &envoy_config_tap_v3_MatchPredicate_MatchSet__submsgs[0],
   &envoy_config_tap_v3_MatchPredicate_MatchSet__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -124,7 +124,7 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init =
 };
 
 const upb_MiniTable* envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
 };
 
@@ -133,7 +133,7 @@ static const upb_MiniTableField envoy_config_tap_v3_HttpHeadersMatch__fields[1]
 };
 
 const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = {
-  &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0],
+  &envoy_config_tap_v3_HttpHeadersMatch__submsgs[0],
   &envoy_config_tap_v3_HttpHeadersMatch__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -146,7 +146,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__tap__v3__HttpHeadersMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr},
 };
 
@@ -156,7 +156,7 @@ static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch__fields
 };
 
 const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = {
-  &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0],
+  &envoy_config_tap_v3_HttpGenericBodyMatch__submsgs[0],
   &envoy_config_tap_v3_HttpGenericBodyMatch__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMat
 };
 
 const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputSink_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -206,7 +206,7 @@ static const upb_MiniTableField envoy_config_tap_v3_OutputConfig__fields[4] = {
 };
 
 const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = {
-  &envoy_config_tap_v3_OutputConfig_submsgs[0],
+  &envoy_config_tap_v3_OutputConfig__submsgs[0],
   &envoy_config_tap_v3_OutputConfig__fields[0],
   UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -225,7 +225,7 @@ const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__tap__v3__OutputConfig_msg_init_ptr = &envoy__config__tap__v3__OutputConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink__submsgs[5] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__FilePerTapSink_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingGrpcSink_msg_init_ptr},
@@ -243,7 +243,7 @@ static const upb_MiniTableField envoy_config_tap_v3_OutputSink__fields[6] = {
 };
 
 const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = {
-  &envoy_config_tap_v3_OutputSink_submsgs[0],
+  &envoy_config_tap_v3_OutputSink__submsgs[0],
   &envoy_config_tap_v3_OutputSink__fields[0],
   24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -272,7 +272,7 @@ const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr = &envoy__config__tap__v3__StreamingAdminSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
 };
 
@@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_config_tap_v3_BufferedAdminSink__fields[2]
 };
 
 const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = {
-  &envoy_config_tap_v3_BufferedAdminSink_submsgs[0],
+  &envoy_config_tap_v3_BufferedAdminSink__submsgs[0],
   &envoy_config_tap_v3_BufferedAdminSink__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -313,7 +313,7 @@ const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__tap__v3__FilePerTapSink_msg_init_ptr = &envoy__config__tap__v3__FilePerTapSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
 };
 
@@ -323,7 +323,7 @@ static const upb_MiniTableField envoy_config_tap_v3_StreamingGrpcSink__fields[2]
 };
 
 const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = {
-  &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0],
+  &envoy_config_tap_v3_StreamingGrpcSink__submsgs[0],
   &envoy_config_tap_v3_StreamingGrpcSink__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -222,4 +222,4 @@ UPB_INLINE struct envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.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_trace_v3_DatadogRemoteConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogRemoteConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
 };
 
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DatadogRemoteConfig__field
 };
 
 const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = {
-  &envoy_config_trace_v3_DatadogRemoteConfig_submsgs[0],
+  &envoy_config_trace_v3_DatadogRemoteConfig__submsgs[0],
   &envoy_config_trace_v3_DatadogRemoteConfig__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -37,7 +37,7 @@ const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr},
 };
 
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[4] =
 };
 
 const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = {
-  &envoy_config_trace_v3_DatadogConfig_submsgs[0],
+  &envoy_config_trace_v3_DatadogConfig__submsgs[0],
   &envoy_config_trace_v3_DatadogConfig__fields[0],
   UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -122,4 +122,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtConfig_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.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_trace_v3_DynamicOtConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_DynamicOtConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
 };
 
@@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DynamicOtConfig__fields[2]
 };
 
 const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = {
-  &envoy_config_trace_v3_DynamicOtConfig_submsgs[0],
+  &envoy_config_trace_v3_DynamicOtConfig__submsgs[0],
   &envoy_config_trace_v3_DynamicOtConfig__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -198,4 +198,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_mutabl
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_ */

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

@@ -18,7 +18,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init_ptr},
 };
 
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_trace_v3_Tracing__fields[1] = {
 };
 
 const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = {
-  &envoy_config_trace_v3_Tracing_submsgs[0],
+  &envoy_config_trace_v3_Tracing__submsgs[0],
   &envoy_config_trace_v3_Tracing__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -36,7 +36,7 @@ const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = {
 };
 
 const upb_MiniTable* envoy__config__trace__v3__Tracing_msg_init_ptr = &envoy__config__trace__v3__Tracing_msg_init;
-static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
 };
 
@@ -46,7 +46,7 @@ static const upb_MiniTableField envoy_config_trace_v3_Tracing_Http__fields[2] =
 };
 
 const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init = {
-  &envoy_config_trace_v3_Tracing_Http_submsgs[0],
+  &envoy_config_trace_v3_Tracing_Http__submsgs[0],
   &envoy_config_trace_v3_Tracing_Http__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -205,4 +205,4 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_Lightst
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.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_trace_v3_LightstepConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_LightstepConfig__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
 };
 
@@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_trace_v3_LightstepConfig__fields[4]
 };
 
 const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = {
-  &envoy_config_trace_v3_LightstepConfig_submsgs[0],
+  &envoy_config_trace_v3_LightstepConfig__submsgs[0],
   &envoy_config_trace_v3_LightstepConfig__fields[0],
   UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -423,4 +423,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCe
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.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_trace_v3_OpenCensusConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenCensusConfig__submsgs[3] = {
   {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__TraceConfig_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
@@ -43,7 +43,7 @@ static const upb_MiniTableField envoy_config_trace_v3_OpenCensusConfig__fields[1
 };
 
 const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = {
-  &envoy_config_trace_v3_OpenCensusConfig_submsgs[0],
+  &envoy_config_trace_v3_OpenCensusConfig__submsgs[0],
   &envoy_config_trace_v3_OpenCensusConfig__fields[0],
   UPB_SIZE(72, 120), 13, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED

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

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

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -250,4 +250,4 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ */
+#endif  /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.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_trace_v3_OpenTelemetryConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenTelemetryConfig__submsgs[4] = {
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpService_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_OpenTelemetryConfig__field
 };
 
 const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = {
-  &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0],
+  &envoy_config_trace_v3_OpenTelemetryConfig__submsgs[0],
   &envoy_config_trace_v3_OpenTelemetryConfig__fields[0],
   UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED

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

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