grpc 1.75.0 → 1.78.1

data/src/core/call/metadata_batch.h

@@ -30,12 +30,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/container/inlined_vector.h"
-#include "absl/functional/function_ref.h"
-#include "absl/log/check.h"
-#include "absl/meta/type_traits.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/custom_metadata.h"
 #include "src/core/call/metadata_compression_traits.h"
 #include "src/core/call/parsed_metadata.h"
@@ -45,10 +39,16 @@
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/chunked_vector.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/if_list.h"
 #include "src/core/util/packed_table.h"
 #include "src/core/util/time.h"
 #include "src/core/util/type_list.h"
+#include "absl/container/inlined_vector.h"
+#include "absl/functional/function_ref.h"
+#include "absl/meta/type_traits.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -107,7 +107,7 @@ struct TeMetadata {
                                   MetadataParseErrorFn on_error);
   static ValueType MementoToValue(MementoType te) { return te; }
   static StaticSlice Encode(ValueType x) {
-    CHECK(x == kTrailers);
+    GRPC_CHECK(x == kTrailers);
     return StaticSlice::FromStaticString("trailers");
   }
   static const char* DisplayValue(ValueType te);
@@ -213,7 +213,7 @@ struct CompressionAlgorithmBasedMetadata {
                                   MetadataParseErrorFn on_error);
   static ValueType MementoToValue(MementoType x) { return x; }
   static Slice Encode(ValueType x) {
-    CHECK(x != GRPC_COMPRESS_ALGORITHMS_COUNT);
+    GRPC_CHECK(x != GRPC_COMPRESS_ALGORITHMS_COUNT);
     return Slice::FromStaticString(CompressionAlgorithmAsString(x));
   }
   static const char* DisplayValue(ValueType x) {
@@ -630,6 +630,8 @@ struct GrpcTarPit {
   static absl::string_view DisplayValue(Empty) { return "tarpit"; }
 };
 
+bool IsMetadataKeyAllowedInDebugOutput(absl::string_view key);
+
 namespace metadata_detail {
 
 // Build a key/value formatted debug string.
@@ -646,7 +648,6 @@ class DebugStringBuilder {
   std::string TakeOutput() { return std::move(out_); }
 
  private:
-  bool IsAllowListed(absl::string_view key) const;
   void Add(absl::string_view key, absl::string_view value);
   std::string out_;
 };

data/src/core/call/metadata_info.cc

@@ -19,8 +19,8 @@
 #include <cstddef>
 #include <string>
 
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/slice/slice.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core {
 

data/src/core/call/parsed_metadata.h

@@ -24,14 +24,14 @@
 #include <type_traits>
 #include <utility>
 
+#include "src/core/lib/slice/slice.h"
+#include "src/core/util/time.h"
 #include "absl/functional/function_ref.h"
 #include "absl/meta/type_traits.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "src/core/lib/slice/slice.h"
-#include "src/core/util/time.h"
 
 namespace grpc_core {
 

data/src/core/call/request_buffer.cc

@@ -17,8 +17,8 @@
 #include <cstdint>
 #include <optional>
 
-#include "absl/strings/str_cat.h"
 #include "src/core/util/match.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core {
 

data/src/core/call/security_context.cc

@@ -25,15 +25,15 @@
 
 #include <algorithm>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/log/log.h"
 
 // --- grpc_call ---
 

data/src/core/call/security_context.h

@@ -27,7 +27,6 @@
 #include <memory>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/call_credentials.h"  // IWYU pragma: keep
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/resource_quota/arena.h"
@@ -38,6 +37,7 @@
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/useful.h"
+#include "absl/strings/string_view.h"
 
 // --- grpc_security_context_extension ---
 

data/src/core/call/server_call.cc

@@ -37,8 +37,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/lib/promise/all_ok.h"
@@ -51,7 +49,9 @@
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/server/server_interface.h"
 #include "src/core/util/bitset.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/latent_see.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -169,12 +169,12 @@ void ServerCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
       // after passing it in, which shouldn't be a supported API.
       metadata->Set(GrpcMessageMetadata(), Slice(grpc_slice_copy(*details)));
     }
-    CHECK(metadata != nullptr);
+    GRPC_CHECK(metadata != nullptr);
     bool wait_for_initial_metadata_scheduled =
         sent_server_initial_metadata_batch_.load(std::memory_order_relaxed);
     return [this, metadata = std::move(metadata),
             wait_for_initial_metadata_scheduled]() mutable {
-      CHECK(metadata != nullptr);
+      GRPC_CHECK(metadata != nullptr);
       // If there was a send initial metadata batch sent prior to this one, then
       // make sure it's been scheduled first - otherwise we may accidentally
       // treat this as trailers only.
@@ -184,7 +184,7 @@ void ServerCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
               [this]() { return server_initial_metadata_scheduled_.Wait(); },
               []() { return Empty{}; }),
           [this, metadata = std::move(metadata)]() mutable -> Poll<Success> {
-            CHECK(metadata != nullptr);
+            GRPC_CHECK(metadata != nullptr);
             call_handler_.PushServerTrailingMetadata(std::move(metadata));
             return Success{};
           });

data/src/core/call/server_call.h

@@ -39,10 +39,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/lib/promise/poll.h"
@@ -53,8 +49,12 @@
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -72,6 +72,7 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
         cq_(cq),
         server_(server) {
     global_stats().IncrementServerCallsCreated();
+    SourceConstructed();
   }
 
   void CancelWithError(grpc_error_handle error) override {
@@ -97,6 +98,7 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
   void InternalUnref(const char*) override { WeakUnref(); }
 
   void Orphaned() override {
+    SourceDestructing();
     if (!saw_was_cancelled_.load(std::memory_order_relaxed)) {
       CancelWithError(absl::CancelledError());
     }

data/src/core/call/simple_slice_based_metadata.h

@@ -17,9 +17,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/strings/string_view.h"
 #include "src/core/call/parsed_metadata.h"
 #include "src/core/lib/slice/slice.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/call/status_util.cc

@@ -23,9 +23,9 @@
 
 #include <vector>
 
+#include "src/core/util/useful.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "src/core/util/useful.h"
 
 struct status_string_entry {
   const char* str;

data/src/core/channelz/channel_trace.cc

@@ -26,7 +26,6 @@
 #include <memory>
 #include <utility>
 
-#include "absl/strings/str_cat.h"
 #include "google/protobuf/any.upb.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/slice/slice.h"
@@ -38,6 +37,7 @@
 #include "src/core/util/upb_utils.h"
 #include "src/proto/grpc/channelz/v2/channelz.upb.h"
 #include "upb/base/string_view.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core {
 namespace channelz {

data/src/core/channelz/channel_trace.h

@@ -31,9 +31,6 @@
 #include <tuple>
 #include <type_traits>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/lib/debug/trace_flags.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/memory_usage.h"
@@ -41,6 +38,9 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/proto/grpc/channelz/v2/channelz.upb.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 namespace channelz {

data/src/core/channelz/channelz.cc

@@ -30,12 +30,6 @@
 #include <string>
 #include <tuple>
 
-#include "absl/cleanup/cleanup.h"
-#include "absl/log/check.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/strip.h"
 #include "src/core/channelz/channelz_registry.h"
 #include "src/core/channelz/property_list.h"
 #include "src/core/lib/address_utils/parse_address.h"
@@ -52,6 +46,12 @@
 #include "src/core/util/uri.h"
 #include "src/core/util/useful.h"
 #include "src/proto/grpc/channelz/v2/channelz.upb.h"
+#include "absl/cleanup/cleanup.h"
+#include "absl/log/check.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/strip.h"
 
 namespace grpc_core {
 namespace channelz {
@@ -138,20 +138,14 @@ Json::Object BaseNode::AdditionalInfo() {
   return sink_impl->Finalize(!completed);
 }
 
-void BaseNode::RunZTrace(
-    absl::string_view name, Timestamp deadline,
-    std::map<std::string, std::string> args,
+std::unique_ptr<ZTrace> BaseNode::RunZTrace(
+    absl::string_view name, ZTrace::Args args,
     std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine,
-    absl::AnyInvocable<void(Json)> callback) {
-  // Limit deadline to help contain potential resource exhaustion due to
-  // tracing.
-  deadline = std::min(deadline, Timestamp::Now() + Duration::Minutes(10));
+    ZTrace::Callback callback) {
   auto fail = [&callback, event_engine](absl::Status status) {
     event_engine->Run(
         [callback = std::move(callback), status = std::move(status)]() mutable {
-          Json::Object object;
-          object["status"] = Json::FromString(status.ToString());
-          callback(Json::FromObject(std::move(object)));
+          callback(status);
         });
   };
   std::unique_ptr<ZTrace> ztrace;
@@ -165,30 +159,33 @@ void BaseNode::RunZTrace(
         } else {
           fail(absl::InternalError(
               absl::StrCat("Ambiguous ztrace handler: ", name)));
-          return;
+          return nullptr;
         }
       }
     }
   }
   if (ztrace == nullptr) {
     fail(absl::NotFoundError(absl::StrCat("ztrace not found: ", name)));
-    return;
+    return nullptr;
   }
-  ztrace->Run(deadline, std::move(args), event_engine, std::move(callback));
+  ztrace->Run(std::move(args), event_engine, std::move(callback));
+  return ztrace;
 }
 
 void BaseNode::SerializeEntity(grpc_channelz_v2_Entity* entity,
-                               upb_Arena* arena) {
+                               upb_Arena* arena, absl::Duration timeout) {
   grpc_channelz_v2_Entity_set_id(entity, uuid());
   grpc_channelz_v2_Entity_set_kind(
       entity, StdStringToUpbString(EntityTypeToKind(type_)));
+  std::vector<WeakRefCountedPtr<BaseNode>> parent_nodes;
   {
     MutexLock lock(&parent_mu_);
-    auto* parents =
-        grpc_channelz_v2_Entity_resize_parents(entity, parents_.size(), arena);
-    for (const auto& parent : parents_) {
-      *parents++ = parent->uuid();
-    }
+    parent_nodes.assign(parents_.begin(), parents_.end());
+  }
+  auto* parents = grpc_channelz_v2_Entity_resize_parents(
+      entity, parent_nodes.size(), arena);
+  for (const auto& parent : parent_nodes) {
+    *parents++ = parent->uuid();
   }
   grpc_channelz_v2_Entity_set_orphaned(entity, orphaned_index_ != 0);
 
@@ -208,8 +205,7 @@ void BaseNode::SerializeEntity(grpc_channelz_v2_Entity* entity,
   }
   make_data_sink().AddData("v1_compatibility",
                            PropertyList().Set("name", name()));
-  bool completed =
-      done->WaitForNotificationWithTimeout(absl::Milliseconds(100));
+  bool completed = done->WaitForNotificationWithTimeout(timeout);
   sink_impl->Finalize(!completed, entity, arena);
 
   trace_.Render(entity, arena);
@@ -219,11 +215,11 @@ void BaseNode::AddNodeSpecificData(DataSink) {
   // Default implementation does nothing.
 }
 
-std::string BaseNode::SerializeEntityToString() {
+std::string BaseNode::SerializeEntityToString(absl::Duration timeout) {
   upb_Arena* arena = upb_Arena_New();
   auto cleanup = absl::MakeCleanup([arena]() { upb_Arena_Free(arena); });
   grpc_channelz_v2_Entity* entity = grpc_channelz_v2_Entity_new(arena);
-  SerializeEntity(entity, arena);
+  SerializeEntity(entity, arena, timeout);
   size_t length;
   auto* bytes = grpc_channelz_v2_Entity_serialize(entity, arena, &length);
   return std::string(bytes, length);

data/src/core/channelz/channelz.h

@@ -35,10 +35,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/container/inlined_vector.h"
-#include "absl/strings/string_view.h"
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/dual_ref_counted.h"
@@ -52,6 +48,11 @@
 #include "src/core/util/time_precise.h"
 #include "src/core/util/useful.h"
 #include "src/proto/grpc/channelz/v2/channelz.upb.h"
+#include "src/proto/grpc/channelz/v2/service.upb.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_set.h"
+#include "absl/container/inlined_vector.h"
+#include "absl/strings/string_view.h"
 
 // Channel arg key for channelz node.
 #define GRPC_ARG_CHANNELZ_CHANNEL_NODE \
@@ -91,6 +92,29 @@ class CallCountingHelperPeer;
 class SubchannelNodePeer;
 }  // namespace testing
 
+class ZTrace {
+ public:
+  virtual ~ZTrace() = default;
+
+  using Args = std::map<std::string, std::variant<int64_t, std::string, bool>>;
+  // Callback is called periodically with the latest results from the ztrace.
+  // The format is a StatusOr<optional<string>>.
+  // - If the status is not-OK, then the ztrace encountered an error and this
+  //   will be the last callback.
+  // - If the status is OK but the optional<string> is empty, then the ztrace is
+  //   completed (successfully).
+  // - If the status is OK and the optional<string> is non-empty, then the
+  //   ztrace is still running and the string is the latest output - a
+  //   serialized QueryTraceResponse proto.
+  using Callback =
+      absl::AnyInvocable<void(absl::StatusOr<std::optional<std::string>>)>;
+
+  virtual void Run(Args args,
+                   std::shared_ptr<grpc_event_engine::experimental::EventEngine>
+                       event_engine,
+                   Callback callback) = 0;
+};
+
 // base class for all channelz entities
 class BaseNode : public DualRefCounted<BaseNode> {
  public:
@@ -106,6 +130,8 @@ class BaseNode : public DualRefCounted<BaseNode> {
     kSocket,
     kCall,
     kResourceQuota,
+    kMetricsDomain,
+    kMetricsDomainStorage,
   };
 
   static absl::string_view EntityTypeString(EntityType type) {
@@ -126,6 +152,10 @@ class BaseNode : public DualRefCounted<BaseNode> {
         return "call";
       case EntityType::kResourceQuota:
         return "resource_quota";
+      case EntityType::kMetricsDomain:
+        return "metrics_domain";
+      case EntityType::kMetricsDomainStorage:
+        return "metrics_domain_storage";
     }
     return "unknown";
   }
@@ -148,6 +178,10 @@ class BaseNode : public DualRefCounted<BaseNode> {
         return "call";
       case EntityType::kResourceQuota:
         return "resource_quota";
+      case EntityType::kMetricsDomain:
+        return "metrics_domain";
+      case EntityType::kMetricsDomainStorage:
+        return "metrics_domain_storage";
     }
   }
 
@@ -160,6 +194,10 @@ class BaseNode : public DualRefCounted<BaseNode> {
     if (kind == "socket") return EntityType::kSocket;
     if (kind == "call") return EntityType::kCall;
     if (kind == "resource_quota") return EntityType::kResourceQuota;
+    if (kind == "metrics_domain") return EntityType::kMetricsDomain;
+    if (kind == "metrics_domain_storage") {
+      return EntityType::kMetricsDomainStorage;
+    }
     return std::nullopt;
   }
 
@@ -210,11 +248,11 @@ class BaseNode : public DualRefCounted<BaseNode> {
   }
   const std::string& name() const { return name_; }
 
-  void RunZTrace(absl::string_view name, Timestamp deadline,
-                 std::map<std::string, std::string> args,
-                 std::shared_ptr<grpc_event_engine::experimental::EventEngine>
-                     event_engine,
-                 absl::AnyInvocable<void(Json output)> callback);
+  std::unique_ptr<ZTrace> RunZTrace(
+      absl::string_view name, ZTrace::Args args,
+      std::shared_ptr<grpc_event_engine::experimental::EventEngine>
+          event_engine,
+      ZTrace::Callback callback);
   Json::Object AdditionalInfo();
 
   const ChannelTrace& trace() const { return trace_; }
@@ -224,9 +262,10 @@ class BaseNode : public DualRefCounted<BaseNode> {
   }
   ChannelTrace& mutable_trace() { return trace_; }
 
-  void SerializeEntity(grpc_channelz_v2_Entity* entity, upb_Arena* arena);
+  void SerializeEntity(grpc_channelz_v2_Entity* entity, upb_Arena* arena,
+                       absl::Duration timeout);
 
-  std::string SerializeEntityToString();
+  std::string SerializeEntityToString(absl::Duration timeout);
 
  protected:
   void PopulateJsonFromDataSources(Json::Object& json);
@@ -276,15 +315,6 @@ LogOutputFrom(const RefCountedPtr<N>& n) {
 }
 }  // namespace detail
 
-class ZTrace {
- public:
-  virtual ~ZTrace() = default;
-  virtual void Run(Timestamp deadline, std::map<std::string, std::string> args,
-                   std::shared_ptr<grpc_event_engine::experimental::EventEngine>
-                       event_engine,
-                   absl::AnyInvocable<void(Json)>) = 0;
-};
-
 // This class is used to collect additional information about the channelz
 // node. It's the backing implementation for DataSink. channelz users should
 // use DataSink instead of this class directly.
@@ -772,8 +802,7 @@ class ListenSocketNode final : public BaseNode {
 
 class CallNode final : public BaseNode {
  public:
-  explicit CallNode(std::string name)
-      : BaseNode(EntityType::kCall, 0, std::move(name)) {
+  explicit CallNode() : BaseNode(EntityType::kCall, 0, std::string()) {
     NodeConstructed();
   }
 
@@ -790,6 +819,28 @@ class ResourceQuotaNode final : public BaseNode {
   Json RenderJson() override { return Json::FromString("ResourceQuota"); }
 };
 
+class MetricsDomainNode final : public BaseNode {
+ public:
+  explicit MetricsDomainNode(std::string name)
+      : BaseNode(EntityType::kMetricsDomain, 0, std::move(name)) {
+    NodeConstructed();
+  }
+
+  Json RenderJson() override { return Json::FromString("MetricsDomain"); }
+};
+
+class MetricsDomainStorageNode final : public BaseNode {
+ public:
+  explicit MetricsDomainStorageNode(std::string name)
+      : BaseNode(EntityType::kMetricsDomainStorage, 0, std::move(name)) {
+    NodeConstructed();
+  }
+
+  Json RenderJson() override {
+    return Json::FromString("MetricsDomainStorage");
+  }
+};
+
 }  // namespace channelz
 }  // namespace grpc_core
 

data/src/core/channelz/channelz_registry.cc

@@ -33,8 +33,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/config/config_vars.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@@ -43,6 +41,8 @@
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/shared_bit_gen.h"
 #include "src/core/util/sync.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 namespace grpc_core {
 namespace channelz {