From 8e57ab8fc7403efdad8a3d8608c76937801b9c70 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Mon, 28 Oct 2024 23:44:42 +0000
Subject: [PATCH] Reviewer comments

---
 src/core/xds/grpc/xds_client_grpc.cc          |  7 +------
 test/cpp/end2end/xds/xds_core_end2end_test.cc | 10 ++++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc
index 70c8562ff33d0..3ffa3f9348a8e 100644
--- a/src/core/xds/grpc/xds_client_grpc.cc
+++ b/src/core/xds/grpc/xds_client_grpc.cc
@@ -232,7 +232,7 @@ GetStatsPluginGroupForKeyAndChannelArgs(absl::string_view key,
     return GlobalStatsPluginRegistry::GetStatsPluginsForServer(channel_args);
   }
   grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config(
-      ChannelArgs{});
+      ChannelArgs{channel_args});
   std::string authority =
       channel_args.GetOwnedString(GRPC_ARG_DEFAULT_AUTHORITY)
           .value_or(
@@ -250,11 +250,6 @@ absl::StatusOr<RefCountedPtr<GrpcXdsClient>> GrpcXdsClient::GetOrCreate(
   // instance for the channel or server instead of using the global instance.
   absl::optional<absl::string_view> bootstrap_config = args.GetString(
       GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_BOOTSTRAP_CONFIG);
-  std::string channel_default_authority =
-      args.GetOwnedString(GRPC_ARG_DEFAULT_AUTHORITY)
-          .value_or(
-              CoreConfiguration::Get().resolver_registry().GetDefaultAuthority(
-                  key));
   if (bootstrap_config.has_value()) {
     auto bootstrap = GrpcXdsBootstrap::Create(*bootstrap_config);
     if (!bootstrap.ok()) return bootstrap.status();
diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc
index 217b509ba4ac5..4d486de2b9821 100644
--- a/test/cpp/end2end/xds/xds_core_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc
@@ -1122,10 +1122,16 @@ class XdsMetricsTest : public XdsEnd2endTest {
                 [](const grpc_core::experimental::StatsPluginChannelScope&
                        scope) {
                   return scope.target() == absl::StrCat("xds:", kServerName) &&
-                         scope.default_authority() == kServerName;
+                         scope.default_authority() == kServerName &&
+                         scope.experimental_args().GetString("test_only.arg") ==
+                             "test_only.value";
                 })
             .BuildAndRegister();
-    InitClient();
+    ChannelArguments args;
+    args.SetString("test_only.arg", "test_only.value");
+    InitClient(/*builder=*/absl::nullopt, /*lb_expected_authority=*/"",
+               /*xds_resource_does_not_exist_timeout_ms=*/0,
+               /*balancer_authority_override=*/"", /*args=*/&args);
   }
 
   std::shared_ptr<grpc_core::FakeStatsPlugin> stats_plugin_;