grpc 1.71.0 → 1.72.0

data/src/core/{lib/transport → call}/metadata_compression_traits.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
+#ifndef GRPC_SRC_CORE_CALL_METADATA_COMPRESSION_TRAITS_H
+#define GRPC_SRC_CORE_CALL_METADATA_COMPRESSION_TRAITS_H
 
 #include <grpc/support/port_platform.h>
 #include <stddef.h>
@@ -63,4 +63,4 @@ struct HttpStatusCompressor {};
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
+#endif  // GRPC_SRC_CORE_CALL_METADATA_COMPRESSION_TRAITS_H

data/src/core/{lib/transport → call}/metadata_info.cc

@@ -12,17 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/metadata_info.h"
+#include "src/core/call/metadata_info.h"
 
 #include <grpc/support/port_platform.h>
 
+#include <cstddef>
+#include <string>
+
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/slice/slice.h"
 
 namespace grpc_core {
 
 class MetadataSizesAnnotation::MetadataSizeEncoder {
  public:
-  explicit MetadataSizeEncoder(std::string& summary) : summary_(summary) {}
+  explicit MetadataSizeEncoder(std::string& summary, uint64_t soft_limit,
+                               uint64_t hard_limit)
+      : summary_(summary) {
+    header_ = absl::StrCat("gRPC metadata soft_limit:", soft_limit,
+                           ",hard_limit:", hard_limit, ",");
+    absl::StrAppend(&summary_, header_);
+    entry_length_ = header_.length();
+  }
 
   void Encode(const Slice& key, const Slice& value) {
     AddToSummary(key.as_string_view(), value.size());
@@ -36,18 +47,25 @@ class MetadataSizesAnnotation::MetadataSizeEncoder {
  private:
   void AddToSummary(absl::string_view key,
                     size_t value_length) GPR_ATTRIBUTE_NOINLINE {
-    absl::StrAppend(&summary_, key, ":",
-                    hpack_constants::SizeForEntry(key.size(), value_length),
-                    ",");
+    std::string metadata_str = absl::StrCat(
+        key, ":", hpack_constants::SizeForEntry(key.size(), value_length), ",");
+    if ((entry_length_ + metadata_str.length()) < 200) {
+      // Limit each annotation to 200 bytes.
+      entry_length_ += metadata_str.length();
+      absl::StrAppend(&summary_, metadata_str);
+    } else {
+      absl::StrAppend(&summary_, ";", header_, metadata_str);
+      entry_length_ = header_.length() + metadata_str.length();
+    }
   }
   std::string& summary_;
+  std::string header_;
+  size_t entry_length_ = 0;
 };
 
 std::string MetadataSizesAnnotation::ToString() const {
-  std::string metadata_annotation =
-      absl::StrCat("gRPC metadata soft_limit:", soft_limit_,
-                   ",hard_limit:", hard_limit_, ",");
-  MetadataSizeEncoder encoder(metadata_annotation);
+  std::string metadata_annotation;
+  MetadataSizeEncoder encoder(metadata_annotation, soft_limit_, hard_limit_);
   metadata_buffer_->Encode(&encoder);
   return metadata_annotation;
 }

data/src/core/{lib/transport → call}/metadata_info.h

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_INFO_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_INFO_H
+#ifndef GRPC_SRC_CORE_CALL_METADATA_INFO_H
+#define GRPC_SRC_CORE_CALL_METADATA_INFO_H
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/call/metadata_batch.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/telemetry/call_tracer.h"
 
 namespace grpc_core {
@@ -82,4 +82,4 @@ class MetadataSizesAnnotation
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_INFO_H
+#endif  // GRPC_SRC_CORE_CALL_METADATA_INFO_H

data/src/core/{lib/transport → call}/parsed_metadata.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/transport/parsed_metadata.h"
+#include "src/core/call/parsed_metadata.h"
 
 #include <grpc/support/port_platform.h>
 

data/src/core/{lib/transport → call}/parsed_metadata.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
+#ifndef GRPC_SRC_CORE_CALL_PARSED_METADATA_H
+#define GRPC_SRC_CORE_CALL_PARSED_METADATA_H
 
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
@@ -426,4 +426,4 @@ ParsedMetadata<MetadataContainer>::KeyValueVTable(absl::string_view key) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
+#endif  // GRPC_SRC_CORE_CALL_PARSED_METADATA_H

data/src/core/call/request_buffer.h

@@ -17,9 +17,9 @@
 
 #include <utility>
 
-#include "src/core/lib/transport/call_spine.h"
-#include "src/core/lib/transport/message.h"
-#include "src/core/lib/transport/metadata.h"
+#include "src/core/call/call_spine.h"
+#include "src/core/call/message.h"
+#include "src/core/call/metadata.h"
 
 namespace grpc_core {
 

data/src/core/call/security_context.cc

@@ -0,0 +1,125 @@
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "src/core/call/security_context.h"
+
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <string.h>
+
+#include <algorithm>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "src/core/credentials/call/call_credentials.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/debug/trace.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/surface/call.h"
+#include "src/core/util/ref_counted_ptr.h"
+
+// --- grpc_call ---
+
+grpc_call_error grpc_call_set_credentials(grpc_call* call,
+                                          grpc_call_credentials* creds) {
+  grpc_core::ExecCtx exec_ctx;
+  grpc_client_security_context* ctx = nullptr;
+  GRPC_TRACE_LOG(api, INFO) << "grpc_call_set_credentials(call=" << call
+                            << ", creds=" << creds << ")";
+  if (!grpc_call_is_client(call)) {
+    LOG(ERROR) << "Method is client-side only.";
+    return GRPC_CALL_ERROR_NOT_ON_SERVER;
+  }
+  auto* arena = grpc_call_get_arena(call);
+  ctx = grpc_core::DownCast<grpc_client_security_context*>(
+      arena->GetContext<grpc_core::SecurityContext>());
+  if (ctx == nullptr) {
+    ctx = grpc_client_security_context_create(arena, creds);
+    arena->SetContext<grpc_core::SecurityContext>(ctx);
+  } else {
+    ctx->creds = creds != nullptr ? creds->Ref() : nullptr;
+  }
+  return GRPC_CALL_OK;
+}
+
+grpc_auth_context* grpc_call_auth_context(grpc_call* call) {
+  auto* sec_ctx =
+      grpc_call_get_arena(call)->GetContext<grpc_core::SecurityContext>();
+  GRPC_TRACE_LOG(api, INFO) << "grpc_call_auth_context(call=" << call << ")";
+  if (sec_ctx == nullptr) return nullptr;
+  if (grpc_call_is_client(call)) {
+    auto* sc = grpc_core::DownCast<grpc_client_security_context*>(sec_ctx);
+    if (sc->auth_context == nullptr) {
+      return nullptr;
+    } else {
+      return sc->auth_context
+          ->Ref(DEBUG_LOCATION, "grpc_call_auth_context client")
+          .release();
+    }
+  } else {
+    auto* sc = grpc_core::DownCast<grpc_server_security_context*>(sec_ctx);
+    if (sc->auth_context == nullptr) {
+      return nullptr;
+    } else {
+      return sc->auth_context
+          ->Ref(DEBUG_LOCATION, "grpc_call_auth_context server")
+          .release();
+    }
+  }
+}
+
+// --- grpc_client_security_context ---
+grpc_client_security_context::~grpc_client_security_context() {
+  auth_context.reset(DEBUG_LOCATION, "client_security_context");
+  if (extension.instance != nullptr && extension.destroy != nullptr) {
+    extension.destroy(extension.instance);
+  }
+}
+
+grpc_client_security_context* grpc_client_security_context_create(
+    grpc_core::Arena* arena, grpc_call_credentials* creds) {
+  return arena->New<grpc_client_security_context>(
+      creds != nullptr ? creds->Ref() : nullptr);
+}
+
+void grpc_client_security_context_destroy(void* ctx) {
+  grpc_client_security_context* c =
+      static_cast<grpc_client_security_context*>(ctx);
+  c->~grpc_client_security_context();
+}
+
+// --- grpc_server_security_context ---
+grpc_server_security_context::~grpc_server_security_context() {
+  auth_context.reset(DEBUG_LOCATION, "server_security_context");
+  if (extension.instance != nullptr && extension.destroy != nullptr) {
+    extension.destroy(extension.instance);
+  }
+}
+
+grpc_server_security_context* grpc_server_security_context_create(
+    grpc_core::Arena* arena) {
+  return arena->New<grpc_server_security_context>();
+}
+
+void grpc_server_security_context_destroy(void* ctx) {
+  grpc_server_security_context* c =
+      static_cast<grpc_server_security_context*>(ctx);
+  c->~grpc_server_security_context();
+}

data/src/core/call/security_context.h

@@ -0,0 +1,114 @@
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_CALL_SECURITY_CONTEXT_H
+#define GRPC_SRC_CORE_CALL_SECURITY_CONTEXT_H
+
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <stddef.h>
+
+#include <memory>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+#include "src/core/credentials/call/call_credentials.h"  // IWYU pragma: keep
+#include "src/core/lib/debug/trace.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/surface/connection_context.h"
+#include "src/core/transport/auth_context.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/orphanable.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/useful.h"
+
+// --- grpc_security_context_extension ---
+
+// Extension to the security context that may be set in a filter and accessed
+// later by a higher level method on a grpc_call object.
+
+struct grpc_security_context_extension {
+  void* instance = nullptr;
+  void (*destroy)(void*) = nullptr;
+};
+
+namespace grpc_core {
+
+// TODO(roth): Consider renaming to something like CallSecurityContext
+// to reflect the fact that it stores call-level security properties.
+class SecurityContext {
+ public:
+  virtual ~SecurityContext() = default;
+};
+
+}  // namespace grpc_core
+
+// --- grpc_client_security_context ---
+
+// Internal client-side security context.
+
+struct grpc_client_security_context final : public grpc_core::SecurityContext {
+  explicit grpc_client_security_context(
+      grpc_core::RefCountedPtr<grpc_call_credentials> creds)
+      : creds(std::move(creds)) {}
+  ~grpc_client_security_context() override;
+
+  grpc_core::RefCountedPtr<grpc_call_credentials> creds;
+  grpc_core::RefCountedPtr<grpc_auth_context> auth_context;
+  grpc_security_context_extension extension;
+};
+
+grpc_client_security_context* grpc_client_security_context_create(
+    grpc_core::Arena* arena, grpc_call_credentials* creds);
+void grpc_client_security_context_destroy(void* ctx);
+
+// --- grpc_server_security_context ---
+
+// Internal server-side security context.
+
+struct grpc_server_security_context final : public grpc_core::SecurityContext {
+  grpc_server_security_context() = default;
+  ~grpc_server_security_context() override;
+
+  grpc_core::RefCountedPtr<grpc_auth_context> auth_context;
+  grpc_security_context_extension extension;
+};
+
+grpc_server_security_context* grpc_server_security_context_create(
+    grpc_core::Arena* arena);
+void grpc_server_security_context_destroy(void* ctx);
+
+namespace grpc_core {
+template <>
+struct ArenaContextType<SecurityContext> {
+  static void Destroy(SecurityContext* p) { p->~SecurityContext(); }
+};
+
+template <>
+struct ContextSubclass<grpc_client_security_context> {
+  using Base = SecurityContext;
+};
+template <>
+struct ContextSubclass<grpc_server_security_context> {
+  using Base = SecurityContext;
+};
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_CALL_SECURITY_CONTEXT_H

data/src/core/{lib/surface → call}/server_call.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/surface/server_call.h"
+#include "src/core/call/server_call.h"
 
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
@@ -39,6 +39,8 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata.h"
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
@@ -47,8 +49,6 @@
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/transport/metadata.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/server/server_interface.h"
 #include "src/core/util/bitset.h"
 #include "src/core/util/latent_see.h"

data/src/core/{lib/surface → call}/server_call.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
-#define GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
+#ifndef GRPC_SRC_CORE_CALL_SERVER_CALL_H
+#define GRPC_SRC_CORE_CALL_SERVER_CALL_H
 
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
@@ -43,12 +43,12 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata.h"
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/call_utils.h"
-#include "src/core/lib/transport/metadata.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/server/server_interface.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
@@ -166,4 +166,4 @@ grpc_call* MakeServerCall(CallHandler call_handler,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
+#endif  // GRPC_SRC_CORE_CALL_SERVER_CALL_H

data/src/core/{lib/transport → call}/simple_slice_based_metadata.h

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
+#ifndef GRPC_SRC_CORE_CALL_SIMPLE_SLICE_BASED_METADATA_H
+#define GRPC_SRC_CORE_CALL_SIMPLE_SLICE_BASED_METADATA_H
 
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/string_view.h"
+#include "src/core/call/parsed_metadata.h"
 #include "src/core/lib/slice/slice.h"
-#include "src/core/lib/transport/parsed_metadata.h"
 
 namespace grpc_core {
 
@@ -50,4 +50,4 @@ struct SimpleSliceBasedMetadata {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
+#endif  // GRPC_SRC_CORE_CALL_SIMPLE_SLICE_BASED_METADATA_H

data/src/core/{lib/channel → call}/status_util.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/channel/status_util.h"
+#include "src/core/call/status_util.h"
 
 #include <grpc/support/port_platform.h>
 #include <string.h>

data/src/core/{lib/channel → call}/status_util.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
-#define GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
+#ifndef GRPC_SRC_CORE_CALL_STATUS_UTIL_H
+#define GRPC_SRC_CORE_CALL_STATUS_UTIL_H
 
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
@@ -77,4 +77,4 @@ absl::Status MaybeRewriteIllegalStatusCode(absl::Status status,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
+#endif  // GRPC_SRC_CORE_CALL_STATUS_UTIL_H

data/src/core/client_channel/client_channel.cc

@@ -45,6 +45,10 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/call_spine.h"
+#include "src/core/call/client_call.h"
+#include "src/core/call/metadata_batch.h"
+#include "src/core/call/status_util.h"
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/client_channel/config_selector.h"
@@ -55,10 +59,10 @@
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/config/core_configuration.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/resolved_address.h"
@@ -70,16 +74,12 @@
 #include "src/core/lib/promise/sleep.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/client_call.h"
 #include "src/core/lib/surface/completion_queue.h"
-#include "src/core/lib/transport/call_spine.h"
 #include "src/core/lib/transport/connectivity_state.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
@@ -495,7 +495,7 @@ class ClientChannel::ClientChannelControlHelper
   }
 
   GlobalStatsPluginRegistry::StatsPluginGroup& GetStatsPluginGroup() override {
-    return client_channel_->stats_plugin_group_;
+    return *client_channel_->stats_plugin_group_;
   }
 
   void AddTraceEvent(TraceSeverity severity, absl::string_view message) override
@@ -587,6 +587,7 @@ absl::StatusOr<RefCountedPtr<Channel>> ClientChannel::Create(
 }
 
 namespace {
+
 std::string GetDefaultAuthorityFromChannelArgs(const ChannelArgs& channel_args,
                                                absl::string_view target) {
   std::optional<std::string> default_authority =
@@ -598,6 +599,18 @@ std::string GetDefaultAuthorityFromChannelArgs(const ChannelArgs& channel_args,
     return std::move(*default_authority);
   }
 }
+
+std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
+GetStatsPluginGroupFromChannelArgs(const ChannelArgs& channel_args,
+                                   absl::string_view target,
+                                   absl::string_view default_authority) {
+  grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config(
+      channel_args);
+  experimental::StatsPluginChannelScope scope(target, default_authority,
+                                              endpoint_config);
+  return GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope);
+}
+
 }  // namespace
 
 ClientChannel::ClientChannel(
@@ -606,15 +619,17 @@ ClientChannel::ClientChannel(
     ClientChannelFactory* client_channel_factory,
     CallDestinationFactory* call_destination_factory)
     : Channel(std::move(target), channel_args),
-      channel_args_(std::move(channel_args)),
+      default_authority_(
+          GetDefaultAuthorityFromChannelArgs(channel_args, this->target())),
+      stats_plugin_group_(GetStatsPluginGroupFromChannelArgs(
+          channel_args, this->target(), default_authority_)),
+      channel_args_(channel_args.SetObject(stats_plugin_group_)),
       event_engine_(channel_args_.GetObjectRef<EventEngine>()),
       uri_to_resolve_(std::move(uri_to_resolve)),
       service_config_parser_index_(
           internal::ClientChannelServiceConfigParser::ParserIndex()),
       default_service_config_(std::move(default_service_config)),
       client_channel_factory_(client_channel_factory),
-      default_authority_(
-          GetDefaultAuthorityFromChannelArgs(channel_args_, this->target())),
       channelz_node_(channel_args_.GetObject<channelz::ChannelNode>()),
       idle_timeout_(GetClientIdleTimeout(channel_args_)),
       resolver_data_for_calls_(ResolverDataForCalls{}),
@@ -634,13 +649,6 @@ ClientChannel::ClientChannel(
   } else {
     keepalive_time_ = -1;  // unset
   }
-  // Get stats plugins for channel.
-  grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config(
-      channel_args_);
-  experimental::StatsPluginChannelScope scope(
-      this->target(), default_authority_, endpoint_config);
-  stats_plugin_group_ =
-      GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope);
 }
 
 ClientChannel::~ClientChannel() {

data/src/core/client_channel/client_channel.h

@@ -22,6 +22,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/subchannel.h"
@@ -29,7 +30,6 @@
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/promise/observable.h"
 #include "src/core/lib/surface/channel.h"
-#include "src/core/lib/transport/metadata.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/service_config/service_config.h"
@@ -170,6 +170,9 @@ class ClientChannel : public Channel {
       ConfigSelector& config_selector,
       ClientMetadata& client_initial_metadata) const;
 
+  const std::string default_authority_;
+  const std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
+      stats_plugin_group_;
   const ChannelArgs channel_args_;
   const std::shared_ptr<grpc_event_engine::experimental::EventEngine>
       event_engine_;
@@ -177,9 +180,7 @@ class ClientChannel : public Channel {
   const size_t service_config_parser_index_;
   const RefCountedPtr<ServiceConfig> default_service_config_;
   ClientChannelFactory* const client_channel_factory_;
-  const std::string default_authority_;
   channelz::ChannelNode* const channelz_node_;
-  GlobalStatsPluginRegistry::StatsPluginGroup stats_plugin_group_;
 
   //
   // Idleness state.