grpc 1.83.1 → 1.84.0

data/src/core/ext/upbdefs-gen/{src/proto/grpc/channelz → grpc/channelz/v1}/channelz.upbdefs.h

@@ -1,6 +1,6 @@
 /* This file was generated by upb_generator from the input file:
  *
- *     src/proto/grpc/channelz/channelz.proto
+ *     grpc/channelz/v1/channelz.proto
  *
  * Do not edit -- your changes will be discarded when the file is
  * regenerated.
@@ -8,8 +8,8 @@
 
 
 
-#ifndef SRC_PROTO_GRPC_CHANNELZ_CHANNELZ_PROTO_UPB_H__UPBDEFS_H_
-#define SRC_PROTO_GRPC_CHANNELZ_CHANNELZ_PROTO_UPB_H__UPBDEFS_H_
+#ifndef GRPC_CHANNELZ_V1_CHANNELZ_PROTO_UPB_H__UPBDEFS_H_
+#define GRPC_CHANNELZ_V1_CHANNELZ_PROTO_UPB_H__UPBDEFS_H_
 
 #include "upb/reflection/def.h"
 #include "upb/reflection/internal/def_pool.h"
@@ -20,200 +20,200 @@
 extern "C" {
 #endif
 
-extern _upb_DefPool_Init src_proto_grpc_channelz_channelz_proto_upbdefinit;
+extern _upb_DefPool_Init grpc_channelz_v1_channelz_proto_upbdefinit;
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Channel_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Channel");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Subchannel_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Subchannel");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ChannelConnectivityState_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ChannelConnectivityState");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ChannelData_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ChannelData");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ChannelTraceEvent_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ChannelTraceEvent");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ChannelTrace_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ChannelTrace");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ChannelRef_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ChannelRef");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SubchannelRef_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SubchannelRef");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SocketRef_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SocketRef");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ServerRef_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ServerRef");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Server_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Server");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_ServerData_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.ServerData");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Socket_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Socket");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SocketData_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SocketData");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Address_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Address");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Address_TcpIpAddress_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Address.TcpIpAddress");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Address_UdsAddress_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Address.UdsAddress");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Address_OtherAddress_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Address.OtherAddress");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Security_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Security");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Security_Tls_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Security.Tls");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_Security_OtherSecurity_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.Security.OtherSecurity");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SocketOption_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SocketOption");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SocketOptionTimeout_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SocketOptionTimeout");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SocketOptionLinger_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SocketOptionLinger");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_SocketOptionTcpInfo_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.SocketOptionTcpInfo");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetTopChannelsRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetTopChannelsRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetTopChannelsResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetTopChannelsResponse");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetServersRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetServersRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetServersResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetServersResponse");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetServerRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetServerRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetServerResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetServerResponse");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetServerSocketsRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetServerSocketsRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetServerSocketsResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetServerSocketsResponse");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetChannelRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetChannelRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetChannelResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetChannelResponse");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetSubchannelRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetSubchannelRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetSubchannelResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetSubchannelResponse");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetSocketRequest_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetSocketRequest");
 }
 
 UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetSocketResponse_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &src_proto_grpc_channelz_channelz_proto_upbdefinit);
+  _upb_DefPool_LoadDefInit(s, &grpc_channelz_v1_channelz_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "grpc.channelz.v1.GetSocketResponse");
 }
 
@@ -224,4 +224,4 @@ UPB_INLINE const upb_MessageDef *grpc_channelz_v1_GetSocketResponse_getmsgdef(up
 
 #include "upb/port/undef.inc"
 
-#endif  /* SRC_PROTO_GRPC_CHANNELZ_CHANNELZ_PROTO_UPB_H__UPBDEFS_H_ */
+#endif  /* GRPC_CHANNELZ_V1_CHANNELZ_PROTO_UPB_H__UPBDEFS_H_ */

data/src/core/filter/auth/server_auth_filter.cc

@@ -164,9 +164,8 @@ void ServerAuthFilter::RunApplicationCode::OnMdProcessingDone(
     if (error_details == nullptr) {
       error_details = "Authentication metadata processing failed.";
     }
-    state->client_metadata = grpc_error_set_int(
-        absl::Status(static_cast<absl::StatusCode>(status), error_details),
-        StatusIntProperty::kRpcStatus, status);
+    state->client_metadata =
+        absl::Status(static_cast<absl::StatusCode>(status), error_details);
   }
 
   // Clean up.

data/src/core/filter/composite/composite_filter.cc

@@ -64,8 +64,16 @@ absl::StatusOr<RefCountedPtr<CompositeFilter>> CompositeFilter::Create(
     return absl::InternalError("composite filter config has wrong type");
   }
   auto config = filter_args.config().TakeAsSubclass<const Config>();
-  return MakeRefCounted<CompositeFilter>(args, std::move(config),
-                                         std::move(filter_args));
+  return MakeRefCounted<CompositeFilter>(args, std::move(config));
+}
+
+CompositeFilter::CompositeFilter(const ChannelArgs& args,
+                                 RefCountedPtr<const Config> config)
+    : V3InterceptorToV2Bridge<CompositeFilter>(args),
+      config_(std::move(config)) {
+  if (!args.GetBool(GRPC_ARG_USE_V3_STACK).value_or(false)) {
+    Init(args);
+  }
 }
 
 namespace {
@@ -92,12 +100,11 @@ class InterceptionChainBuilderWrapper final : public FilterChainBuilder {
 
 }  // namespace
 
-CompositeFilter::CompositeFilter(const ChannelArgs& args,
-                                 RefCountedPtr<const Config> config,
-                                 ChannelFilter::Args filter_args)
-    : config_(std::move(config)) {
+void CompositeFilter::Init(const ChannelArgs& args) {
   if (config_->matcher == nullptr) return;
   // Populate filter_chain_map_ from config_.
+  const bool is_server =
+      args.GetBool(GRPC_ARG_IS_SERVER_FILTER_STACK).value_or(false);
   config_->matcher->ForEachAction([&](const XdsMatcher::Action& action) {
     if (action.type() != ExecuteFilterAction::Type()) return;
     const auto& execute_filter_action =
@@ -110,31 +117,36 @@ CompositeFilter::CompositeFilter(const ChannelArgs& args,
     InterceptionChainBuilder builder(args);
     InterceptionChainBuilderWrapper builder_wrapper(builder);
     for (size_t i = 0; i < merged_configs.size(); ++i) {
-      const auto* filter_impl =
-          execute_filter_action.filter_chain()[i].filter_impl;
+      const auto* factory = execute_filter_action.filter_chain()[i].factory;
       const auto& filter_config = merged_configs[i];
-      // TODO(roth): Currently, this code assumes that it is always
-      // running on the client side, so we'll need to remove this
-      // assumption in order to make this filter work on the server
-      // side.  There are two ways we might do this:
-      // 1. If we finish the v3 migration before we need to support this
-      //    filter on the server side, then any filter impl will
-      //    automatically work fine on both the client and server side,
-      //    in which case this problem will go away, and we can remove
-      //    the IsSupportedOnClients() and IsSupportedOnServers()
-      //    methods from the xDS HTTP filter API.
-      // 2. If we need to support this filter on the server side before
-      //    we finish the v3 migration, then we'll need to add an
-      //    is_client parameter to the xDS HTTP filter AddFilter()
-      //    method, and use that to do this initialization differently
-      //    on client side vs. server side.
-      if (!filter_impl->IsSupportedOnClients()) {
-        filter_chain_map_[&execute_filter_action] = absl::UnavailableError(
-            absl::StrCat(filter_impl->ConfigProtoName(),
-                         " filter not supported on clients"));
-        return;
+      // If a filter is not supported on the client or server side
+      // (whichever one we're constructing a filter stack for), then we
+      // need to fail filter chain construction.  This means that any
+      // RPC that uses that filter chain will fail.
+      //
+      // Ideally, we would catch this case at xDS resource validation
+      // time, so that we can reject the invalid update instead of
+      // failing RPCs.  Unfortunately, the composite filter config can
+      // be overridden in an RDS resource, and we don't know at RDS
+      // resource validation time whether the RDS resource will be used
+      // on the client side or server side, so we can't always catch the
+      // problem at resource validation time.
+      if (is_server) {
+        if (!factory->IsSupportedOnServers()) {
+          filter_chain_map_[&execute_filter_action] = absl::UnavailableError(
+              absl::StrCat(factory->ConfigProtoName(),
+                           " filter not supported on servers"));
+          return;
+        }
+      } else {
+        if (!factory->IsSupportedOnClients()) {
+          filter_chain_map_[&execute_filter_action] = absl::UnavailableError(
+              absl::StrCat(factory->ConfigProtoName(),
+                           " filter not supported on clients"));
+          return;
+        }
       }
-      filter_impl->AddFilter(builder_wrapper, filter_config);
+      factory->AddFilter(builder_wrapper, filter_config);
     }
     filter_chain_map_[&execute_filter_action] =
         builder.Build(wrapped_destination());
@@ -152,7 +164,7 @@ void CompositeFilter::InterceptCall(
             handler.PullClientInitialMetadata(),
             [handler, self](ClientMetadataHandle metadata) {
               if (self->config_->matcher == nullptr) {
-                GRPC_TRACE_LOG(channel, INFO)
+                GRPC_TRACE_LOG(composite_filter, INFO)
                     << "[composite " << self.get()
                     << "]: no matcher configured, starting child call";
                 CallInitiator initiator = self->MakeChildCall(
@@ -177,7 +189,7 @@ void CompositeFilter::InterceptCall(
               // call to the next filter without sending it
               // through any child filter chain.
               if (action->type() == SkipFilterAction::Type()) {
-                GRPC_TRACE_LOG(channel, INFO)
+                GRPC_TRACE_LOG(composite_filter, INFO)
                     << "[composite " << self.get()
                     << "]: found SkipFilter, starting child call";
                 CallInitiator initiator = self->MakeChildCall(
@@ -201,7 +213,7 @@ void CompositeFilter::InterceptCall(
                 bool sampled =
                     random_value < execute_filter_action.sample_per_million();
                 if (!sampled) {
-                  GRPC_TRACE_LOG(channel, INFO)
+                  GRPC_TRACE_LOG(composite_filter, INFO)
                       << "[composite " << self.get()
                       << "]: not sampled, starting child call";
                   CallInitiator initiator = self->MakeChildCall(
@@ -215,7 +227,7 @@ void CompositeFilter::InterceptCall(
               if (it == self->filter_chain_map_.end()) {
                 return absl::InternalError("no filter chain found for action");
               }
-              GRPC_TRACE_LOG(channel, INFO)
+              GRPC_TRACE_LOG(composite_filter, INFO)
                   << "[composite " << self.get()
                   << "]: starting call on filter chain";
               auto& unstarted_destination = it->second;

data/src/core/filter/composite/composite_filter.h

@@ -58,11 +58,11 @@ class CompositeFilter final : public V3InterceptorToV2Bridge<CompositeFilter> {
   class ExecuteFilterAction final : public XdsMatcher::Action {
    public:
     struct Filter {
-      const XdsHttpFilterImpl* filter_impl;
+      const XdsHttpFilterFactory* factory;
       RefCountedPtr<const FilterConfig> filter_config;
 
       bool operator==(const Filter& other) const {
-        if (filter_impl != other.filter_impl) return false;
+        if (factory != other.factory) return false;
         if (filter_config == nullptr) return other.filter_config == nullptr;
         if (other.filter_config == nullptr) return false;
         return *filter_config == *other.filter_config;
@@ -136,10 +136,11 @@ class CompositeFilter final : public V3InterceptorToV2Bridge<CompositeFilter> {
   static absl::StatusOr<RefCountedPtr<CompositeFilter>> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  CompositeFilter(const ChannelArgs& args, RefCountedPtr<const Config> config,
-                  ChannelFilter::Args filter_args);
+  CompositeFilter(const ChannelArgs& args, RefCountedPtr<const Config> config);
 
  private:
+  void Init(const ChannelArgs& args) override;
+
   void Orphaned() override {}
 
   void InterceptCall(UnstartedCallHandler unstarted_call_handler) override;