grpc 1.39.0 → 1.41.0

data/src/core/ext/transport/chttp2/transport/writing.cc

@@ -18,14 +18,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
-#include "src/core/ext/transport/chttp2/transport/context_list.h"
-#include "src/core/ext/transport/chttp2/transport/internal.h"
-
 #include <limits.h>
 
 #include <grpc/support/log.h>
 
+#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
+#include "src/core/ext/transport/chttp2/transport/context_list.h"
+#include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/compression/stream_compression.h"
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/profiling/timers.h"
@@ -259,8 +258,7 @@ class WriteContext {
   }
 
   void EnactHpackSettings() {
-    grpc_chttp2_hpack_compressor_set_max_table_size(
-        &t_->hpack_compressor,
+    t_->hpack_compressor.SetMaxTableSize(
         t_->settings[GRPC_PEER_SETTINGS]
                     [GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE]);
   }
@@ -457,18 +455,20 @@ class StreamWriteContext {
         is_default_initial_metadata(s_->send_initial_metadata)) {
       ConvertInitialMetadataToTrailingMetadata();
     } else {
-      grpc_encode_header_options hopt = {
-          s_->id,  // stream_id
-          false,   // is_eof
-          t_->settings[GRPC_PEER_SETTINGS]
+      t_->hpack_compressor.EncodeHeaders(
+          grpc_core::HPackCompressor::EncodeHeaderOptions{
+              s_->id,  // stream_id
+              false,   // is_eof
+              t_->settings
+                      [GRPC_PEER_SETTINGS]
                       [GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA] !=
-              0,  // use_true_binary_metadata
-          t_->settings[GRPC_PEER_SETTINGS]
-                      [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE],  // max_frame_size
-          &s_->stats.outgoing                                 // stats
-      };
-      grpc_chttp2_encode_header(&t_->hpack_compressor, nullptr, 0,
-                                s_->send_initial_metadata, &hopt, &t_->outbuf);
+                  0,  // use_true_binary_metadata
+              t_->settings
+                  [GRPC_PEER_SETTINGS]
+                  [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE],  // max_frame_size
+              &s_->stats.outgoing                         // stats
+          },
+          *s_->send_initial_metadata, &t_->outbuf);
       grpc_chttp2_reset_ping_clock(t_);
       write_context_->IncInitialMetadataWrites();
     }
@@ -565,18 +565,22 @@ class StreamWriteContext {
       grpc_chttp2_encode_data(s_->id, &s_->flow_controlled_buffer, 0, true,
                               &s_->stats.outgoing, &t_->outbuf);
     } else {
-      grpc_encode_header_options hopt = {
-          s_->id, true,
-          t_->settings[GRPC_PEER_SETTINGS]
+      t_->hpack_compressor.EncodeHeaders(
+          grpc_core::HPackCompressor::EncodeHeaderOptions{
+              s_->id, true,
+              t_->settings
+                      [GRPC_PEER_SETTINGS]
                       [GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA] !=
-              0,
-
-          t_->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE],
-          &s_->stats.outgoing};
-      grpc_chttp2_encode_header(&t_->hpack_compressor,
-                                extra_headers_for_trailing_metadata_,
-                                num_extra_headers_for_trailing_metadata_,
-                                s_->send_trailing_metadata, &hopt, &t_->outbuf);
+                  0,
+              t_->settings[GRPC_PEER_SETTINGS]
+                          [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE],
+              &s_->stats.outgoing},
+          grpc_core::ConcatMetadata(
+              grpc_core::MetadataArray(
+                  extra_headers_for_trailing_metadata_,
+                  num_extra_headers_for_trailing_metadata_),
+              *s_->send_trailing_metadata),
+          &t_->outbuf);
     }
     write_context_->IncTrailingMetadataWrites();
     grpc_chttp2_reset_ping_clock(t_);

data/src/core/ext/transport/inproc/inproc_transport.cc

@@ -18,12 +18,15 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/ext/transport/inproc/inproc_transport.h"
+
+#include <string.h>
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
-#include <string.h>
-#include "src/core/ext/transport/inproc/inproc_transport.h"
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/slice/slice_internal.h"
@@ -1290,7 +1293,6 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server,
   const grpc_channel_args* server_args = grpc_channel_args_copy_and_remove(
       server->core_server->channel_args(), args_to_remove,
       GPR_ARRAY_SIZE(args_to_remove));
-
   // Add a default authority channel argument for the client
   grpc_arg default_authority_arg;
   default_authority_arg.type = GRPC_ARG_STRING;
@@ -1311,7 +1313,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server,
   if (error == GRPC_ERROR_NONE) {
     channel =
         grpc_channel_create("inproc", client_args, GRPC_CLIENT_DIRECT_CHANNEL,
-                            client_transport, nullptr, &error);
+                            client_transport, nullptr, 0, &error);
     if (error != GRPC_ERROR_NONE) {
       GPR_ASSERT(!channel);
       gpr_log(GPR_ERROR, "Failed to create client channel: %s",

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

@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "envoy/admin/v3/config_dump.upb.h"
 #include "envoy/config/bootstrap/v3/bootstrap.upb.h"
 #include "google/protobuf/any.upb.h"
@@ -22,13 +22,13 @@ static const upb_msglayout *const envoy_admin_v3_ConfigDump_submsgs[1] = {
 };
 
 static const upb_msglayout_field envoy_admin_v3_ConfigDump__fields[1] = {
-  {1, UPB_SIZE(0, 0), 0, 0, 11, 3},
+  {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_ConfigDump_msginit = {
   &envoy_admin_v3_ConfigDump_submsgs[0],
   &envoy_admin_v3_ConfigDump__fields[0],
-  UPB_SIZE(8, 8), 1, false, 255,
+  UPB_SIZE(8, 8), 1, false, 1, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_UpdateFailureState_submsgs[2] = {
@@ -37,16 +37,16 @@ static const upb_msglayout *const envoy_admin_v3_UpdateFailureState_submsgs[2] =
 };
 
 static const upb_msglayout_field envoy_admin_v3_UpdateFailureState__fields[4] = {
-  {1, UPB_SIZE(20, 40), 1, 0, 11, 1},
-  {2, UPB_SIZE(24, 48), 2, 1, 11, 1},
-  {3, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {4, UPB_SIZE(12, 24), 0, 0, 9, 1},
+  {1, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(24, 48), 2, 1, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_UpdateFailureState_msginit = {
   &envoy_admin_v3_UpdateFailureState_submsgs[0],
   &envoy_admin_v3_UpdateFailureState__fields[0],
-  UPB_SIZE(32, 64), 4, false, 255,
+  UPB_SIZE(32, 64), 4, false, 4, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_BootstrapConfigDump_submsgs[2] = {
@@ -55,14 +55,14 @@ static const upb_msglayout *const envoy_admin_v3_BootstrapConfigDump_submsgs[2]
 };
 
 static const upb_msglayout_field envoy_admin_v3_BootstrapConfigDump__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, 1},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_BootstrapConfigDump_msginit = {
   &envoy_admin_v3_BootstrapConfigDump_submsgs[0],
   &envoy_admin_v3_BootstrapConfigDump__fields[0],
-  UPB_SIZE(16, 24), 2, false, 255,
+  UPB_SIZE(16, 24), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_submsgs[2] = {
@@ -71,15 +71,15 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_submsgs[2]
 };
 
 static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump__fields[3] = {
-  {1, UPB_SIZE(0, 0), 0, 0, 9, 1},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, 3},
-  {3, UPB_SIZE(12, 24), 0, 0, 11, 3},
+  {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY},
+  {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit = {
   &envoy_admin_v3_ListenersConfigDump_submsgs[0],
   &envoy_admin_v3_ListenersConfigDump__fields[0],
-  UPB_SIZE(16, 32), 3, false, 255,
+  UPB_SIZE(16, 32), 3, false, 3, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = {
@@ -88,14 +88,14 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_StaticListe
 };
 
 static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, 1},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ListenersConfigDump_StaticListener_msginit = {
   &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0],
   &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0],
-  UPB_SIZE(16, 24), 2, false, 255,
+  UPB_SIZE(16, 24), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = {
@@ -104,15 +104,15 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicList
 };
 
 static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(12, 24), 1, 0, 11, 1},
-  {3, UPB_SIZE(16, 32), 2, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit = {
   &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0],
   &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0],
-  UPB_SIZE(24, 48), 3, false, 255,
+  UPB_SIZE(24, 48), 3, false, 3, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[2] = {
@@ -121,18 +121,18 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicList
 };
 
 static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = {
-  {1, UPB_SIZE(8, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, 1},
-  {3, UPB_SIZE(20, 32), 2, 0, 11, 1},
-  {4, UPB_SIZE(24, 40), 3, 0, 11, 1},
-  {5, UPB_SIZE(28, 48), 4, 1, 11, 1},
-  {6, UPB_SIZE(4, 4), 0, 0, 14, 1},
+  {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(20, 32), 2, 0, 11, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(28, 48), 4, 1, 11, _UPB_MODE_SCALAR},
+  {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit = {
   &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0],
   &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0],
-  UPB_SIZE(32, 64), 6, false, 255,
+  UPB_SIZE(32, 64), 6, false, 6, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_submsgs[2] = {
@@ -141,16 +141,16 @@ static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_submsgs[2] =
 };
 
 static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump__fields[4] = {
-  {1, UPB_SIZE(0, 0), 0, 0, 9, 1},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, 3},
-  {3, UPB_SIZE(12, 24), 0, 0, 11, 3},
-  {4, UPB_SIZE(16, 32), 0, 0, 11, 3},
+  {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY},
+  {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY},
+  {4, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit = {
   &envoy_admin_v3_ClustersConfigDump_submsgs[0],
   &envoy_admin_v3_ClustersConfigDump__fields[0],
-  UPB_SIZE(24, 48), 4, false, 255,
+  UPB_SIZE(24, 48), 4, false, 4, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = {
@@ -159,14 +159,14 @@ static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_StaticCluste
 };
 
 static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, 1},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit = {
   &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0],
   &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0],
-  UPB_SIZE(16, 24), 2, false, 255,
+  UPB_SIZE(16, 24), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = {
@@ -176,17 +176,17 @@ static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_DynamicClust
 };
 
 static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = {
-  {1, UPB_SIZE(8, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 24), 1, 1, 11, 1},
-  {3, UPB_SIZE(20, 32), 2, 2, 11, 1},
-  {4, UPB_SIZE(24, 40), 3, 0, 11, 1},
-  {5, UPB_SIZE(4, 4), 0, 0, 14, 1},
+  {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 24), 1, 1, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(20, 32), 2, 2, 11, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit = {
   &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0],
   &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0],
-  UPB_SIZE(32, 48), 5, false, 255,
+  UPB_SIZE(32, 48), 5, false, 5, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
@@ -195,14 +195,14 @@ static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
 };
 
 static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump__fields[2] = {
-  {2, UPB_SIZE(0, 0), 0, 1, 11, 3},
-  {3, UPB_SIZE(4, 8), 0, 0, 11, 3},
+  {2, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY},
+  {3, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit = {
   &envoy_admin_v3_RoutesConfigDump_submsgs[0],
   &envoy_admin_v3_RoutesConfigDump__fields[0],
-  UPB_SIZE(8, 16), 2, false, 255,
+  UPB_SIZE(8, 16), 2, false, 0, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = {
@@ -211,14 +211,14 @@ static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_StaticRouteCon
 };
 
 static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, 1},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit = {
   &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0],
   &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0],
-  UPB_SIZE(16, 24), 2, false, 255,
+  UPB_SIZE(16, 24), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = {
@@ -228,17 +228,17 @@ static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_DynamicRouteCo
 };
 
 static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = {
-  {1, UPB_SIZE(8, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 24), 1, 1, 11, 1},
-  {3, UPB_SIZE(20, 32), 2, 2, 11, 1},
-  {4, UPB_SIZE(24, 40), 3, 0, 11, 1},
-  {5, UPB_SIZE(4, 4), 0, 0, 14, 1},
+  {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 24), 1, 1, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(20, 32), 2, 2, 11, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit = {
   &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0],
   &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0],
-  UPB_SIZE(32, 48), 5, false, 255,
+  UPB_SIZE(32, 48), 5, false, 5, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = {
@@ -247,14 +247,14 @@ static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_submsgs[
 };
 
 static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = {
-  {1, UPB_SIZE(0, 0), 0, 1, 11, 3},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, 3},
+  {1, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit = {
   &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0],
   &envoy_admin_v3_ScopedRoutesConfigDump__fields[0],
-  UPB_SIZE(8, 16), 2, false, 255,
+  UPB_SIZE(8, 16), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = {
@@ -263,15 +263,15 @@ static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_InlineSc
 };
 
 static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 32), 0, 0, 11, 3},
-  {3, UPB_SIZE(12, 24), 1, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY},
+  {3, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit = {
   &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0],
   &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0],
-  UPB_SIZE(24, 48), 3, false, 255,
+  UPB_SIZE(24, 48), 3, false, 3, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = {
@@ -281,18 +281,18 @@ static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_DynamicS
 };
 
 static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = {
-  {1, UPB_SIZE(8, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 24), 0, 0, 9, 1},
-  {3, UPB_SIZE(32, 56), 0, 1, 11, 3},
-  {4, UPB_SIZE(24, 40), 1, 2, 11, 1},
-  {5, UPB_SIZE(28, 48), 2, 0, 11, 1},
-  {6, UPB_SIZE(4, 4), 0, 0, 14, 1},
+  {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(32, 56), 0, 1, 11, _UPB_MODE_ARRAY},
+  {4, UPB_SIZE(24, 40), 1, 2, 11, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(28, 48), 2, 0, 11, _UPB_MODE_SCALAR},
+  {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit = {
   &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0],
   &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0],
-  UPB_SIZE(40, 64), 6, false, 255,
+  UPB_SIZE(40, 64), 6, false, 6, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_submsgs[2] = {
@@ -301,15 +301,15 @@ static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_submsgs[2] =
 };
 
 static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump__fields[3] = {
-  {1, UPB_SIZE(0, 0), 0, 1, 11, 3},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, 3},
-  {3, UPB_SIZE(8, 16), 0, 0, 11, 3},
+  {1, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY},
+  {3, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_SecretsConfigDump_msginit = {
   &envoy_admin_v3_SecretsConfigDump_submsgs[0],
   &envoy_admin_v3_SecretsConfigDump__fields[0],
-  UPB_SIZE(16, 24), 3, false, 255,
+  UPB_SIZE(16, 24), 3, false, 3, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = {
@@ -319,18 +319,18 @@ static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_DynamicSecret
 };
 
 static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = {
-  {1, UPB_SIZE(8, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 24), 0, 0, 9, 1},
-  {3, UPB_SIZE(24, 40), 1, 2, 11, 1},
-  {4, UPB_SIZE(28, 48), 2, 1, 11, 1},
-  {5, UPB_SIZE(32, 56), 3, 0, 11, 1},
-  {6, UPB_SIZE(4, 4), 0, 0, 14, 1},
+  {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(24, 40), 1, 2, 11, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(28, 48), 2, 1, 11, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(32, 56), 3, 0, 11, _UPB_MODE_SCALAR},
+  {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit = {
   &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0],
   &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0],
-  UPB_SIZE(40, 64), 6, false, 255,
+  UPB_SIZE(40, 64), 6, false, 6, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = {
@@ -339,15 +339,15 @@ static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_StaticSecret_
 };
 
 static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(12, 24), 1, 1, 11, 1},
-  {3, UPB_SIZE(16, 32), 2, 0, 11, 1},
+  {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit = {
   &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0],
   &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0],
-  UPB_SIZE(24, 48), 3, false, 255,
+  UPB_SIZE(24, 48), 3, false, 3, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_submsgs[2] = {
@@ -356,14 +356,14 @@ static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_submsgs[2]
 };
 
 static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump__fields[2] = {
-  {2, UPB_SIZE(0, 0), 0, 1, 11, 3},
-  {3, UPB_SIZE(4, 8), 0, 0, 11, 3},
+  {2, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY},
+  {3, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit = {
   &envoy_admin_v3_EndpointsConfigDump_submsgs[0],
   &envoy_admin_v3_EndpointsConfigDump__fields[0],
-  UPB_SIZE(8, 16), 2, false, 255,
+  UPB_SIZE(8, 16), 2, false, 0, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = {
@@ -372,14 +372,14 @@ static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_StaticEndpo
 };
 
 static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, 1},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, 1},
+  {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit = {
   &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0],
   &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0],
-  UPB_SIZE(16, 24), 2, false, 255,
+  UPB_SIZE(16, 24), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = {
@@ -389,17 +389,17 @@ static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_DynamicEndp
 };
 
 static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = {
-  {1, UPB_SIZE(8, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(16, 24), 1, 1, 11, 1},
-  {3, UPB_SIZE(20, 32), 2, 2, 11, 1},
-  {4, UPB_SIZE(24, 40), 3, 0, 11, 1},
-  {5, UPB_SIZE(4, 4), 0, 0, 14, 1},
+  {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(16, 24), 1, 1, 11, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(20, 32), 2, 2, 11, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit = {
   &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0],
   &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0],
-  UPB_SIZE(32, 48), 5, false, 255,
+  UPB_SIZE(32, 48), 5, false, 5, 255,
 };
 
 #include "upb/port_undef.inc"