Merge branch 'cg-initiator' into cg-msg-size

test/core/channel/channel_stack_builder_test.cc

@@ -62,8 +62,8 @@ const grpc_channel_filter* FilterNamed(const char* name) {
       ->emplace(
           name,
           new grpc_channel_filter{
-              grpc_call_next_op, nullptr, grpc_channel_next_op, 0, CallInitFunc,
-              grpc_call_stack_ignore_set_pollset_or_pollset_set,
+              grpc_call_next_op, nullptr, nullptr, grpc_channel_next_op, 0,
+              CallInitFunc, grpc_call_stack_ignore_set_pollset_or_pollset_set,
               CallDestroyFunc, 0, ChannelInitFunc,
               [](grpc_channel_stack*, grpc_channel_element*) {},
               ChannelDestroyFunc, grpc_channel_next_get_info, name})

test/core/channel/channel_stack_test.cc

@@ -83,6 +83,7 @@ TEST(ChannelStackTest, CreateChannelStack) {
   const grpc_channel_filter filter = {
       call_func,
       nullptr,
+      nullptr,
       channel_func,
       sizeof(int),
       call_init_func,

test/core/end2end/tests/filter_causes_close.cc

@@ -102,6 +102,7 @@ const grpc_channel_filter test_filter = {
       return Immediate(ServerMetadataFromStatus(
           absl::PermissionDeniedError("Failure that's not preventable.")));
     },
+    nullptr,
     grpc_channel_next_op,
     sizeof(call_data),
     init_call_elem,

test/core/end2end/tests/filter_context.cc

@@ -82,7 +82,7 @@ grpc_error_handle init_channel_elem(grpc_channel_element* /*elem*/,
 void destroy_channel_elem(grpc_channel_element* /*elem*/) {}
 
 const grpc_channel_filter test_filter = {
-    start_transport_stream_op_batch, nullptr, grpc_channel_next_op,
+    start_transport_stream_op_batch, nullptr, nullptr, grpc_channel_next_op,
     sizeof(call_data), init_call_elem,
     grpc_call_stack_ignore_set_pollset_or_pollset_set, destroy_call_elem, 0,
     init_channel_elem, grpc_channel_stack_no_post_init, destroy_channel_elem,

test/core/end2end/tests/filter_init_fails.cc

@@ -80,7 +80,7 @@ const grpc_channel_filter test_filter = {
       return Immediate(ServerMetadataFromStatus(
           absl::PermissionDeniedError("access denied")));
     },
-    grpc_channel_next_op, 0, init_call_elem,
+    nullptr, grpc_channel_next_op, 0, init_call_elem,
     grpc_call_stack_ignore_set_pollset_or_pollset_set, destroy_call_elem, 0,
     init_channel_elem, grpc_channel_stack_no_post_init, destroy_channel_elem,
     grpc_channel_next_get_info,

test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc

@@ -159,6 +159,7 @@ class FailSendOpsFilter {
 grpc_channel_filter FailSendOpsFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/end2end/tests/retry_recv_message_replay.cc

@@ -109,6 +109,7 @@ class FailFirstSendOpFilter {
 grpc_channel_filter FailFirstSendOpFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/end2end/tests/retry_recv_trailing_metadata_error.cc

@@ -104,6 +104,7 @@ class InjectStatusFilter {
 grpc_channel_filter InjectStatusFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/end2end/tests/retry_send_op_fails.cc

@@ -110,6 +110,7 @@ class FailFirstCallFilter {
 grpc_channel_filter FailFirstCallFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/end2end/tests/retry_transparent_goaway.cc

@@ -116,6 +116,7 @@ class FailFirstCallFilter {
 grpc_channel_filter FailFirstCallFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc

@@ -115,6 +115,7 @@ class FailFirstTenCallsFilter {
 grpc_channel_filter FailFirstTenCallsFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/surface/channel_init_test.cc

@@ -35,9 +35,9 @@ const grpc_channel_filter* FilterNamed(const char* name) {
   if (it != filters->end()) return it->second;
   return filters
       ->emplace(name,
-                new grpc_channel_filter{nullptr, nullptr, nullptr, 0, nullptr,
-                                        nullptr, nullptr, 0, nullptr, nullptr,
-                                        nullptr, nullptr, name})
+                new grpc_channel_filter{nullptr, nullptr, nullptr, nullptr, 0,
+                                        nullptr, nullptr, nullptr, 0, nullptr,
+                                        nullptr, nullptr, nullptr, name})
       .first->second;
 }
 

test/core/transport/chttp2/streams_not_seen_test.cc

@@ -199,6 +199,7 @@ class TrailingMetadataRecordingFilter {
 grpc_channel_filter TrailingMetadataRecordingFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,

test/core/xds/xds_channel_stack_modifier_test.cc

@@ -95,11 +95,11 @@ TEST(XdsChannelStackModifierTest, XdsHttpFiltersInsertion) {
   grpc_init();
   // Add 2 test filters to XdsChannelStackModifier
   const grpc_channel_filter test_filter_1 = {
-      nullptr, nullptr, nullptr, 0,       nullptr, nullptr,     nullptr,
-      0,       nullptr, nullptr, nullptr, nullptr, kTestFilter1};
+      nullptr, nullptr, nullptr, nullptr, 0,       nullptr, nullptr,
+      nullptr, 0,       nullptr, nullptr, nullptr, nullptr, kTestFilter1};
   const grpc_channel_filter test_filter_2 = {
-      nullptr, nullptr, nullptr, 0,       nullptr, nullptr,     nullptr,
-      0,       nullptr, nullptr, nullptr, nullptr, kTestFilter2};
+      nullptr, nullptr, nullptr, nullptr, 0,       nullptr, nullptr,
+      nullptr, 0,       nullptr, nullptr, nullptr, nullptr, kTestFilter2};
   auto channel_stack_modifier = MakeRefCounted<XdsChannelStackModifier>(
       std::vector<const grpc_channel_filter*>{&test_filter_1, &test_filter_2});
   grpc_arg arg = channel_stack_modifier->MakeChannelArg();