grpc 1.68.1 → 1.69.0.pre1

data/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h

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

data/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -763,4 +763,4 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Doubl
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/range.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 xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr},
 };
 
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher__fields[1]
 };
 
 const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int64RangeMatcher__submsgs[0],
   &xds_type_matcher_v3_Int64RangeMatcher__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__type__v3__Int64Range_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
@@ -50,7 +50,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher_RangeMatch
 };
 
 const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__submsgs[0],
   &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -63,7 +63,7 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr},
 };
 
@@ -72,7 +72,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher__fields[1]
 };
 
 const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int32RangeMatcher__submsgs[0],
   &xds_type_matcher_v3_Int32RangeMatcher__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -85,7 +85,7 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__type__v3__Int32Range_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
@@ -96,7 +96,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher_RangeMatch
 };
 
 const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__submsgs[0],
   &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -109,7 +109,7 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_
 };
 
 const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init_ptr},
 };
 
@@ -118,7 +118,7 @@ static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher__fields[1
 };
 
 const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = {
-  &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_DoubleRangeMatcher__submsgs[0],
   &xds_type_matcher_v3_DoubleRangeMatcher__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -131,7 +131,7 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher_msg_init_ptr = &xds__type__matcher__v3__DoubleRangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__type__v3__DoubleRange_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
 };
@@ -142,7 +142,7 @@ static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher_RangeMatc
 };
 
 const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__submsgs[0],
   &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h

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

data/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -164,4 +164,4 @@ UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const x
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c

@@ -15,7 +15,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr},
 };
 
@@ -25,7 +25,7 @@ static const upb_MiniTableField xds_type_matcher_v3_RegexMatcher__fields[2] = {
 };
 
 const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = {
-  &xds_type_matcher_v3_RegexMatcher_submsgs[0],
+  &xds_type_matcher_v3_RegexMatcher__submsgs[0],
   &xds_type_matcher_v3_RegexMatcher__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h

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

data/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -317,4 +317,4 @@ UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_ListStr
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c

@@ -16,7 +16,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher_msg_init_ptr},
 };
 
@@ -30,7 +30,7 @@ static const upb_MiniTableField xds_type_matcher_v3_StringMatcher__fields[6] = {
 };
 
 const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = {
-  &xds_type_matcher_v3_StringMatcher_submsgs[0],
+  &xds_type_matcher_v3_StringMatcher__submsgs[0],
   &xds_type_matcher_v3_StringMatcher__fields[0],
   UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -49,7 +49,7 @@ const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = {
 };
 
 const upb_MiniTable* xds__type__matcher__v3__StringMatcher_msg_init_ptr = &xds__type__matcher__v3__StringMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr},
 };
 
@@ -58,7 +58,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ListStringMatcher__fields[1]
 };
 
 const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = {
-  &xds_type_matcher_v3_ListStringMatcher_submsgs[0],
+  &xds_type_matcher_v3_ListStringMatcher__submsgs[0],
   &xds_type_matcher_v3_ListStringMatcher__fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h

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

data/src/core/ext/upb-gen/xds/type/v3/cel.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPB_H_
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -246,4 +246,4 @@ UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_muta
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_V3_CEL_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/v3/cel.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 xds_type_v3_CelExpression_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_v3_CelExpression__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr},
 };
@@ -30,7 +30,7 @@ static const upb_MiniTableField xds_type_v3_CelExpression__fields[2] = {
 };
 
 const upb_MiniTable xds__type__v3__CelExpression_msg_init = {
-  &xds_type_v3_CelExpression_submsgs[0],
+  &xds_type_v3_CelExpression__submsgs[0],
   &xds_type_v3_CelExpression__fields[0],
   UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -45,7 +45,7 @@ const upb_MiniTable xds__type__v3__CelExpression_msg_init = {
 };
 
 const upb_MiniTable* xds__type__v3__CelExpression_msg_init_ptr = &xds__type__v3__CelExpression_msg_init;
-static const upb_MiniTableSubInternal xds_type_v3_CelExtractString_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_v3_CelExtractString__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__StringValue_msg_init_ptr},
 };
@@ -56,7 +56,7 @@ static const upb_MiniTableField xds_type_v3_CelExtractString__fields[2] = {
 };
 
 const upb_MiniTable xds__type__v3__CelExtractString_msg_init = {
-  &xds_type_v3_CelExtractString_submsgs[0],
+  &xds_type_v3_CelExtractString__submsgs[0],
   &xds_type_v3_CelExtractString__fields[0],
   UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED

data/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h

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

data/src/core/ext/upb-gen/xds/type/v3/range.upb.h

@@ -6,13 +6,14 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPB_H_
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
 #include "xds/type/v3/range.upb_minitable.h"
 
+
 // Must be last.
 #include "upb/port/def.inc"
 
@@ -242,4 +243,4 @@ UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, do
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h

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

data/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_
-#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -117,4 +117,4 @@ UPB_INLINE struct google_protobuf_Struct* xds_type_v3_TypedStruct_mutable_value(
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ */
+#endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c

@@ -15,7 +15,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_v3_TypedStruct_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_v3_TypedStruct__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
 };
 
@@ -25,7 +25,7 @@ static const upb_MiniTableField xds_type_v3_TypedStruct__fields[2] = {
 };
 
 const upb_MiniTable xds__type__v3__TypedStruct_msg_init = {
-  &xds_type_v3_TypedStruct_submsgs[0],
+  &xds_type_v3_TypedStruct__submsgs[0],
   &xds_type_v3_TypedStruct__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/xds/type/v3/typed_struct.upb_minitable.h

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

data/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SubjectAlternateName_getmsgdef(u
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_ */

data/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_HostHealthStatus_getmsgdef(upb_D
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SecretsConfigDump_StaticSecret_g
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -120,4 +120,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_UnreadyTargetsDumps_UnreadyTarge
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_ListenerStatus_getmsgdef(upb_Def
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_Memory_getmsgdef(upb_DefPool *s)
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SimpleMetric_getmsgdef(upb_DefPo
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_MutexStats_getmsgdef(upb_DefPool
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_CommandLineOptions_getmsgdef(upb
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_TapRequest_getmsgdef(upb_DefPool
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ */
+#endif  /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_ */