reviewer feedback

2 files changed, 19 insertions, 22 deletions

diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc
index 8385475e7d..a569444fed 100644
--- a/test/core/channel/channel_trace_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@@ -30,6 +30,7 @@
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/lib/surface/channel.h"
 
 #include "test/core/util/test_config.h"
 #include "test/cpp/util/channel_trace_proto_helper.h"
@@ -51,6 +52,8 @@ class ChannelNodePeer {
   ChannelNode* node_;
 };
 
+size_t GetSizeofTraceEvent() { return sizeof(ChannelTrace::TraceEvent); }
+
 namespace {
 
 grpc_json* GetJsonChild(grpc_json* parent, const char* key) {
@@ -119,11 +122,9 @@ void ValidateChannelTrace(ChannelTrace* tracer, size_t num_events_logged) {
 class ChannelFixture {
  public:
   ChannelFixture(int max_tracer_event_memory) {
-    grpc_arg client_a;
-    client_a.type = GRPC_ARG_INTEGER;
-    client_a.key =
-        const_cast<char*>(GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE);
-    client_a.value.integer = max_tracer_event_memory;
+    grpc_arg client_a = grpc_channel_arg_integer_create(
+        const_cast<char*>(GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE),
+        max_tracer_event_memory);
     grpc_channel_args client_args = {1, &client_a};
     channel_ =
         grpc_insecure_channel_create("fake_target", &client_args, nullptr);
@@ -286,9 +287,9 @@ TEST(ChannelTracerTest, TestSmallMemoryLimit) {
 
 TEST(ChannelTracerTest, TestEviction) {
   grpc_core::ExecCtx exec_ctx;
-  // This depends on sizeof(ChannelTrace). If that struct has been updated,
+  // This depends on sizeof(ChannelEvent). If that struct has been updated,
   // this will too.
-  const int kTraceEventSize = 80;
+  const int kTraceEventSize = GetSizeofTraceEvent();
   const int kNumEvents = 5;
   ChannelTrace tracer(kTraceEventSize * kNumEvents);
   for (int i = 1; i <= kNumEvents; ++i) {
@@ -305,9 +306,9 @@ TEST(ChannelTracerTest, TestEviction) {
 
 TEST(ChannelTracerTest, TestMultipleEviction) {
   grpc_core::ExecCtx exec_ctx;
-  // This depends on sizeof(ChannelTrace). If that struct has been updated,
+  // This depends on sizeof(ChannelEvent). If that struct has been updated,
   // this will too.
-  const int kTraceEventSize = 80;
+  const int kTraceEventSize = GetSizeofTraceEvent();
   const int kNumEvents = 5;
   ChannelTrace tracer(kTraceEventSize * kNumEvents);
   for (int i = 1; i <= kNumEvents; ++i) {
@@ -326,9 +327,9 @@ TEST(ChannelTracerTest, TestMultipleEviction) {
 
 TEST(ChannelTracerTest, TestTotalEviction) {
   grpc_core::ExecCtx exec_ctx;
-  // This depends on sizeof(ChannelTrace). If that struct has been updated,
+  // This depends on sizeof(ChannelEvent). If that struct has been updated,
   // this will too.
-  const int kTraceEventSize = 80;
+  const int kTraceEventSize = GetSizeofTraceEvent();
   const int kNumEvents = 5;
   ChannelTrace tracer(kTraceEventSize * kNumEvents);
   for (int i = 1; i <= kNumEvents; ++i) {
diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc
index 58ffdc18da..0e3ad6a476 100644
--- a/test/core/end2end/tests/channelz.cc
+++ b/test/core/end2end/tests/channelz.cc
@@ -199,10 +199,8 @@ static void run_one_request(grpc_end2end_test_config config,
 static void test_channelz(grpc_end2end_test_config config) {
   grpc_end2end_test_fixture f;
 
-  grpc_arg arg;
-  arg.type = GRPC_ARG_INTEGER;
-  arg.key = const_cast<char*>(GRPC_ARG_ENABLE_CHANNELZ);
-  arg.value.integer = true;
+  grpc_arg arg = grpc_channel_arg_integer_create(
+      const_cast<char*>(GRPC_ARG_ENABLE_CHANNELZ), true);
   grpc_channel_args args = {1, &arg};
 
   f = begin_test(config, "test_channelz", &args, &args);
@@ -266,13 +264,11 @@ static void test_channelz_with_channel_trace(grpc_end2end_test_config config) {
   grpc_end2end_test_fixture f;
 
   grpc_arg arg[2];
-  arg[0].type = GRPC_ARG_INTEGER;
-  arg[0].key =
-      const_cast<char*>(GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE);
-  arg[0].value.integer = 1024;
-  arg[1].type = GRPC_ARG_INTEGER;
-  arg[1].key = const_cast<char*>(GRPC_ARG_ENABLE_CHANNELZ);
-  arg[1].value.integer = true;
+  arg[0] = grpc_channel_arg_integer_create(
+      const_cast<char*>(GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE),
+      1024 * 1024);
+  arg[1] = grpc_channel_arg_integer_create(
+      const_cast<char*>(GRPC_ARG_ENABLE_CHANNELZ), true);
   grpc_channel_args args = {GPR_ARRAY_SIZE(arg), arg};
 
   f = begin_test(config, "test_channelz_with_channel_trace", &args, &args);