grpc 1.75.0 → 1.78.1

data/src/core/telemetry/metrics.cc

@@ -19,8 +19,8 @@
 #include <memory>
 #include <optional>
 
-#include "absl/log/check.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/grpc_check.h"
 
 namespace grpc_core {
 
@@ -50,7 +50,7 @@ GlobalInstrumentsRegistry::RegisterInstrument(
     }
   }
   InstrumentID index = instruments.size();
-  CHECK_LT(index, std::numeric_limits<uint32_t>::max());
+  GRPC_CHECK_LT(index, std::numeric_limits<uint32_t>::max());
   GlobalInstrumentDescriptor descriptor;
   descriptor.value_type = value_type;
   descriptor.instrument_type = instrument_type;
@@ -101,23 +101,31 @@ RegisteredMetricCallback::~RegisteredMetricCallback() {
 
 void GlobalStatsPluginRegistry::StatsPluginGroup::AddClientCallTracers(
     const Slice& path, bool registered_method, Arena* arena) {
+  absl::InlinedVector<ClientCallTracerInterface*, 3> tracers;
   for (auto& state : plugins_state_) {
     auto* call_tracer = state.plugin->GetClientCallTracer(
         path, registered_method, state.scope_config);
     if (call_tracer != nullptr) {
-      AddClientCallTracerToContext(arena, call_tracer);
+      tracers.push_back(call_tracer);
     }
   }
+  SetClientCallTracer(arena, tracers);
 }
 
 void GlobalStatsPluginRegistry::StatsPluginGroup::AddServerCallTracers(
-    Arena* arena) {
+    Arena* arena,
+    absl::Span<ServerCallTracerInterface* const> additional_tracers) {
+  absl::InlinedVector<ServerCallTracerInterface*, 3> tracers;
+  for (auto* tracer : additional_tracers) {
+    if (tracer != nullptr) tracers.push_back(tracer);
+  }
   for (auto& state : plugins_state_) {
     auto* call_tracer = state.plugin->GetServerCallTracer(state.scope_config);
     if (call_tracer != nullptr) {
-      AddServerCallTracerToContext(arena, call_tracer);
+      tracers.push_back(call_tracer);
     }
   }
+  SetServerCallTracer(arena, tracers);
 }
 
 int GlobalStatsPluginRegistry::StatsPluginGroup::ChannelArgsCompare(
@@ -166,6 +174,7 @@ GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
       group->AddStatsPlugin(node->plugin, std::move(config));
     }
   }
+  group->Finish();
   return group;
 }
 
@@ -179,6 +188,7 @@ GlobalStatsPluginRegistry::GetStatsPluginsForServer(const ChannelArgs& args) {
       group->AddStatsPlugin(node->plugin, std::move(config));
     }
   }
+  group->Finish();
   return group;
 }
 

data/src/core/telemetry/metrics.h

@@ -23,16 +23,18 @@
 #include <type_traits>
 #include <vector>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/functional/function_ref.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/span.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/call_tracer.h"
+#include "src/core/telemetry/instrument.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/no_destruct.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/functional/function_ref.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 
 namespace grpc_core {
 
@@ -302,6 +304,13 @@ class StatsPlugin {
   virtual std::shared_ptr<StatsPlugin::ScopeConfig> GetServerScopeConfig(
       const ChannelArgs& args) const = 0;
 
+  // Fetch the collection scope for this stats plugin. The scope allows creating
+  // instrument storage objects for the instrument domains, and partitions
+  // the instrument collection so that different stats plugins only see the
+  // subset of metrics they're allowed to see.
+  // The returned scope must be a root scope (i.e. have no parents).
+  virtual RefCountedPtr<CollectionScope> GetCollectionScope() const = 0;
+
   // Adds \a value to the uint64 counter specified 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
@@ -385,6 +394,20 @@ class GlobalStatsPluginRegistry {
       plugin_state.scope_config = std::move(config);
       plugins_state_.push_back(std::move(plugin_state));
     }
+    // Finish construction: must be called after all plugins have been added.
+    void Finish() {
+      std::vector<RefCountedPtr<CollectionScope>> collection_scopes;
+      collection_scopes.reserve(plugins_state_.size() + 1);
+      collection_scopes.push_back(GlobalCollectionScope());
+      for (auto& state : plugins_state_) {
+        if (auto scope = state.plugin->GetCollectionScope(); scope != nullptr) {
+          GRPC_DCHECK(scope->IsRoot());
+          collection_scopes.push_back(scope);
+        }
+      }
+      collection_scope_ =
+          CreateCollectionScope(std::move(collection_scopes), {});
+    }
     // Adds a counter in all stats plugins within the group. See the StatsPlugin
     // interface for more documentation and valid types.
     template <std::size_t M, std::size_t N>
@@ -474,7 +497,9 @@ class GlobalStatsPluginRegistry {
                               Arena* arena);
     // Adds all available server call tracers associated with the stats plugins
     // within the group to \a call_context.
-    void AddServerCallTracers(Arena* arena);
+    void AddServerCallTracers(
+        Arena* arena,
+        absl::Span<ServerCallTracerInterface* const> additional_tracers);
 
     static absl::string_view ChannelArgName() {
       return "grpc.internal.stats_plugin_group";
@@ -482,6 +507,11 @@ class GlobalStatsPluginRegistry {
     static int ChannelArgsCompare(const StatsPluginGroup* a,
                                   const StatsPluginGroup* b);
 
+    RefCountedPtr<CollectionScope> GetCollectionScope() const {
+      CHECK_NE(collection_scope_.get(), nullptr);
+      return collection_scope_;
+    }
+
    private:
     friend class RegisteredMetricCallback;
 
@@ -503,6 +533,7 @@ class GlobalStatsPluginRegistry {
     }
 
     std::vector<PluginState> plugins_state_;
+    RefCountedPtr<CollectionScope> collection_scope_;
   };
 
   // Registers a stats plugin with the global stats plugin registry.

data/src/core/telemetry/stats.h

@@ -25,10 +25,10 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
-#include "absl/types/span.h"
 #include "src/core/telemetry/histogram_view.h"
 #include "src/core/telemetry/stats_data.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 
 namespace grpc_core {
 

data/src/core/telemetry/stats_data.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Automatically generated by tools/codegen/core/gen_stats_data.py
+// Automatically generated by tools/codegen/core/gen_stats_utils.cc
 
 #include "src/core/telemetry/stats_data.h"
 
@@ -391,9 +391,6 @@ const absl::string_view
         "client_subchannels_created",
         "server_channels_created",
         "insecure_connections_created",
-        "rq_connections_dropped",
-        "rq_calls_dropped",
-        "rq_calls_rejected",
         "syscall_write",
         "syscall_read",
         "tcp_read_alloc_8k",
@@ -424,9 +421,6 @@ const absl::string_view GlobalStats::counter_doc[static_cast<int>(
     "Number of client subchannels created",
     "Number of server channels created",
     "Number of insecure connections created",
-    "Number of connections dropped due to resource quota exceeded",
-    "Number of calls dropped due to resource quota exceeded",
-    "Number of calls rejected (never started) due to resource quota exceeded",
     "Number of write syscalls (or equivalent - eg sendmsg) made by this "
     "process",
     "Number of read syscalls (or equivalent - eg recvmsg) made by this process",
@@ -519,9 +513,6 @@ GlobalStats::GlobalStats()
       client_subchannels_created{0},
       server_channels_created{0},
       insecure_connections_created{0},
-      rq_connections_dropped{0},
-      rq_calls_dropped{0},
-      rq_calls_rejected{0},
       syscall_write{0},
       syscall_read{0},
       tcp_read_alloc_8k{0},
@@ -643,12 +634,6 @@ std::unique_ptr<GlobalStats> GlobalStatsCollector::Collect() const {
         data.server_channels_created.load(std::memory_order_relaxed);
     result->insecure_connections_created +=
         data.insecure_connections_created.load(std::memory_order_relaxed);
-    result->rq_connections_dropped +=
-        data.rq_connections_dropped.load(std::memory_order_relaxed);
-    result->rq_calls_dropped +=
-        data.rq_calls_dropped.load(std::memory_order_relaxed);
-    result->rq_calls_rejected +=
-        data.rq_calls_rejected.load(std::memory_order_relaxed);
     result->syscall_write += data.syscall_write.load(std::memory_order_relaxed);
     result->syscall_read += data.syscall_read.load(std::memory_order_relaxed);
     result->tcp_read_alloc_8k +=
@@ -746,10 +731,6 @@ std::unique_ptr<GlobalStats> GlobalStats::Diff(const GlobalStats& other) const {
       server_channels_created - other.server_channels_created;
   result->insecure_connections_created =
       insecure_connections_created - other.insecure_connections_created;
-  result->rq_connections_dropped =
-      rq_connections_dropped - other.rq_connections_dropped;
-  result->rq_calls_dropped = rq_calls_dropped - other.rq_calls_dropped;
-  result->rq_calls_rejected = rq_calls_rejected - other.rq_calls_rejected;
   result->syscall_write = syscall_write - other.syscall_write;
   result->syscall_read = syscall_read - other.syscall_read;
   result->tcp_read_alloc_8k = tcp_read_alloc_8k - other.tcp_read_alloc_8k;

data/src/core/telemetry/stats_data.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Automatically generated by tools/codegen/core/gen_stats_data.py
+// Automatically generated by tools/codegen/core/gen_stats_utils.cc
 
 #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H
 #define GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H
@@ -23,10 +23,10 @@
 #include <atomic>
 #include <memory>
 
-#include "absl/strings/string_view.h"
 #include "src/core/telemetry/histogram_view.h"
 #include "src/core/util/no_destruct.h"
 #include "src/core/util/per_cpu.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 class GlobalStatsCollector;
@@ -277,9 +277,6 @@ struct GlobalStats {
     kClientSubchannelsCreated,
     kServerChannelsCreated,
     kInsecureConnectionsCreated,
-    kRqConnectionsDropped,
-    kRqCallsDropped,
-    kRqCallsRejected,
     kSyscallWrite,
     kSyscallRead,
     kTcpReadAlloc8k,
@@ -347,9 +344,6 @@ struct GlobalStats {
       uint64_t client_subchannels_created;
       uint64_t server_channels_created;
       uint64_t insecure_connections_created;
-      uint64_t rq_connections_dropped;
-      uint64_t rq_calls_dropped;
-      uint64_t rq_calls_rejected;
       uint64_t syscall_write;
       uint64_t syscall_read;
       uint64_t tcp_read_alloc_8k;
@@ -430,16 +424,6 @@ class GlobalStatsCollector {
     data_.this_cpu().insecure_connections_created.fetch_add(
         1, std::memory_order_relaxed);
   }
-  void IncrementRqConnectionsDropped() {
-    data_.this_cpu().rq_connections_dropped.fetch_add(
-        1, std::memory_order_relaxed);
-  }
-  void IncrementRqCallsDropped() {
-    data_.this_cpu().rq_calls_dropped.fetch_add(1, std::memory_order_relaxed);
-  }
-  void IncrementRqCallsRejected() {
-    data_.this_cpu().rq_calls_rejected.fetch_add(1, std::memory_order_relaxed);
-  }
   void IncrementSyscallWrite() {
     data_.this_cpu().syscall_write.fetch_add(1, std::memory_order_relaxed);
   }
@@ -598,9 +582,6 @@ class GlobalStatsCollector {
     std::atomic<uint64_t> client_subchannels_created{0};
     std::atomic<uint64_t> server_channels_created{0};
     std::atomic<uint64_t> insecure_connections_created{0};
-    std::atomic<uint64_t> rq_connections_dropped{0};
-    std::atomic<uint64_t> rq_calls_dropped{0};
-    std::atomic<uint64_t> rq_calls_rejected{0};
     std::atomic<uint64_t> syscall_write{0};
     std::atomic<uint64_t> syscall_read{0};
     std::atomic<uint64_t> tcp_read_alloc_8k{0};

data/src/core/transport/auth_context.cc

@@ -25,14 +25,14 @@
 
 #include <algorithm>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/config/core_configuration.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/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/log/log.h"
 
 void grpc_auth_context_release(grpc_auth_context* context) {
   GRPC_TRACE_LOG(api, INFO)
@@ -99,7 +99,7 @@ const grpc_auth_property* grpc_auth_property_iterator_next(
     while (it->index < it->ctx->properties().count) {
       const grpc_auth_property* prop =
           &it->ctx->properties().array[it->index++];
-      CHECK_NE(prop->name, nullptr);
+      GRPC_CHECK_NE(prop->name, nullptr);
       if (strcmp(it->name, prop->name) == 0) {
         return prop;
       }

data/src/core/transport/auth_context.h

@@ -27,7 +27,6 @@
 #include <memory>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/connection_context.h"
@@ -36,6 +35,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_auth_context ---
 
@@ -120,6 +120,7 @@ struct grpc_auth_context
   void ensure_capacity();
   void add_property(const char* name, const char* value, size_t value_length);
   void add_cstring_property(const char* name, const char* value);
+  absl::string_view protocol() const { return protocol_; }
   void set_protocol(absl::string_view protocol);
   // Returns std::nullopt if auth context comparison is not supported.
   std::optional<bool> CompareAuthContext(const grpc_auth_context* other);

data/src/core/transport/auth_context_comparator_registry.h

@@ -19,8 +19,8 @@
 
 #include <grpc/impl/grpc_types.h>
 
-#include "absl/functional/any_invocable.h"
 #include "src/core/lib/channel/channel_args.h"
+#include "absl/functional/any_invocable.h"
 
 struct grpc_auth_context;
 

data/src/core/tsi/alts/crypt/aes_gcm.cc

@@ -27,8 +27,8 @@
 
 #include <memory>
 
-#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
+#include "absl/types/span.h"
 
 constexpr size_t kKdfKeyLen = 32;
 constexpr size_t kKdfCounterLen = 6;

data/src/core/tsi/alts/frame_protector/alts_frame_protector.cc

@@ -26,13 +26,13 @@
 #include <algorithm>
 #include <memory>
 
-#include "absl/log/log.h"
-#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
 #include "src/core/tsi/transport_security.h"
 #include "src/core/util/memory.h"
+#include "absl/log/log.h"
+#include "absl/types/span.h"
 
 constexpr size_t kMinFrameLength = 1024;
 constexpr size_t kDefaultFrameLength = 16 * 1024;

data/src/core/tsi/alts/frame_protector/frame_handler.cc

@@ -26,9 +26,9 @@
 
 #include <algorithm>
 
-#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
+#include "absl/log/log.h"
 
 // Use little endian to interpret a string of bytes as uint32_t.
 static uint32_t load_32_le(const unsigned char* buffer) {