grpc 1.63.2 → 1.64.0.pre1

data/src/core/lib/channel/channel_stack_builder_impl.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 
 #include <string.h>
@@ -36,6 +34,7 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -96,43 +95,37 @@ const grpc_channel_filter* PromiseTracingFilterFor(
               },
               /* init_call: */
               [](grpc_channel_element* elem, CallSpineInterface* call) {
+                auto* c = DownCast<PipeBasedCallSpine*>(call);
                 auto* source_filter =
                     static_cast<const DerivedFilter*>(elem->filter)->filter;
-                call->client_initial_metadata().receiver.InterceptAndMap(
+                c->client_initial_metadata().receiver.InterceptAndMap(
                     [source_filter](ClientMetadataHandle md) {
                       gpr_log(GPR_DEBUG, "%s[%s] OnClientInitialMetadata: %s",
                               GetContext<Activity>()->DebugTag().c_str(),
                               source_filter->name, md->DebugString().c_str());
                       return md;
                     });
-                call->client_to_server_messages().receiver.InterceptAndMap(
+                c->client_to_server_messages().receiver.InterceptAndMap(
                     [source_filter](MessageHandle msg) {
                       gpr_log(GPR_DEBUG, "%s[%s] OnClientToServerMessage: %s",
                               GetContext<Activity>()->DebugTag().c_str(),
                               source_filter->name, msg->DebugString().c_str());
                       return msg;
                     });
-                call->server_initial_metadata().sender.InterceptAndMap(
+                c->server_initial_metadata().sender.InterceptAndMap(
                     [source_filter](ServerMetadataHandle md) {
                       gpr_log(GPR_DEBUG, "%s[%s] OnServerInitialMetadata: %s",
                               GetContext<Activity>()->DebugTag().c_str(),
                               source_filter->name, md->DebugString().c_str());
                       return md;
                     });
-                call->server_to_client_messages().sender.InterceptAndMap(
+                c->server_to_client_messages().sender.InterceptAndMap(
                     [source_filter](MessageHandle msg) {
                       gpr_log(GPR_DEBUG, "%s[%s] OnServerToClientMessage: %s",
                               GetContext<Activity>()->DebugTag().c_str(),
                               source_filter->name, msg->DebugString().c_str());
                       return msg;
                     });
-                call->server_trailing_metadata().sender.InterceptAndMap(
-                    [source_filter](ServerMetadataHandle md) {
-                      gpr_log(GPR_DEBUG, "%s[%s] OnServerTrailingMetadata: %s",
-                              GetContext<Activity>()->DebugTag().c_str(),
-                              source_filter->name, md->DebugString().c_str());
-                      return md;
-                    });
               },
               grpc_channel_next_op,
               /* sizeof_call_data: */ 0,

data/src/core/lib/channel/channel_stack_builder_impl.h

@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

data/src/core/lib/channel/channel_stack_trace.cc

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack_trace.h"
 
+#include <grpc/support/port_platform.h>
+
 grpc_core::TraceFlag grpc_trace_channel_stack(false, "channel_stack");

data/src/core/lib/channel/connected_channel.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/connected_channel.h"
 
 #include <inttypes.h>
@@ -28,6 +26,7 @@
 #include <type_traits>
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
@@ -36,6 +35,7 @@
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -225,7 +225,7 @@ static void connected_channel_destroy_call_elem(
 static grpc_error_handle connected_channel_init_channel_elem(
     grpc_channel_element* elem, grpc_channel_element_args* args) {
   channel_data* cd = static_cast<channel_data*>(elem->channel_data);
-  GPR_ASSERT(args->is_last);
+  CHECK(args->is_last);
   cd->transport = args->channel_args.GetObject<grpc_core::Transport>();
   return absl::OkStatus();
 }
@@ -464,8 +464,7 @@ ArenaPromise<ServerMetadataHandle> MakeClientCallPromise(Transport* transport,
       [](absl::Status) {});
   // Start a promise to receive server initial metadata and then forward it up
   // through the receiving pipe.
-  auto server_initial_metadata =
-      GetContext<Arena>()->MakePooled<ServerMetadata>();
+  auto server_initial_metadata = Arena::MakePooled<ServerMetadata>();
   party->Spawn(
       "recv_initial_metadata",
       TrySeq(GetContext<BatchBuilder>()->ReceiveServerInitialMetadata(
@@ -502,27 +501,25 @@ ArenaPromise<ServerMetadataHandle> MakeClientCallPromise(Transport* transport,
   // Create a promise that will receive server trailing metadata.
   // If this fails, we massage the error into metadata that we can report
   // upwards.
-  auto server_trailing_metadata =
-      GetContext<Arena>()->MakePooled<ServerMetadata>();
-  auto recv_trailing_metadata =
-      Map(GetContext<BatchBuilder>()->ReceiveServerTrailingMetadata(
-              stream->batch_target()),
-          [](absl::StatusOr<ServerMetadataHandle> status) mutable {
-            if (!status.ok()) {
-              auto server_trailing_metadata =
-                  GetContext<Arena>()->MakePooled<ServerMetadata>();
-              grpc_status_code status_code = GRPC_STATUS_UNKNOWN;
-              std::string message;
-              grpc_error_get_status(status.status(), Timestamp::InfFuture(),
-                                    &status_code, &message, nullptr, nullptr);
-              server_trailing_metadata->Set(GrpcStatusMetadata(), status_code);
-              server_trailing_metadata->Set(GrpcMessageMetadata(),
-                                            Slice::FromCopiedString(message));
-              return server_trailing_metadata;
-            } else {
-              return std::move(*status);
-            }
-          });
+  auto server_trailing_metadata = Arena::MakePooled<ServerMetadata>();
+  auto recv_trailing_metadata = Map(
+      GetContext<BatchBuilder>()->ReceiveServerTrailingMetadata(
+          stream->batch_target()),
+      [](absl::StatusOr<ServerMetadataHandle> status) mutable {
+        if (!status.ok()) {
+          auto server_trailing_metadata = Arena::MakePooled<ServerMetadata>();
+          grpc_status_code status_code = GRPC_STATUS_UNKNOWN;
+          std::string message;
+          grpc_error_get_status(status.status(), Timestamp::InfFuture(),
+                                &status_code, &message, nullptr, nullptr);
+          server_trailing_metadata->Set(GrpcStatusMetadata(), status_code);
+          server_trailing_metadata->Set(GrpcMessageMetadata(),
+                                        Slice::FromCopiedString(message));
+          return server_trailing_metadata;
+        } else {
+          return std::move(*status);
+        }
+      });
   // Finally the main call promise.
   // Concurrently: send initial metadata and receive messages, until BOTH
   // complete (or one fails).
@@ -785,8 +782,7 @@ ArenaPromise<ServerMetadataHandle> MakeServerCallPromise(
             if (status.ok()) {
               trailing_metadata = std::move(*status);
             } else {
-              trailing_metadata =
-                  GetContext<Arena>()->MakePooled<ClientMetadata>();
+              trailing_metadata = Arena::MakePooled<ClientMetadata>();
               grpc_status_code status_code = GRPC_STATUS_UNKNOWN;
               std::string message;
               grpc_error_get_status(status.status(), Timestamp::InfFuture(),
@@ -889,18 +885,7 @@ ArenaPromise<ServerMetadataHandle> MakeClientTransportCallPromise(
     Transport* transport, CallArgs call_args, NextPromiseFactory) {
   auto spine = GetContext<CallContext>()->MakeCallSpine(std::move(call_args));
   transport->client_transport()->StartCall(CallHandler{spine});
-  return Map(spine->server_trailing_metadata().receiver.Next(),
-             [](NextResult<ServerMetadataHandle> r) {
-               if (r.has_value()) {
-                 auto md = std::move(r.value());
-                 md->Set(GrpcStatusFromWire(), true);
-                 return md;
-               }
-               auto m = GetContext<Arena>()->MakePooled<ServerMetadata>();
-               m->Set(GrpcStatusMetadata(), GRPC_STATUS_CANCELLED);
-               m->Set(GrpcCallWasCancelled(), true);
-               return m;
-             });
+  return spine->PullServerTrailingMetadata();
 }
 
 const grpc_channel_filter kClientPromiseBasedTransportFilter =

data/src/core/lib/channel/context.h

@@ -29,9 +29,12 @@
 /// This enum represents the indexes into the array, where each index
 /// contains a different type of value.
 typedef enum {
+  /// grpc_call* associated with this context.
+  GRPC_CONTEXT_CALL = 0,
+
   /// Value is either a \a grpc_client_security_context or a
   /// \a grpc_server_security_context.
-  GRPC_CONTEXT_SECURITY = 0,
+  GRPC_CONTEXT_SECURITY,
 
   /// Value is a \a census_context.
   GRPC_CONTEXT_TRACING,
@@ -68,10 +71,35 @@ struct grpc_call_context_element {
 };
 
 namespace grpc_core {
+class Call;
+
 // Bind the legacy context array into the new style structure
 // TODO(ctiller): remove as we migrate these contexts to the new system.
 template <>
 struct ContextType<grpc_call_context_element> {};
+
+// Also as a transition step allow exposing a GetContext<T> that can peek into
+// the legacy context array.
+namespace promise_detail {
+template <typename T>
+struct OldStyleContext;
+
+template <>
+struct OldStyleContext<Call> {
+  static constexpr grpc_context_index kIndex = GRPC_CONTEXT_CALL;
+};
+
+template <typename T>
+class Context<T, absl::void_t<decltype(OldStyleContext<T>::kIndex)>> {
+ public:
+  static T* get() {
+    return static_cast<T*>(
+        GetContext<grpc_call_context_element>()[OldStyleContext<T>::kIndex]
+            .value);
+  }
+};
+
+}  // namespace promise_detail
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_CHANNEL_CONTEXT_H

data/src/core/lib/channel/metrics.cc

@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/metrics.h"
 
 #include <memory>
 
+#include "absl/log/check.h"
+
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/crash.h"
 
 namespace grpc_core {
@@ -46,7 +48,7 @@ GlobalInstrumentsRegistry::RegisterUInt64Counter(
     }
   }
   uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
+  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = ValueType::kUInt64;
   descriptor.instrument_type = InstrumentType::kCounter;
@@ -78,7 +80,7 @@ GlobalInstrumentsRegistry::RegisterDoubleCounter(
     }
   }
   uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
+  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = ValueType::kDouble;
   descriptor.instrument_type = InstrumentType::kCounter;
@@ -110,7 +112,7 @@ GlobalInstrumentsRegistry::RegisterUInt64Histogram(
     }
   }
   uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
+  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = ValueType::kUInt64;
   descriptor.instrument_type = InstrumentType::kHistogram;
@@ -142,7 +144,7 @@ GlobalInstrumentsRegistry::RegisterDoubleHistogram(
     }
   }
   uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
+  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = ValueType::kDouble;
   descriptor.instrument_type = InstrumentType::kHistogram;
@@ -160,70 +162,6 @@ GlobalInstrumentsRegistry::RegisterDoubleHistogram(
   return handle;
 }
 
-GlobalInstrumentsRegistry::GlobalInt64GaugeHandle
-GlobalInstrumentsRegistry::RegisterInt64Gauge(
-    absl::string_view name, absl::string_view description,
-    absl::string_view unit, absl::Span<const absl::string_view> label_keys,
-    absl::Span<const absl::string_view> optional_label_keys,
-    bool enable_by_default) {
-  auto& instruments = GetInstrumentList();
-  for (const auto& descriptor : instruments) {
-    if (descriptor.name == name) {
-      Crash(
-          absl::StrFormat("Metric name %s has already been registered.", name));
-    }
-  }
-  uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
-  GlobalInstrumentDescriptor descriptor;
-  descriptor.value_type = ValueType::kInt64;
-  descriptor.instrument_type = InstrumentType::kGauge;
-  descriptor.index = index;
-  descriptor.enable_by_default = enable_by_default;
-  descriptor.name = name;
-  descriptor.description = description;
-  descriptor.unit = unit;
-  descriptor.label_keys = {label_keys.begin(), label_keys.end()};
-  descriptor.optional_label_keys = {optional_label_keys.begin(),
-                                    optional_label_keys.end()};
-  instruments.push_back(std::move(descriptor));
-  GlobalInt64GaugeHandle handle;
-  handle.index = index;
-  return handle;
-}
-
-GlobalInstrumentsRegistry::GlobalDoubleGaugeHandle
-GlobalInstrumentsRegistry::RegisterDoubleGauge(
-    absl::string_view name, absl::string_view description,
-    absl::string_view unit, absl::Span<const absl::string_view> label_keys,
-    absl::Span<const absl::string_view> optional_label_keys,
-    bool enable_by_default) {
-  auto& instruments = GetInstrumentList();
-  for (const auto& descriptor : instruments) {
-    if (descriptor.name == name) {
-      Crash(
-          absl::StrFormat("Metric name %s has already been registered.", name));
-    }
-  }
-  uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
-  GlobalInstrumentDescriptor descriptor;
-  descriptor.value_type = ValueType::kDouble;
-  descriptor.instrument_type = InstrumentType::kGauge;
-  descriptor.index = index;
-  descriptor.enable_by_default = enable_by_default;
-  descriptor.name = name;
-  descriptor.description = description;
-  descriptor.unit = unit;
-  descriptor.label_keys = {label_keys.begin(), label_keys.end()};
-  descriptor.optional_label_keys = {optional_label_keys.begin(),
-                                    optional_label_keys.end()};
-  instruments.push_back(std::move(descriptor));
-  GlobalDoubleGaugeHandle handle;
-  handle.index = index;
-  return handle;
-}
-
 GlobalInstrumentsRegistry::GlobalCallbackInt64GaugeHandle
 GlobalInstrumentsRegistry::RegisterCallbackInt64Gauge(
     absl::string_view name, absl::string_view description,
@@ -238,7 +176,7 @@ GlobalInstrumentsRegistry::RegisterCallbackInt64Gauge(
     }
   }
   uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
+  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = ValueType::kInt64;
   descriptor.instrument_type = InstrumentType::kCallbackGauge;
@@ -270,7 +208,7 @@ GlobalInstrumentsRegistry::RegisterCallbackDoubleGauge(
     }
   }
   uint32_t index = instruments.size();
-  GPR_ASSERT(index < std::numeric_limits<uint32_t>::max());
+  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = ValueType::kDouble;
   descriptor.instrument_type = InstrumentType::kCallbackGauge;

data/src/core/lib/channel/metrics.h

@@ -15,13 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <cstdint>
 #include <memory>
 #include <vector>
 
-#include "absl/container/flat_hash_map.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
@@ -29,6 +26,7 @@
 
 #include <grpc/support/log.h>
 #include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -59,7 +57,6 @@ class GlobalInstrumentsRegistry {
     kUndefined,
     kCounter,
     kHistogram,
-    kGauge,
     kCallbackGauge,
   };
   using InstrumentID = uint32_t;
@@ -85,8 +82,6 @@ class GlobalInstrumentsRegistry {
   struct GlobalDoubleCounterHandle : public GlobalInstrumentHandle {};
   struct GlobalUInt64HistogramHandle : public GlobalInstrumentHandle {};
   struct GlobalDoubleHistogramHandle : public GlobalInstrumentHandle {};
-  struct GlobalInt64GaugeHandle : public GlobalInstrumentHandle {};
-  struct GlobalDoubleGaugeHandle : public GlobalInstrumentHandle {};
   struct GlobalCallbackInt64GaugeHandle : public GlobalInstrumentHandle {};
   struct GlobalCallbackDoubleGaugeHandle : public GlobalInstrumentHandle {};
   using GlobalCallbackHandle = absl::variant<GlobalCallbackInt64GaugeHandle,
@@ -113,16 +108,6 @@ class GlobalInstrumentsRegistry {
       absl::string_view unit, absl::Span<const absl::string_view> label_keys,
       absl::Span<const absl::string_view> optional_label_keys,
       bool enable_by_default);
-  static GlobalInt64GaugeHandle RegisterInt64Gauge(
-      absl::string_view name, absl::string_view description,
-      absl::string_view unit, absl::Span<const absl::string_view> label_keys,
-      absl::Span<const absl::string_view> optional_label_keys,
-      bool enable_by_default);
-  static GlobalDoubleGaugeHandle RegisterDoubleGauge(
-      absl::string_view name, absl::string_view description,
-      absl::string_view unit, absl::Span<const absl::string_view> label_keys,
-      absl::Span<const absl::string_view> optional_label_keys,
-      bool enable_by_default);
   static GlobalCallbackInt64GaugeHandle RegisterCallbackInt64Gauge(
       absl::string_view name, absl::string_view description,
       absl::string_view unit, absl::Span<const absl::string_view> label_keys,
@@ -221,22 +206,6 @@ class StatsPlugin {
       GlobalInstrumentsRegistry::GlobalDoubleHistogramHandle handle,
       double value, absl::Span<const absl::string_view> label_values,
       absl::Span<const absl::string_view> optional_label_values) = 0;
-  // Sets an int64 \a value to the gauge specifed by \a handle. \a
-  // label_values and \a optional_label_values specify attributes that are
-  // associated with this measurement and must match with their corresponding
-  // keys in GlobalInstrumentsRegistry::RegisterInt64Gauge().
-  virtual void SetGauge(
-      GlobalInstrumentsRegistry::GlobalInt64GaugeHandle handle, int64_t value,
-      absl::Span<const absl::string_view> label_values,
-      absl::Span<const absl::string_view> optional_label_values) = 0;
-  // Sets a double \a value to the gauge specifed by \a handle. \a
-  // label_values and \a optional_label_values specify attributes that are
-  // associated with this measurement and must match with their corresponding
-  // keys in GlobalInstrumentsRegistry::RegisterDoubleGauge().
-  virtual void SetGauge(
-      GlobalInstrumentsRegistry::GlobalDoubleGaugeHandle handle, double value,
-      absl::Span<const absl::string_view> label_values,
-      absl::Span<const absl::string_view> optional_label_values) = 0;
   // Adds a callback to be invoked when the stats plugin wants to
   // populate the corresponding metrics (see callback->metrics() for list).
   virtual void AddCallback(RegisteredMetricCallback* callback) = 0;
@@ -305,16 +274,6 @@ class GlobalStatsPluginRegistry {
                                       optional_values);
       }
     }
-    // Sets a value to a gauge in all stats plugins within the group. See the
-    // StatsPlugin interface for more documentation and valid types.
-    template <class HandleType, class ValueType>
-    void SetGauge(HandleType handle, ValueType value,
-                  absl::Span<const absl::string_view> label_values,
-                  absl::Span<const absl::string_view> optional_values) {
-      for (auto& state : plugins_state_) {
-        state.plugin->SetGauge(handle, value, label_values, optional_values);
-      }
-    }
 
     // Registers a callback to be used to populate callback metrics.
     // The callback will update the specified metrics.  The callback