grpc 1.63.2 → 1.64.0.pre1

data/src/core/lib/transport/transport_op_string.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>
 
@@ -25,6 +23,7 @@
 #include "absl/strings/str_format.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/gprpp/orphanable.h"

data/src/core/lib/uri/uri_parser.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/uri/uri_parser.h"
 
 #include <ctype.h>
@@ -27,6 +25,7 @@
 #include <string>
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
@@ -38,6 +37,7 @@
 #include "absl/strings/strip.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 
@@ -142,7 +142,7 @@ std::string PercentEncode(absl::string_view str,
   for (char c : str) {
     if (!is_allowed_char(c)) {
       std::string hex = absl::BytesToHexString(absl::string_view(&c, 1));
-      GPR_ASSERT(hex.size() == 2);
+      CHECK_EQ(hex.size(), 2u);
       // BytesToHexString() returns lower case, but
       // https://datatracker.ietf.org/doc/html/rfc3986#section-6.2.2.1 says
       // to prefer upper-case.

data/src/core/lib/uri/uri_parser.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LIB_URI_URI_PARSER_H
 #define GRPC_SRC_CORE_LIB_URI_URI_PARSER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <string>
 #include <vector>
@@ -26,6 +24,8 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 class URI {

data/src/core/load_balancing/address_filtering.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/address_filtering.h"
 
 #include <stddef.h>
@@ -24,6 +22,8 @@
 
 #include "absl/functional/function_ref.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/resolved_address.h"

data/src/core/load_balancing/address_filtering.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <utility>
@@ -27,6 +25,8 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_string.h"
 #include "src/core/resolver/endpoint_addresses.h"

data/src/core/load_balancing/backend_metric_data.h

@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // Represents backend metrics reported by the backend to the client.

data/src/core/load_balancing/backend_metric_parser.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/backend_metric_parser.h"
 
 #include <string.h>
@@ -28,6 +26,8 @@
 #include "upb/message/map.h"
 #include "xds/data/orca/v3/orca_load_report.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 namespace {

data/src/core/load_balancing/backend_metric_parser.h

@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/load_balancing/backend_metric_data.h"
 
 namespace grpc_core {

data/src/core/load_balancing/child_policy_handler.cc

@@ -14,29 +14,29 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/child_policy_handler.h"
 
 #include <memory>
 #include <string>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/transport/connectivity_state.h"
 
 namespace grpc_core {
 
@@ -115,12 +115,12 @@ class ChildPolicyHandler::Helper final
 
  private:
   bool CalledByPendingChild() const {
-    GPR_ASSERT(child_ != nullptr);
+    CHECK_NE(child_, nullptr);
     return child_ == parent()->pending_child_policy_.get();
   }
 
   bool CalledByCurrentChild() const {
-    GPR_ASSERT(child_ != nullptr);
+    CHECK_NE(child_, nullptr);
     return child_ == parent()->child_policy_.get();
   };
 
@@ -241,7 +241,7 @@ absl::Status ChildPolicyHandler::UpdateLocked(UpdateArgs args) {
                            ? pending_child_policy_.get()
                            : child_policy_.get();
   }
-  GPR_ASSERT(policy_to_update != nullptr);
+  CHECK_NE(policy_to_update, nullptr);
   // Update the policy.
   if (GRPC_TRACE_FLAG_ENABLED(*tracer_)) {
     gpr_log(GPR_INFO, "[child_policy_handler %p] updating %schild policy %p",

data/src/core/load_balancing/child_policy_handler.h

@@ -16,13 +16,13 @@
 
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
-#include <grpc/support/port_platform.h>
-
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/orphanable.h"

data/src/core/load_balancing/delegating_helper.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <utility>
 
 #include "absl/status/status.h"
@@ -27,14 +25,15 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/subchannel_interface.h"
-#include "src/core/lib/security/credentials/credentials.h"
 
 namespace grpc_core {
 

data/src/core/load_balancing/endpoint_list.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/endpoint_list.h"
 
 #include <stdlib.h>
@@ -24,6 +22,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
@@ -31,8 +30,8 @@
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/load_balancing/pick_first/pick_first.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/debug_location.h"
@@ -43,6 +42,7 @@
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/load_balancing/pick_first/pick_first.h"
 #include "src/core/resolver/endpoint_addresses.h"
 
 namespace grpc_core {
@@ -88,7 +88,7 @@ class EndpointList::Endpoint::Helper final
 // EndpointList::Endpoint
 //
 
-void EndpointList::Endpoint::Init(
+absl::Status EndpointList::Endpoint::Init(
     const EndpointAddresses& addresses, const ChannelArgs& args,
     std::shared_ptr<WorkSerializer> work_serializer) {
   ChannelArgs child_args =
@@ -118,15 +118,13 @@ void EndpointList::Endpoint::Init(
       CoreConfiguration::Get().lb_policy_registry().ParseLoadBalancingConfig(
           Json::FromArray(
               {Json::FromObject({{"pick_first", Json::FromObject({})}})}));
-  GPR_ASSERT(config.ok());
+  CHECK(config.ok());
   // Update child policy.
   LoadBalancingPolicy::UpdateArgs update_args;
   update_args.addresses = std::make_shared<SingleEndpointIterator>(addresses);
   update_args.args = child_args;
   update_args.config = std::move(*config);
-  // TODO(roth): If the child reports a non-OK status with the update,
-  // we need to propagate that back to the resolver somehow.
-  (void)child_policy_->UpdateLocked(std::move(update_args));
+  return child_policy_->UpdateLocked(std::move(update_args));
 }
 
 void EndpointList::Endpoint::Orphan() {

data/src/core/load_balancing/endpoint_list.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 
 #include <memory>
@@ -30,6 +28,7 @@
 #include "absl/types/optional.h"
 
 #include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/debug_location.h"
@@ -54,7 +53,8 @@ class MyEndpointList : public EndpointList {
  public:
   MyEndpointList(RefCountedPtr<MyLbPolicy> lb_policy,
                  EndpointAddressesIterator* endpoints,
-                 const ChannelArgs& args)
+                 const ChannelArgs& args,
+                 std::vector<std::string>* errors)
       : EndpointList(std::move(lb_policy),
                      GRPC_TRACE_FLAG_ENABLED(grpc_my_tracer)
                          ? "MyEndpointList"
@@ -64,7 +64,7 @@ class MyEndpointList : public EndpointList {
              const EndpointAddresses& addresses, const ChannelArgs& args) {
            return MakeOrphanable<MyEndpoint>(
                std::move(endpoint_list), addresses, args,
-               policy<MyLbPolicy>()->work_serializer());
+               policy<MyLbPolicy>()->work_serializer(), errors);
          });
   }
 
@@ -72,10 +72,15 @@ class MyEndpointList : public EndpointList {
   class MyEndpoint : public Endpoint {
    public:
     MyEndpoint(RefCountedPtr<MyEndpointList> endpoint_list,
-               const EndpointAddresses& address, const ChannelArgs& args,
-               std::shared_ptr<WorkSerializer> work_serializer)
+               const EndpointAddresses& addresses, const ChannelArgs& args,
+               std::shared_ptr<WorkSerializer> work_serializer,
+               std::vector<std::string>* errors)
         : Endpoint(std::move(endpoint_list)) {
-      Init(addresses, args, std::move(work_serializer));
+      absl::Status status = Init(addresses, args, std::move(work_serializer));
+      if (!status.ok()) {
+        errors->emplace_back(absl::StrCat(
+            "endpoint ", addresses.ToString(), ": ", status.ToString()));
+      }
     }
 
    private:
@@ -121,8 +126,9 @@ class EndpointList : public InternallyRefCounted<EndpointList> {
     explicit Endpoint(RefCountedPtr<EndpointList> endpoint_list)
         : endpoint_list_(std::move(endpoint_list)) {}
 
-    void Init(const EndpointAddresses& addresses, const ChannelArgs& args,
-              std::shared_ptr<WorkSerializer> work_serializer);
+    absl::Status Init(const EndpointAddresses& addresses,
+                      const ChannelArgs& args,
+                      std::shared_ptr<WorkSerializer> work_serializer);
 
     // Templated for convenience, to provide a short-hand for
     // down-casting in the caller.

data/src/core/load_balancing/grpclb/client_load_reporting_filter.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/grpclb/client_load_reporting_filter.h"
 
 #include <functional>
@@ -27,7 +25,8 @@
 
 #include "absl/types/optional.h"
 
-#include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/promise/context.h"
@@ -36,48 +35,47 @@
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
 
 namespace grpc_core {
+
+const NoInterceptor ClientLoadReportingFilter::Call::OnServerToClientMessage;
+const NoInterceptor ClientLoadReportingFilter::Call::OnClientToServerMessage;
+const NoInterceptor ClientLoadReportingFilter::Call::OnFinalize;
+
 const grpc_channel_filter ClientLoadReportingFilter::kFilter =
     MakePromiseBasedFilter<ClientLoadReportingFilter, FilterEndpoint::kClient,
                            kFilterExaminesServerInitialMetadata>(
         "client_load_reporting");
 
-absl::StatusOr<ClientLoadReportingFilter> ClientLoadReportingFilter::Create(
-    const ChannelArgs&, ChannelFilter::Args) {
-  return ClientLoadReportingFilter();
+absl::StatusOr<std::unique_ptr<ClientLoadReportingFilter>>
+ClientLoadReportingFilter::Create(const ChannelArgs&, ChannelFilter::Args) {
+  return std::make_unique<ClientLoadReportingFilter>();
 }
 
-ArenaPromise<ServerMetadataHandle> ClientLoadReportingFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  // Stats object to update.
-  RefCountedPtr<GrpcLbClientStats> client_stats;
-
+void ClientLoadReportingFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& client_initial_metadata) {
   // Handle client initial metadata.
   // Grab client stats object from metadata.
   auto client_stats_md =
-      call_args.client_initial_metadata->Take(GrpcLbClientStatsMetadata());
+      client_initial_metadata.Take(GrpcLbClientStatsMetadata());
   if (client_stats_md.has_value()) {
-    client_stats.reset(*client_stats_md);
+    client_stats_.reset(*client_stats_md);
   }
+}
 
-  auto* saw_initial_metadata = GetContext<Arena>()->New<bool>(false);
-  call_args.server_initial_metadata->InterceptAndMap(
-      [saw_initial_metadata](ServerMetadataHandle md) {
-        *saw_initial_metadata = true;
-        return md;
-      });
+void ClientLoadReportingFilter::Call::OnServerInitialMetadata(ServerMetadata&) {
+  saw_initial_metadata_ = true;
+}
 
-  return Map(next_promise_factory(std::move(call_args)),
-             [saw_initial_metadata, client_stats = std::move(client_stats)](
-                 ServerMetadataHandle trailing_metadata) {
-               if (client_stats != nullptr) {
-                 client_stats->AddCallFinished(
-                     trailing_metadata->get(GrpcStreamNetworkState()) ==
-                         GrpcStreamNetworkState::kNotSentOnWire,
-                     *saw_initial_metadata);
-               }
-               return trailing_metadata;
-             });
+void ClientLoadReportingFilter::Call::OnServerTrailingMetadata(
+    ServerMetadata& server_trailing_metadata) {
+  if (client_stats_ != nullptr) {
+    client_stats_->AddCallFinished(
+        server_trailing_metadata.get(GrpcStreamNetworkState()) ==
+            GrpcStreamNetworkState::kNotSentOnWire,
+        saw_initial_metadata_);
+  }
 }
+
 }  // namespace grpc_core

data/src/core/load_balancing/grpclb/client_load_reporting_filter.h

@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
@@ -31,16 +31,27 @@
 
 namespace grpc_core {
 
-class ClientLoadReportingFilter final : public ChannelFilter {
+class ClientLoadReportingFilter final
+    : public ImplementChannelFilter<ClientLoadReportingFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
-  static absl::StatusOr<ClientLoadReportingFilter> Create(
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& client_initial_metadata);
+    void OnServerInitialMetadata(ServerMetadata& server_initial_metadata);
+    void OnServerTrailingMetadata(ServerMetadata& server_trailing_metadata);
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnFinalize;
+
+   private:
+    RefCountedPtr<GrpcLbClientStats> client_stats_;
+    bool saw_initial_metadata_ = false;
+  };
+
+  static absl::StatusOr<std::unique_ptr<ClientLoadReportingFilter>> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
-
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
 };
 
 }  // namespace grpc_core