grpc 1.65.2 → 1.66.0.pre3

data/src/core/lib/experiments/experiments.h

@@ -59,16 +59,14 @@ namespace grpc_core {
 #if defined(GRPC_CFSTREAM)
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
+inline bool IsCallTracerInTransportEnabled() { return true; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
 inline bool IsEventEngineListenerEnabled() { return false; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX
-inline bool IsHttp2StatsFixEnabled() { return true; }
-inline bool IsKeepaliveFixEnabled() { return false; }
-inline bool IsKeepaliveServerFixEnabled() { return false; }
 inline bool IsMaxPingsWoDataThrottleEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
@@ -92,6 +90,8 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; }
 #elif defined(GPR_WINDOWS)
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
+inline bool IsCallTracerInTransportEnabled() { return true; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 inline bool IsClientPrivacyEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
@@ -101,10 +101,6 @@ inline bool IsEventEngineDnsEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX
-inline bool IsHttp2StatsFixEnabled() { return true; }
-inline bool IsKeepaliveFixEnabled() { return false; }
-inline bool IsKeepaliveServerFixEnabled() { return false; }
 inline bool IsMaxPingsWoDataThrottleEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
@@ -128,6 +124,8 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; }
 #else
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
+inline bool IsCallTracerInTransportEnabled() { return true; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
 inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineClientEnabled() { return false; }
@@ -136,10 +134,6 @@ inline bool IsEventEngineDnsEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX
-inline bool IsHttp2StatsFixEnabled() { return true; }
-inline bool IsKeepaliveFixEnabled() { return false; }
-inline bool IsKeepaliveServerFixEnabled() { return false; }
 inline bool IsMaxPingsWoDataThrottleEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
@@ -164,15 +158,13 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; }
 #else
 enum ExperimentIds {
   kExperimentIdCallStatusOverrideOnCancellation,
+  kExperimentIdCallTracerInTransport,
   kExperimentIdCanaryClientPrivacy,
   kExperimentIdClientPrivacy,
   kExperimentIdEventEngineClient,
   kExperimentIdEventEngineDns,
   kExperimentIdEventEngineListener,
   kExperimentIdFreeLargeAllocator,
-  kExperimentIdHttp2StatsFix,
-  kExperimentIdKeepaliveFix,
-  kExperimentIdKeepaliveServerFix,
   kExperimentIdMaxPingsWoDataThrottle,
   kExperimentIdMonitoringExperiment,
   kExperimentIdMultiping,
@@ -192,103 +184,95 @@ enum ExperimentIds {
 };
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 inline bool IsCallStatusOverrideOnCancellationEnabled() {
-  return IsExperimentEnabled(kExperimentIdCallStatusOverrideOnCancellation);
+  return IsExperimentEnabled<kExperimentIdCallStatusOverrideOnCancellation>();
+}
+#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT
+inline bool IsCallTracerInTransportEnabled() {
+  return IsExperimentEnabled<kExperimentIdCallTracerInTransport>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CANARY_CLIENT_PRIVACY
 inline bool IsCanaryClientPrivacyEnabled() {
-  return IsExperimentEnabled(kExperimentIdCanaryClientPrivacy);
+  return IsExperimentEnabled<kExperimentIdCanaryClientPrivacy>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY
 inline bool IsClientPrivacyEnabled() {
-  return IsExperimentEnabled(kExperimentIdClientPrivacy);
+  return IsExperimentEnabled<kExperimentIdClientPrivacy>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
 inline bool IsEventEngineClientEnabled() {
-  return IsExperimentEnabled(kExperimentIdEventEngineClient);
+  return IsExperimentEnabled<kExperimentIdEventEngineClient>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() {
-  return IsExperimentEnabled(kExperimentIdEventEngineDns);
+  return IsExperimentEnabled<kExperimentIdEventEngineDns>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() {
-  return IsExperimentEnabled(kExperimentIdEventEngineListener);
+  return IsExperimentEnabled<kExperimentIdEventEngineListener>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_FREE_LARGE_ALLOCATOR
 inline bool IsFreeLargeAllocatorEnabled() {
-  return IsExperimentEnabled(kExperimentIdFreeLargeAllocator);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX
-inline bool IsHttp2StatsFixEnabled() {
-  return IsExperimentEnabled(kExperimentIdHttp2StatsFix);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_KEEPALIVE_FIX
-inline bool IsKeepaliveFixEnabled() {
-  return IsExperimentEnabled(kExperimentIdKeepaliveFix);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_KEEPALIVE_SERVER_FIX
-inline bool IsKeepaliveServerFixEnabled() {
-  return IsExperimentEnabled(kExperimentIdKeepaliveServerFix);
+  return IsExperimentEnabled<kExperimentIdFreeLargeAllocator>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE
 inline bool IsMaxPingsWoDataThrottleEnabled() {
-  return IsExperimentEnabled(kExperimentIdMaxPingsWoDataThrottle);
+  return IsExperimentEnabled<kExperimentIdMaxPingsWoDataThrottle>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() {
-  return IsExperimentEnabled(kExperimentIdMonitoringExperiment);
+  return IsExperimentEnabled<kExperimentIdMonitoringExperiment>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MULTIPING
 inline bool IsMultipingEnabled() {
-  return IsExperimentEnabled(kExperimentIdMultiping);
+  return IsExperimentEnabled<kExperimentIdMultiping>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PEER_STATE_BASED_FRAMING
 inline bool IsPeerStateBasedFramingEnabled() {
-  return IsExperimentEnabled(kExperimentIdPeerStateBasedFraming);
+  return IsExperimentEnabled<kExperimentIdPeerStateBasedFraming>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW
 inline bool IsPickFirstNewEnabled() {
-  return IsExperimentEnabled(kExperimentIdPickFirstNew);
+  return IsExperimentEnabled<kExperimentIdPickFirstNew>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_INPROC_TRANSPORT
 inline bool IsPromiseBasedInprocTransportEnabled() {
-  return IsExperimentEnabled(kExperimentIdPromiseBasedInprocTransport);
+  return IsExperimentEnabled<kExperimentIdPromiseBasedInprocTransport>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_RSTPIT
 inline bool IsRstpitEnabled() {
-  return IsExperimentEnabled(kExperimentIdRstpit);
+  return IsExperimentEnabled<kExperimentIdRstpit>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_SCHEDULE_CANCELLATION_OVER_WRITE
 inline bool IsScheduleCancellationOverWriteEnabled() {
-  return IsExperimentEnabled(kExperimentIdScheduleCancellationOverWrite);
+  return IsExperimentEnabled<kExperimentIdScheduleCancellationOverWrite>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_PRIVACY
 inline bool IsServerPrivacyEnabled() {
-  return IsExperimentEnabled(kExperimentIdServerPrivacy);
+  return IsExperimentEnabled<kExperimentIdServerPrivacy>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_FRAME_SIZE_TUNING
 inline bool IsTcpFrameSizeTuningEnabled() {
-  return IsExperimentEnabled(kExperimentIdTcpFrameSizeTuning);
+  return IsExperimentEnabled<kExperimentIdTcpFrameSizeTuning>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_RCV_LOWAT
 inline bool IsTcpRcvLowatEnabled() {
-  return IsExperimentEnabled(kExperimentIdTcpRcvLowat);
+  return IsExperimentEnabled<kExperimentIdTcpRcvLowat>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
 inline bool IsTraceRecordCallopsEnabled() {
-  return IsExperimentEnabled(kExperimentIdTraceRecordCallops);
+  return IsExperimentEnabled<kExperimentIdTraceRecordCallops>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
-  return IsExperimentEnabled(kExperimentIdUnconstrainedMaxQuotaBufferSize);
+  return IsExperimentEnabled<kExperimentIdUnconstrainedMaxQuotaBufferSize>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() {
-  return IsExperimentEnabled(kExperimentIdWorkSerializerClearsTimeCache);
+  return IsExperimentEnabled<kExperimentIdWorkSerializerClearsTimeCache>();
 }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
 inline bool IsWorkSerializerDispatchEnabled() {
-  return IsExperimentEnabled(kExperimentIdWorkSerializerDispatch);
+  return IsExperimentEnabled<kExperimentIdWorkSerializerDispatch>();
 }
 
 extern const ExperimentMetadata g_experiment_metadata[kNumExperiments];

data/src/core/lib/gprpp/bitset.h

@@ -138,7 +138,7 @@ class BitSet {
   uint32_t count() const {
     uint32_t count = 0;
     for (size_t i = 0; i < kUnits; i++) {
-      count += BitCount(units_[i]);
+      count += absl::popcount(units_[i]);
     }
     return count;
   }

data/src/core/lib/gprpp/construct_destruct.h

@@ -24,14 +24,14 @@ namespace grpc_core {
 
 // Call the destructor of p without having to name the type of p.
 template <typename T>
-void Destruct(T* p) {
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Destruct(T* p) {
   p->~T();
 }
 
 // Call the constructor of p without having to name the type of p and forward
 // any arguments
 template <typename T, typename... Args>
-void Construct(T* p, Args&&... args) {
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Construct(T* p, Args&&... args) {
   new (p) T(std::forward<Args>(args)...);
 }
 

data/src/core/lib/gprpp/debug_location.h

@@ -21,6 +21,8 @@
 
 #include <utility>
 
+#include "absl/strings/str_cat.h"
+
 #include <grpc/support/port_platform.h>
 
 #if defined(__has_builtin)
@@ -56,6 +58,11 @@ class SourceLocation {
   int line_;
 };
 
+template <typename Sink>
+void AbslStringify(Sink& out, const SourceLocation& location) {
+  out.Append(absl::StrCat("[", location.file(), ":", location.line(), "]"));
+}
+
 // Used for tracking file and line where a call is made for debug builds.
 // No-op for non-debug builds.
 // Callers can use the DEBUG_LOCATION macro in either case.

data/src/core/lib/gprpp/down_cast.h

@@ -26,7 +26,7 @@
 namespace grpc_core {
 
 template <typename To, typename From>
-inline To DownCast(From* f) {
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From* f) {
   static_assert(
       std::is_base_of<From, typename std::remove_pointer<To>::type>::value,
       "DownCast requires a base-to-derived relationship");
@@ -40,7 +40,7 @@ inline To DownCast(From* f) {
 }
 
 template <typename To, typename From>
-inline To DownCast(From& f) {
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From& f) {
   return *DownCast<typename std::remove_reference<To>::type*>(&f);
 }
 

data/src/core/lib/gprpp/dump_args.cc

@@ -21,7 +21,7 @@
 namespace grpc_core {
 namespace dump_args_detail {
 
-std::ostream& operator<<(std::ostream& out, const DumpArgs& args) {
+void DumpArgs::Stringify(CustomSink& sink) const {
   // Parse the argument string into a vector of keys.
   // #__VA_ARGS__ produces a stringified version of the arguments passed to the
   // macro. It's comma separated, and we can use that to split the string into
@@ -29,8 +29,8 @@ std::ostream& operator<<(std::ostream& out, const DumpArgs& args) {
   // we need to skip commas that are inside parenthesis.
   std::vector<absl::string_view> keys;
   int depth = 0;
-  const char* start = args.arg_string_;
-  for (const char* p = args.arg_string_; *p; ++p) {
+  const char* start = arg_string_;
+  for (const char* p = arg_string_; *p; ++p) {
     if (*p == '(') {
       ++depth;
     } else if (*p == ')') {
@@ -41,13 +41,13 @@ std::ostream& operator<<(std::ostream& out, const DumpArgs& args) {
     }
   }
   keys.push_back(start);
-  CHECK_EQ(keys.size(), args.arg_dumpers_.size());
+  CHECK_EQ(keys.size(), arg_dumpers_.size());
   for (size_t i = 0; i < keys.size(); i++) {
-    if (i != 0) out << ", ";
-    out << absl::StripAsciiWhitespace(keys[i]) << " = ";
-    args.arg_dumpers_[i](out);
+    if (i != 0) sink.Append(", ");
+    sink.Append(absl::StripAsciiWhitespace(keys[i]));
+    sink.Append(" = ");
+    arg_dumpers_[i](sink);
   }
-  return out;
 }
 
 }  // namespace dump_args_detail

data/src/core/lib/gprpp/dump_args.h

@@ -19,6 +19,9 @@
 #include <vector>
 
 #include "absl/functional/any_invocable.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 namespace dump_args_detail {
@@ -39,17 +42,62 @@ class DumpArgs {
     do_these_things({AddDumper(&args)...});
   }
 
-  friend std::ostream& operator<<(std::ostream& out, const DumpArgs& args);
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const DumpArgs& dumper) {
+    CustomSinkImpl<Sink> custom_sink(sink);
+    dumper.Stringify(custom_sink);
+  }
+
+  friend std::ostream& operator<<(std::ostream& out, const DumpArgs& dumper) {
+    return out << absl::StrCat(dumper);
+  }
 
  private:
+  class CustomSink {
+   public:
+    virtual void Append(absl::string_view x) = 0;
+
+   protected:
+    ~CustomSink() = default;
+  };
+
+  template <typename Sink>
+  class CustomSinkImpl final : public CustomSink {
+   public:
+    explicit CustomSinkImpl(Sink& sink) : sink_(sink) {}
+    void Append(absl::string_view x) override { sink_.Append(x); }
+
+   private:
+    Sink& sink_;
+  };
+
   template <typename T>
   int AddDumper(T* p) {
-    arg_dumpers_.push_back([p](std::ostream& os) { os << *p; });
+    arg_dumpers_.push_back(
+        [p](CustomSink& os) { os.Append(absl::StrCat(*p)); });
     return 0;
   }
 
+  int AddDumper(void** p) {
+    arg_dumpers_.push_back(
+        [p](CustomSink& os) { os.Append(absl::StrFormat("%p", *p)); });
+    return 0;
+  }
+
+  template <typename T>
+  int AddDumper(T** p) {
+    return AddDumper(reinterpret_cast<void**>(p));
+  }
+
+  template <typename T>
+  int AddDumper(T* const* p) {
+    return AddDumper(const_cast<T**>(p));
+  }
+
+  void Stringify(CustomSink& sink) const;
+
   const char* arg_string_;
-  std::vector<absl::AnyInvocable<void(std::ostream&) const>> arg_dumpers_;
+  std::vector<absl::AnyInvocable<void(CustomSink&) const>> arg_dumpers_;
 };
 
 }  // namespace dump_args_detail

data/src/core/lib/gprpp/status_helper.cc

@@ -342,7 +342,7 @@ google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) {
                          PercentEncodingType::Compatible);
   char* message_percent = reinterpret_cast<char*>(
       upb_Arena_Malloc(arena, message_percent_slice.length()));
-  if (message_percent_slice.length() > 0) {
+  if (!message_percent_slice.empty()) {
     memcpy(message_percent, message_percent_slice.data(),
            message_percent_slice.length());
   }

data/src/core/lib/gprpp/table.h

@@ -35,20 +35,28 @@ namespace grpc_core {
 namespace table_detail {
 
 // A tuple-like type that contains manually constructed elements.
-template <typename... Ts>
+template <typename, typename... Ts>
 struct Elements;
 
 template <typename T, typename... Ts>
-struct Elements<T, Ts...> : Elements<Ts...> {
-  union U {
-    U() {}
-    ~U() {}
-    GPR_NO_UNIQUE_ADDRESS T x;
+struct Elements<absl::enable_if_t<!std::is_empty<T>::value>, T, Ts...>
+    : Elements<void, Ts...> {
+  struct alignas(T) Data {
+    unsigned char bytes[sizeof(T)];
   };
-  U u;
+  Data x;
+  Elements() {}
+  T* ptr() { return reinterpret_cast<T*>(x.bytes); }
+  const T* ptr() const { return reinterpret_cast<const T*>(x.bytes); }
+};
+template <typename T, typename... Ts>
+struct Elements<absl::enable_if_t<std::is_empty<T>::value>, T, Ts...>
+    : Elements<void, Ts...> {
+  T* ptr() { return reinterpret_cast<T*>(this); }
+  const T* ptr() const { return reinterpret_cast<const T*>(this); }
 };
 template <>
-struct Elements<> {};
+struct Elements<void> {};
 
 // Element accessor for Elements<>
 // Provides a static method f that returns a pointer to the value of element I
@@ -58,17 +66,17 @@ struct GetElem;
 
 template <typename T, typename... Ts>
 struct GetElem<0, T, Ts...> {
-  static T* f(Elements<T, Ts...>* e) { return &e->u.x; }
-  static const T* f(const Elements<T, Ts...>* e) { return &e->u.x; }
+  static T* f(Elements<void, T, Ts...>* e) { return e->ptr(); }
+  static const T* f(const Elements<void, T, Ts...>* e) { return e->ptr(); }
 };
 
 template <size_t I, typename T, typename... Ts>
 struct GetElem<I, T, Ts...> {
-  static auto f(Elements<T, Ts...>* e)
+  static auto f(Elements<void, T, Ts...>* e)
       -> decltype(GetElem<I - 1, Ts...>::f(e)) {
     return GetElem<I - 1, Ts...>::f(e);
   }
-  static auto f(const Elements<T, Ts...>* e)
+  static auto f(const Elements<void, T, Ts...>* e)
       -> decltype(GetElem<I - 1, Ts...>::f(e)) {
     return GetElem<I - 1, Ts...>::f(e);
   }
@@ -340,7 +348,7 @@ class Table {
   // the default) -- one bit for each type in Ts.
   using PresentBits = BitSet<sizeof...(Ts)>;
   // The tuple-like backing structure for Table.
-  using Elements = table_detail::Elements<Ts...>;
+  using Elements = table_detail::Elements<void, Ts...>;
   // Extractor from Elements
   template <size_t I>
   using GetElem = table_detail::GetElem<I, Ts...>;
@@ -442,9 +450,9 @@ class Table {
   }
 
   // Bit field indicating which elements are set.
-  GPR_NO_UNIQUE_ADDRESS PresentBits present_bits_;
+  PresentBits present_bits_;
   // The memory to store the elements themselves.
-  GPR_NO_UNIQUE_ADDRESS Elements elements_;
+  Elements elements_;
 };
 
 }  // namespace grpc_core

data/src/core/lib/gprpp/time.h

@@ -31,19 +31,7 @@
 #include "src/core/util/time_precise.h"
 #include "src/core/util/useful.h"
 
-#define GRPC_LOG_EVERY_N_SEC(n, severity, format, ...)          \
-  do {                                                          \
-    static std::atomic<uint64_t> prev{0};                       \
-    uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \
-                       gpr_now(GPR_CLOCK_MONOTONIC))            \
-                       .milliseconds_after_process_epoch();     \
-    if (prev == 0 || now - prev > (n) * 1000) {                 \
-      prev = now;                                               \
-      gpr_log(severity, format, __VA_ARGS__);                   \
-    }                                                           \
-  } while (0)
-
-#define GRPC_LOG_EVERY_N_SEC_DELAYED(n, severity, format, ...)  \
+#define GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG(n, format, ...)      \
   do {                                                          \
     static std::atomic<uint64_t> prev{0};                       \
     uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \
@@ -52,7 +40,7 @@
     if (prev == 0) prev = now;                                  \
     if (now - prev > (n) * 1000) {                              \
       prev = now;                                               \
-      gpr_log(severity, format, __VA_ARGS__);                   \
+      VLOG(2) << absl::StrFormat(format, __VA_ARGS__);          \
     }                                                           \
   } while (0)
 
@@ -169,6 +157,11 @@ class Timestamp {
 
   std::string ToString() const;
 
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const Timestamp& t) {
+    sink.Append(t.ToString());
+  }
+
  private:
   explicit constexpr Timestamp(int64_t millis) : millis_(millis) {}
 
@@ -293,6 +286,11 @@ class Duration {
   // https://developers.google.com/protocol-buffers/docs/proto3#json
   std::string ToJsonString() const;
 
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const Duration& t) {
+    sink.Append(t.ToString());
+  }
+
  private:
   explicit constexpr Duration(int64_t millis) : millis_(millis) {}
 
@@ -377,9 +375,6 @@ inline Timestamp& Timestamp::operator+=(Duration duration) {
 
 void TestOnlySetProcessEpoch(gpr_timespec epoch);
 
-std::ostream& operator<<(std::ostream& out, Timestamp timestamp);
-std::ostream& operator<<(std::ostream& out, Duration duration);
-
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_GPRPP_TIME_H

data/src/core/lib/gprpp/unique_type_name.h

@@ -64,19 +64,12 @@ class UniqueTypeName {
     Factory(const Factory&) = delete;
     Factory& operator=(const Factory&) = delete;
 
-    UniqueTypeName Create() { return UniqueTypeName(*name_); }
+    UniqueTypeName Create() const { return UniqueTypeName(*name_); }
 
    private:
     std::string* name_;
   };
 
-  // Copyable.
-  UniqueTypeName(const UniqueTypeName& other) : name_(other.name_) {}
-  UniqueTypeName& operator=(const UniqueTypeName& other) {
-    name_ = other.name_;
-    return *this;
-  }
-
   bool operator==(const UniqueTypeName& other) const {
     return name_.data() == other.name_.data();
   }
@@ -87,18 +80,45 @@ class UniqueTypeName {
     return name_.data() < other.name_.data();
   }
 
+  template <typename H>
+  friend H AbslHashValue(H h, const UniqueTypeName& name) {
+    return H::combine(std::move(h),
+                      static_cast<const void*>(name.name_.data()));
+  }
+
   int Compare(const UniqueTypeName& other) const {
     return QsortCompare(name_.data(), other.name_.data());
   }
 
   absl::string_view name() const { return name_; }
 
+  template <typename Sink>
+  friend void AbslStringify(Sink& sink, const UniqueTypeName& name) {
+    sink.Append(name.name_);
+  }
+
  private:
   explicit UniqueTypeName(absl::string_view name) : name_(name) {}
 
   absl::string_view name_;
 };
 
+// Given a type with a member `static absl::string_view TypeName()`, returns a
+// UniqueTypeName instance who's string value is the value of TypeName.
+template <typename T>
+UniqueTypeName UniqueTypeNameFor() {
+  static UniqueTypeName::Factory factory(T::TypeName());
+  return factory.Create();
+}
+
 }  // namespace grpc_core
 
+// Creates a one-off UniqueTypeName in-place.
+// Duplicate calls yield different UniqueTypeName instances.
+#define GRPC_UNIQUE_TYPE_NAME_HERE(name)                               \
+  ([] {                                                                \
+    static const ::grpc_core::UniqueTypeName::Factory factory((name)); \
+    return factory.Create();                                           \
+  }())
+
 #endif  // GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H