grpc 1.71.0 → 1.72.0

data/src/core/lib/surface/legacy_channel.cc

@@ -71,26 +71,10 @@ absl::StatusOr<RefCountedPtr<Channel>> LegacyChannel::Create(
       args = channel_args_mutator(target.c_str(), args, channel_stack_type);
     }
   }
-  ChannelStackBuilderImpl builder(
-      grpc_channel_stack_type_string(channel_stack_type), channel_stack_type,
-      args);
-  builder.SetTarget(target.c_str());
-  if (!CoreConfiguration::Get().channel_init().CreateStack(&builder)) {
-    return nullptr;
-  }
-  // Only need to update stats for server channels here.  Stats for client
-  // channels are handled in our base class.
-  if (builder.channel_stack_type() == GRPC_SERVER_CHANNEL) {
-    global_stats().IncrementServerChannelsCreated();
-  }
-  absl::StatusOr<RefCountedPtr<grpc_channel_stack>> r = builder.Build();
-  if (!r.ok()) {
-    auto status = r.status();
-    LOG(ERROR) << "channel stack builder failed: " << status;
-    return status;
-  }
+  std::shared_ptr<GlobalStatsPluginRegistry::StatsPluginGroup>
+      stats_plugin_group;
   if (channel_stack_type == GRPC_SERVER_CHANNEL) {
-    *(*r)->stats_plugin_group =
+    stats_plugin_group =
         GlobalStatsPluginRegistry::GetStatsPluginsForServer(args);
     // Add per-server stats plugins.
     auto* stats_plugin_list = args.GetPointer<
@@ -98,8 +82,8 @@ absl::StatusOr<RefCountedPtr<Channel>> LegacyChannel::Create(
         GRPC_ARG_EXPERIMENTAL_STATS_PLUGINS);
     if (stats_plugin_list != nullptr) {
       for (const auto& plugin : **stats_plugin_list) {
-        (*r)->stats_plugin_group->AddStatsPlugin(
-            plugin, plugin->GetServerScopeConfig(args));
+        stats_plugin_group->AddStatsPlugin(plugin,
+                                           plugin->GetServerScopeConfig(args));
       }
     }
   } else {
@@ -111,7 +95,7 @@ absl::StatusOr<RefCountedPtr<Channel>> LegacyChannel::Create(
         args);
     experimental::StatsPluginChannelScope scope(target, authority,
                                                 endpoint_config);
-    *(*r)->stats_plugin_group =
+    stats_plugin_group =
         GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope);
     // Add per-channel stats plugins.
     auto* stats_plugin_list = args.GetPointer<
@@ -119,11 +103,31 @@ absl::StatusOr<RefCountedPtr<Channel>> LegacyChannel::Create(
         GRPC_ARG_EXPERIMENTAL_STATS_PLUGINS);
     if (stats_plugin_list != nullptr) {
       for (const auto& plugin : **stats_plugin_list) {
-        (*r)->stats_plugin_group->AddStatsPlugin(
+        stats_plugin_group->AddStatsPlugin(
             plugin, plugin->GetChannelScopeConfig(scope));
       }
     }
   }
+  args = args.SetObject(stats_plugin_group);
+  ChannelStackBuilderImpl builder(
+      grpc_channel_stack_type_string(channel_stack_type), channel_stack_type,
+      args);
+  builder.SetTarget(target.c_str());
+  if (!CoreConfiguration::Get().channel_init().CreateStack(&builder)) {
+    return nullptr;
+  }
+  // Only need to update stats for server channels here.  Stats for client
+  // channels are handled in our base class.
+  if (builder.channel_stack_type() == GRPC_SERVER_CHANNEL) {
+    global_stats().IncrementServerChannelsCreated();
+  }
+  absl::StatusOr<RefCountedPtr<grpc_channel_stack>> r = builder.Build();
+  if (!r.ok()) {
+    auto status = r.status();
+    LOG(ERROR) << "channel stack builder failed: " << status;
+    return status;
+  }
+  *(*r)->stats_plugin_group = std::move(stats_plugin_group);
   return MakeRefCounted<LegacyChannel>(
       grpc_channel_stack_type_is_client(builder.channel_stack_type()),
       std::move(target), args, std::move(*r));

data/src/core/lib/surface/legacy_channel.h

@@ -27,6 +27,7 @@
 #include <string>
 
 #include "absl/status/statusor.h"
+#include "src/core/call/call_arena_allocator.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
@@ -35,7 +36,6 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_stack_type.h"
-#include "src/core/lib/transport/call_arena_allocator.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/util/ref_counted_ptr.h"

data/src/core/lib/surface/version.cc

@@ -22,6 +22,6 @@
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
-const char* grpc_version_string(void) { return "46.0.0"; }
+const char* grpc_version_string(void) { return "47.0.0"; }
 
-const char* grpc_g_stands_for(void) { return "gears"; }
+const char* grpc_g_stands_for(void) { return "gusto"; }

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

@@ -24,9 +24,12 @@
 
 #include <vector>
 
+#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/util/status_helper.h"
 
+using grpc_core::http2::Http2ErrorCode;
+
 static grpc_error_handle recursively_find_error_with_field(
     grpc_error_handle error, grpc_core::StatusIntProperty which) {
   intptr_t unused;
@@ -42,11 +45,59 @@ static grpc_error_handle recursively_find_error_with_field(
   return absl::OkStatus();
 }
 
+namespace {
+
+std::optional<Http2ErrorCode> GetHttp2Error(const absl::Status& status) {
+  auto http_error_code = grpc_core::StatusGetInt(
+      status, grpc_core::StatusIntProperty::kHttp2Error);
+  if (http_error_code.has_value()) {
+    return static_cast<Http2ErrorCode>(*http_error_code);
+  }
+  return std::nullopt;
+}
+
+}  // namespace
+
 void grpc_error_get_status(grpc_error_handle error,
                            grpc_core::Timestamp deadline,
                            grpc_status_code* code, std::string* message,
-                           grpc_http2_error_code* http_error,
+                           Http2ErrorCode* http_error,
                            const char** error_string) {
+  if (grpc_core::IsErrorFlattenEnabled()) {
+    auto http_error_code = GetHttp2Error(error);
+    if (code != nullptr) {
+      // If the top-level status code is UNKNOWN and there is an HTTP2 error
+      // code attribute set, convert from that.  Otherwise, use the top-level
+      // status code.
+      if (error.code() == absl::StatusCode::kUnknown &&
+          http_error_code.has_value()) {
+        *code = grpc_http2_error_to_grpc_status(*http_error_code, deadline);
+      } else {
+        *code = static_cast<grpc_status_code>(error.code());
+      }
+    }
+    if (message != nullptr) *message = std::string(error.message());
+    if (error_string != nullptr && !error.ok()) {
+      *error_string = gpr_strdup(grpc_core::StatusToString(error).c_str());
+    }
+    if (http_error != nullptr) {
+      // If the HTTP2 error code attribute is present, use it.  Otherwise,
+      // if the status code is something other than UNKNOWN, convert from
+      // that.  Otherwise, set a default based on whether the status
+      // code is OK.
+      if (http_error_code.has_value()) {
+        *http_error = *http_error_code;
+      } else if (error.code() != absl::StatusCode::kUnknown) {
+        *http_error = grpc_status_to_http2_error(
+            static_cast<grpc_status_code>(error.code()));
+      } else {
+        *http_error = error.ok() ? Http2ErrorCode::kNoError
+                                 : Http2ErrorCode::kInternalError;
+      }
+    }
+    return;
+  }
+
   // Fast path: We expect no error.
   if (GPR_LIKELY(error.ok())) {
     if (code != nullptr) *code = GRPC_STATUS_OK;
@@ -62,7 +113,7 @@ void grpc_error_get_status(grpc_error_handle error,
       *message = "";
     }
     if (http_error != nullptr) {
-      *http_error = GRPC_HTTP2_NO_ERROR;
+      *http_error = Http2ErrorCode::kNoError;
     }
     return;
   }
@@ -91,7 +142,7 @@ void grpc_error_get_status(grpc_error_handle error,
                                 grpc_core::StatusIntProperty::kHttp2Error,
                                 &integer)) {
     status = grpc_http2_error_to_grpc_status(
-        static_cast<grpc_http2_error_code>(integer), deadline);
+        static_cast<Http2ErrorCode>(integer), deadline);
   } else {
     status = static_cast<grpc_status_code>(found_error.code());
   }
@@ -104,15 +155,15 @@ void grpc_error_get_status(grpc_error_handle error,
   if (http_error != nullptr) {
     if (grpc_error_get_int(
             found_error, grpc_core::StatusIntProperty::kHttp2Error, &integer)) {
-      *http_error = static_cast<grpc_http2_error_code>(integer);
+      *http_error = static_cast<Http2ErrorCode>(integer);
     } else if (grpc_error_get_int(found_error,
                                   grpc_core::StatusIntProperty::kRpcStatus,
                                   &integer)) {
       *http_error =
           grpc_status_to_http2_error(static_cast<grpc_status_code>(integer));
     } else {
-      *http_error =
-          found_error.ok() ? GRPC_HTTP2_NO_ERROR : GRPC_HTTP2_INTERNAL_ERROR;
+      *http_error = found_error.ok() ? Http2ErrorCode::kNoError
+                                     : Http2ErrorCode::kInternalError;
     }
   }
 
@@ -121,16 +172,15 @@ void grpc_error_get_status(grpc_error_handle error,
   if (message != nullptr) {
     if (!grpc_error_get_str(
             found_error, grpc_core::StatusStrProperty::kGrpcMessage, message)) {
-      if (!grpc_error_get_str(found_error,
-                              grpc_core::StatusStrProperty::kDescription,
-                              message)) {
-        *message = grpc_core::StatusToString(error);
-      }
+      *message = found_error.message().empty()
+                     ? grpc_core::StatusToString(error)
+                     : std::string(found_error.message());
     }
   }
 }
 
 absl::Status grpc_error_to_absl_status(grpc_error_handle error) {
+  if (grpc_core::IsErrorFlattenEnabled()) return error;
   grpc_status_code status;
   // TODO(yashykt): This should be updated once we decide on how to use the
   // absl::Status payload to capture all the contents of grpc_error.
@@ -142,6 +192,7 @@ absl::Status grpc_error_to_absl_status(grpc_error_handle error) {
 }
 
 grpc_error_handle absl_status_to_grpc_error(absl::Status status) {
+  if (grpc_core::IsErrorFlattenEnabled()) return status;
   // Special error checks
   if (status.ok()) {
     return absl::OkStatus();
@@ -152,6 +203,9 @@ grpc_error_handle absl_status_to_grpc_error(absl::Status status) {
 }
 
 bool grpc_error_has_clear_grpc_status(grpc_error_handle error) {
+  if (grpc_core::IsErrorFlattenEnabled()) {
+    return error.code() != absl::StatusCode::kUnknown;
+  }
   intptr_t unused;
   if (grpc_error_get_int(error, grpc_core::StatusIntProperty::kRpcStatus,
                          &unused)) {

data/src/core/lib/transport/error_utils.h

@@ -25,8 +25,8 @@
 #include <string>
 
 #include "absl/status/status.h"
+#include "src/core/ext/transport/chttp2/transport/http2_status.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/time.h"
 
 /// A utility function to get the status code and message to be returned
@@ -39,7 +39,7 @@
 void grpc_error_get_status(grpc_error_handle error,
                            grpc_core::Timestamp deadline,
                            grpc_status_code* code, std::string* message,
-                           grpc_http2_error_code* http_error,
+                           grpc_core::http2::Http2ErrorCode* http_error,
                            const char** error_string);
 
 /// Utility Function to convert a grpc_error_handle  \a error to an

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

@@ -20,42 +20,44 @@
 
 #include <grpc/support/port_platform.h>
 
-grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status) {
+using grpc_core::http2::Http2ErrorCode;
+
+Http2ErrorCode grpc_status_to_http2_error(grpc_status_code status) {
   switch (status) {
     case GRPC_STATUS_OK:
-      return GRPC_HTTP2_NO_ERROR;
+      return Http2ErrorCode::kNoError;
     case GRPC_STATUS_CANCELLED:
-      return GRPC_HTTP2_CANCEL;
+      return Http2ErrorCode::kCancel;
     case GRPC_STATUS_DEADLINE_EXCEEDED:
-      return GRPC_HTTP2_CANCEL;
+      return Http2ErrorCode::kCancel;
     case GRPC_STATUS_RESOURCE_EXHAUSTED:
-      return GRPC_HTTP2_ENHANCE_YOUR_CALM;
+      return Http2ErrorCode::kEnhanceYourCalm;
     case GRPC_STATUS_PERMISSION_DENIED:
-      return GRPC_HTTP2_INADEQUATE_SECURITY;
+      return Http2ErrorCode::kInadequateSecurity;
     case GRPC_STATUS_UNAVAILABLE:
-      return GRPC_HTTP2_REFUSED_STREAM;
+      return Http2ErrorCode::kRefusedStream;
     default:
-      return GRPC_HTTP2_INTERNAL_ERROR;
+      return Http2ErrorCode::kInternalError;
   }
 }
 
 grpc_status_code grpc_http2_error_to_grpc_status(
-    grpc_http2_error_code error, grpc_core::Timestamp deadline) {
+    Http2ErrorCode error, grpc_core::Timestamp deadline) {
   switch (error) {
-    case GRPC_HTTP2_NO_ERROR:
+    case Http2ErrorCode::kNoError:
       // should never be received
       return GRPC_STATUS_INTERNAL;
-    case GRPC_HTTP2_CANCEL:
+    case Http2ErrorCode::kCancel:
       // http2 cancel translates to STATUS_CANCELLED iff deadline hasn't been
       // exceeded
       return grpc_core::Timestamp::Now() > deadline
                  ? GRPC_STATUS_DEADLINE_EXCEEDED
                  : GRPC_STATUS_CANCELLED;
-    case GRPC_HTTP2_ENHANCE_YOUR_CALM:
+    case Http2ErrorCode::kEnhanceYourCalm:
       return GRPC_STATUS_RESOURCE_EXHAUSTED;
-    case GRPC_HTTP2_INADEQUATE_SECURITY:
+    case Http2ErrorCode::kInadequateSecurity:
       return GRPC_STATUS_PERMISSION_DENIED;
-    case GRPC_HTTP2_REFUSED_STREAM:
+    case Http2ErrorCode::kRefusedStream:
       return GRPC_STATUS_UNAVAILABLE;
     default:
       return GRPC_STATUS_INTERNAL;

data/src/core/lib/transport/status_conversion.h

@@ -22,13 +22,14 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/transport/http2_errors.h"
+#include "src/core/ext/transport/chttp2/transport/http2_status.h"
 #include "src/core/util/time.h"
 
 // Conversion of grpc status codes to http2 error codes (for RST_STREAM)
-grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status);
-grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error,
-                                                 grpc_core::Timestamp deadline);
+grpc_core::http2::Http2ErrorCode grpc_status_to_http2_error(
+    grpc_status_code status);
+grpc_status_code grpc_http2_error_to_grpc_status(
+    grpc_core::http2::Http2ErrorCode error, grpc_core::Timestamp deadline);
 
 // Conversion of HTTP status codes (:status) to grpc status codes
 grpc_status_code grpc_http2_status_to_grpc_status(int status);

data/src/core/lib/transport/transport.h

@@ -37,6 +37,11 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/call_destination.h"
+#include "src/core/call/call_spine.h"
+#include "src/core/call/message.h"
+#include "src/core/call/metadata.h"
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -50,13 +55,8 @@
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
-#include "src/core/lib/transport/call_destination.h"
 #include "src/core/lib/transport/call_final_info.h"
-#include "src/core/lib/transport/call_spine.h"
 #include "src/core/lib/transport/connectivity_state.h"
-#include "src/core/lib/transport/message.h"
-#include "src/core/lib/transport/metadata.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport_fwd.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted.h"

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

@@ -23,10 +23,10 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/connectivity_state.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/status_helper.h"

data/src/core/load_balancing/delegating_helper.h

@@ -26,9 +26,9 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/channel/channel_args.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/util/debug_location.h"

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

@@ -26,12 +26,12 @@
 #include <type_traits>
 #include <utility>
 
+#include "src/core/call/metadata_batch.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/pipe.h"
 #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"
 #include "src/core/util/latent_see.h"

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

@@ -91,6 +91,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata_batch.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/config/core_configuration.h"
@@ -105,14 +106,12 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
-#include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_stack_type.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/delegating_helper.h"
 #include "src/core/load_balancing/grpclb/client_load_reporting_filter.h"