grpc 1.51.0 → 1.52.0

data/src/core/ext/filters/client_channel/http_proxy.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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.
- *
- */
+//
+//
+// Copyright 2016 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 <grpc/support/port_platform.h>
 
@@ -35,7 +35,7 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
@@ -52,24 +52,24 @@
 namespace grpc_core {
 namespace {
 
-/**
- * Parses the 'https_proxy' env var (fallback on 'http_proxy') and returns the
- * proxy hostname to resolve or nullopt on error. Also sets 'user_cred' to user
- * credentials if present in the 'http_proxy' env var, otherwise leaves it
- * unchanged.
- */
+///
+/// Parses the 'https_proxy' env var (fallback on 'http_proxy') and returns the
+/// proxy hostname to resolve or nullopt on error. Also sets 'user_cred' to user
+/// credentials if present in the 'http_proxy' env var, otherwise leaves it
+/// unchanged.
+///
 absl::optional<std::string> GetHttpProxyServer(
     const ChannelArgs& args, absl::optional<std::string>* user_cred) {
   GPR_ASSERT(user_cred != nullptr);
   absl::StatusOr<URI> uri;
-  /* We check the following places to determine the HTTP proxy to use, stopping
-   * at the first one that is set:
-   * 1. GRPC_ARG_HTTP_PROXY channel arg
-   * 2. grpc_proxy environment variable
-   * 3. https_proxy environment variable
-   * 4. http_proxy environment variable
-   * If none of the above are set, then no HTTP proxy will be used.
-   */
+  // We check the following places to determine the HTTP proxy to use, stopping
+  // at the first one that is set:
+  // 1. GRPC_ARG_HTTP_PROXY channel arg
+  // 2. grpc_proxy environment variable
+  // 3. https_proxy environment variable
+  // 4. http_proxy environment variable
+  // If none of the above are set, then no HTTP proxy will be used.
+  //
   absl::optional<std::string> uri_str =
       args.GetOwnedString(GRPC_ARG_HTTP_PROXY);
   if (!uri_str.has_value()) uri_str = GetEnv("grpc_proxy");
@@ -89,23 +89,23 @@ absl::optional<std::string> GetHttpProxyServer(
             uri->scheme().c_str());
     return absl::nullopt;
   }
-  /* Split on '@' to separate user credentials from host */
+  // Split on '@' to separate user credentials from host
   char** authority_strs = nullptr;
   size_t authority_nstrs;
   gpr_string_split(uri->authority().c_str(), "@", &authority_strs,
                    &authority_nstrs);
-  GPR_ASSERT(authority_nstrs != 0); /* should have at least 1 string */
+  GPR_ASSERT(authority_nstrs != 0);  // should have at least 1 string
   absl::optional<std::string> proxy_name;
   if (authority_nstrs == 1) {
-    /* User cred not present in authority */
+    // User cred not present in authority
     proxy_name = authority_strs[0];
   } else if (authority_nstrs == 2) {
-    /* User cred found */
+    // User cred found
     *user_cred = authority_strs[0];
     proxy_name = authority_strs[1];
     gpr_log(GPR_DEBUG, "userinfo found in proxy URI");
   } else {
-    /* Bad authority */
+    // Bad authority
     proxy_name = absl::nullopt;
   }
   for (size_t i = 0; i < authority_nstrs; i++) {
@@ -149,7 +149,7 @@ absl::optional<std::string> HttpProxyMapper::MapName(
             std::string(server_uri).c_str());
     return absl::nullopt;
   }
-  /* Prefer using 'no_grpc_proxy'. Fallback on 'no_proxy' if it is not set. */
+  // Prefer using 'no_grpc_proxy'. Fallback on 'no_proxy' if it is not set.
   auto no_proxy_str = GetEnv("no_grpc_proxy");
   if (!no_proxy_str.has_value()) {
     no_proxy_str = GetEnv("no_proxy");
@@ -181,7 +181,7 @@ absl::optional<std::string> HttpProxyMapper::MapName(
   *args = args->Set(GRPC_ARG_HTTP_CONNECT_SERVER,
                     MaybeAddDefaultPort(absl::StripPrefix(uri->path(), "/")));
   if (user_cred.has_value()) {
-    /* Use base64 encoding for user credentials as stated in RFC 7617 */
+    // Use base64 encoding for user credentials as stated in RFC 7617
     auto encoded_user_cred = UniquePtr<char>(
         grpc_base64_encode(user_cred->data(), user_cred->length(), 0, 0));
     *args = args->Set(

data/src/core/ext/filters/client_channel/http_proxy.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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.
- *
- */
+//
+//
+// Copyright 2016 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_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_H
@@ -49,4 +49,4 @@ void RegisterHttpProxyMapper(CoreConfiguration::Builder* builder);
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_H */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_PROXY_H

data/src/core/ext/filters/client_channel/lb_call_state_internal.h

@@ -0,0 +1,39 @@
+//
+// 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_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_CALL_STATE_INTERNAL_H
+#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_CALL_STATE_INTERNAL_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/strings/string_view.h"
+
+#include "src/core/lib/gprpp/unique_type_name.h"
+#include "src/core/lib/load_balancing/lb_policy.h"
+
+namespace grpc_core {
+
+//
+// LbCallStateInternal
+//
+class LbCallStateInternal : public LoadBalancingPolicy::CallState {
+ public:
+  virtual absl::string_view GetCallAttribute(UniqueTypeName type) = 0;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_CALL_STATE_INTERNAL_H

data/src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h

@@ -1,20 +1,18 @@
-/*
- *
- * Copyright 2022 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.
- *
- */
+//
+// Copyright 2022 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_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H
@@ -34,6 +32,8 @@ struct BackendMetricData {
   /// Memory utilization expressed as a fraction of available memory
   /// resources.
   double mem_utilization = -1;
+  /// Total QPS being served by the backend across all services.
+  double qps = -1;
   /// Application-specific requests cost metrics.  Metric names are
   /// determined by the application.  Each value is an absolute cost
   /// (e.g. 3487 bytes of storage) associated with the request.

data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc

@@ -26,7 +26,7 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/codegen/connectivity_state.h>
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_args.h"
@@ -61,7 +61,7 @@ class ChildPolicyHandler::Helper
   }
 
   void UpdateState(grpc_connectivity_state state, const absl::Status& status,
-                   std::unique_ptr<SubchannelPicker> picker) override {
+                   RefCountedPtr<SubchannelPicker> picker) override {
     if (parent_->shutting_down_) return;
     // If this request is from the pending child policy, ignore it until
     // it reports something other than CONNECTING, at which point we swap it

data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h

@@ -85,5 +85,4 @@ class ChildPolicyHandler : public LoadBalancingPolicy {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H \
-        */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H

data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc

@@ -1,150 +1,78 @@
-/*
- *
- * Copyright 2017 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.
- *
- */
+//
+//
+// Copyright 2017 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 <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h"
 
-#include <new>
+#include <functional>
+#include <memory>
+#include <type_traits>
+#include <utility>
 
 #include "absl/meta/type_traits.h"
-#include "absl/status/status.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/log.h>
-
 #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h"
-#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/promise/latch.h"
+#include "src/core/lib/promise/promise.h"
+#include "src/core/lib/promise/seq.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 
-static grpc_error_handle clr_init_channel_elem(
-    grpc_channel_element* /*elem*/, grpc_channel_element_args* /*args*/) {
-  return absl::OkStatus();
-}
-
-static void clr_destroy_channel_elem(grpc_channel_element* /*elem*/) {}
-
-namespace {
-
-struct call_data {
-  // Stats object to update.
-  grpc_core::RefCountedPtr<grpc_core::GrpcLbClientStats> client_stats;
-  // State for intercepting send_initial_metadata.
-  grpc_closure on_complete_for_send;
-  grpc_closure* original_on_complete_for_send;
-  bool send_initial_metadata_succeeded = false;
-  // State for intercepting recv_initial_metadata.
-  grpc_closure recv_initial_metadata_ready;
-  grpc_closure* original_recv_initial_metadata_ready;
-  bool recv_initial_metadata_succeeded = false;
-};
-
-}  // namespace
-
-static void on_complete_for_send(void* arg, grpc_error_handle error) {
-  call_data* calld = static_cast<call_data*>(arg);
-  if (error.ok()) {
-    calld->send_initial_metadata_succeeded = true;
-  }
-  grpc_core::Closure::Run(DEBUG_LOCATION, calld->original_on_complete_for_send,
-                          error);
-}
-
-static void recv_initial_metadata_ready(void* arg, grpc_error_handle error) {
-  call_data* calld = static_cast<call_data*>(arg);
-  if (error.ok()) {
-    calld->recv_initial_metadata_succeeded = true;
-  }
-  grpc_core::Closure::Run(DEBUG_LOCATION,
-                          calld->original_recv_initial_metadata_ready, error);
-}
+namespace grpc_core {
+const grpc_channel_filter ClientLoadReportingFilter::kFilter =
+    MakePromiseBasedFilter<ClientLoadReportingFilter, FilterEndpoint::kClient,
+                           kFilterExaminesServerInitialMetadata>(
+        "client_load_reporting");
 
-static grpc_error_handle clr_init_call_elem(
-    grpc_call_element* elem, const grpc_call_element_args* args) {
-  GPR_ASSERT(args->context != nullptr);
-  new (elem->call_data) call_data();
-  return absl::OkStatus();
+absl::StatusOr<ClientLoadReportingFilter> ClientLoadReportingFilter::Create(
+    const ChannelArgs&, ChannelFilter::Args) {
+  return ClientLoadReportingFilter();
 }
 
-static void clr_destroy_call_elem(grpc_call_element* elem,
-                                  const grpc_call_final_info* /*final_info*/,
-                                  grpc_closure* /*ignored*/) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  if (calld->client_stats != nullptr) {
-    // Record call finished, optionally setting client_failed_to_send and
-    // received.
-    calld->client_stats->AddCallFinished(
-        !calld->send_initial_metadata_succeeded /* client_failed_to_send */,
-        calld->recv_initial_metadata_succeeded /* known_received */);
+ArenaPromise<ServerMetadataHandle> ClientLoadReportingFilter::MakeCallPromise(
+    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+  // Stats object to update.
+  RefCountedPtr<GrpcLbClientStats> client_stats;
+
+  // Handle client initial metadata.
+  // Grab client stats object from metadata.
+  auto client_stats_md =
+      call_args.client_initial_metadata->Take(GrpcLbClientStatsMetadata());
+  if (client_stats_md.has_value()) {
+    client_stats.reset(*client_stats_md);
   }
-  calld->~call_data();
-}
 
-static void clr_start_transport_stream_op_batch(
-    grpc_call_element* elem, grpc_transport_stream_op_batch* batch) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  // Handle send_initial_metadata.
-  if (batch->send_initial_metadata) {
-    // Grab client stats object from metadata.
-    auto client_stats_md =
-        batch->payload->send_initial_metadata.send_initial_metadata->Take(
-            grpc_core::GrpcLbClientStatsMetadata());
-    if (client_stats_md.has_value()) {
-      grpc_core::GrpcLbClientStats* client_stats = *client_stats_md;
-      if (client_stats != nullptr) {
-        calld->client_stats.reset(client_stats);
-        // Intercept completion.
-        calld->original_on_complete_for_send = batch->on_complete;
-        GRPC_CLOSURE_INIT(&calld->on_complete_for_send, on_complete_for_send,
-                          calld, grpc_schedule_on_exec_ctx);
-        batch->on_complete = &calld->on_complete_for_send;
-      }
-    }
-  }
-  // Intercept completion of recv_initial_metadata.
-  if (batch->recv_initial_metadata) {
-    calld->original_recv_initial_metadata_ready =
-        batch->payload->recv_initial_metadata.recv_initial_metadata_ready;
-    GRPC_CLOSURE_INIT(&calld->recv_initial_metadata_ready,
-                      recv_initial_metadata_ready, calld,
-                      grpc_schedule_on_exec_ctx);
-    batch->payload->recv_initial_metadata.recv_initial_metadata_ready =
-        &calld->recv_initial_metadata_ready;
-  }
-  // Chain to next filter.
-  grpc_call_next_op(elem, batch);
+  auto* server_initial_metadata = call_args.server_initial_metadata;
+
+  return Seq(next_promise_factory(std::move(call_args)),
+             [server_initial_metadata, client_stats = std::move(client_stats)](
+                 ServerMetadataHandle trailing_metadata) {
+               if (client_stats != nullptr) {
+                 client_stats->AddCallFinished(
+                     trailing_metadata->get(GrpcStreamNetworkState()) ==
+                         GrpcStreamNetworkState::kNotSentOnWire,
+                     NowOrNever(server_initial_metadata->Wait()).has_value());
+               }
+               return trailing_metadata;
+             });
 }
-
-const grpc_channel_filter grpc_client_load_reporting_filter = {
-    clr_start_transport_stream_op_batch,
-    nullptr,
-    grpc_channel_next_op,
-    sizeof(call_data),
-    clr_init_call_elem,
-    grpc_call_stack_ignore_set_pollset_or_pollset_set,
-    clr_destroy_call_elem,
-    0,  // sizeof(channel_data)
-    clr_init_channel_elem,
-    grpc_channel_stack_no_post_init,
-    clr_destroy_channel_elem,
-    grpc_channel_next_get_info,
-    "client_load_reporting"};
+}  // namespace grpc_core

data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h

@@ -1,30 +1,46 @@
-/*
- *
- * Copyright 2017 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.
- *
- */
+//
+//
+// Copyright 2017 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_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
+
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/channel/promise_based_filter.h"
+#include "src/core/lib/promise/arena_promise.h"
+#include "src/core/lib/transport/transport.h"
+
+namespace grpc_core {
+class ClientLoadReportingFilter : public ChannelFilter {
+ public:
+  static const grpc_channel_filter kFilter;
+
+  static absl::StatusOr<ClientLoadReportingFilter> Create(
+      const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-extern const grpc_channel_filter grpc_client_load_reporting_filter;
+  // Construct a promise for one call.
+  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
+      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+};
+}  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H \
-        */
+#endif  // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H