From ca067deeab7075f299eecfa8cea6be42d4e68a7d Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 6 May 2024 03:42:17 +0000
Subject: [PATCH] x

---
 src/core/server/server.cc              | 5 +++--
 test/core/surface/channel_init_test.cc | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index db67d9a62fc..27fca149739 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -862,7 +862,6 @@ auto Server::MatchAndPublishCall(CallHandler call_handler) {
               MakeServerCall(call_handler, std::move(md), this,
                              rc->cq_bound_to_call, rc->initial_metadata);
           *rc->call = call;
-          // TODO(ctiller): publish metadata
           return Map(WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
                      [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
                        return absl::OkStatus();
@@ -965,7 +964,6 @@ grpc_error_handle Server::SetupTransport(
   intptr_t channelz_socket_uuid = 0;
   if (socket_node != nullptr) {
     channelz_socket_uuid = socket_node->uuid();
-    channelz_node_->AddChildSocket(socket_node);
   }
   if (transport->server_transport() != nullptr) {
     // Take ownership
@@ -1005,6 +1003,9 @@ grpc_error_handle Server::SetupTransport(
     chand->InitTransport(Ref(), std::move(*channel), cq_idx, transport,
                          channelz_socket_uuid);
   }
+  if (socket_node != nullptr) {
+    channelz_node_->AddChildSocket(socket_node);
+  }
   return absl::OkStatus();
 }
 
diff --git a/test/core/surface/channel_init_test.cc b/test/core/surface/channel_init_test.cc
index 4745b6bc330..a90777973c3 100644
--- a/test/core/surface/channel_init_test.cc
+++ b/test/core/surface/channel_init_test.cc
@@ -269,6 +269,7 @@ TEST(ChannelInitTest, CanCreateFilterWithCall) {
                            allocator->MakeArena(), allocator, nullptr);
   (*stack)->StartCall(std::move(call.handler));
   EXPECT_EQ(p, 1);
+  EXPECT_EQ(handled, 1);
 }
 
 }  // namespace