grpc 1.76.0 → 1.78.0.pre1

data/src/core/tsi/ssl_transport_security_utils.h

@@ -25,11 +25,11 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
+#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
+#include "src/core/tsi/transport_security_interface.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
-#include "src/core/tsi/transport_security_interface.h"
 
 namespace grpc_core {
 

data/src/core/tsi/transport_security_grpc.cc

@@ -80,3 +80,11 @@ bool tsi_zero_copy_grpc_protector_read_frame_size(
   if (self->vtable->read_frame_size == nullptr) return false;
   return self->vtable->read_frame_size(self, protected_slices, frame_size);
 }
+
+void tsi_zero_copy_grpc_protector_set_allocator(
+    tsi_zero_copy_grpc_protector* self,
+    tsi_zero_copy_grpc_protector_allocator_cb alloc_cb, void* user_data) {
+  if (self != nullptr && self->vtable->set_allocator != nullptr) {
+    self->vtable->set_allocator(self, alloc_cb, user_data);
+  }
+}

data/src/core/tsi/transport_security_grpc.h

@@ -24,6 +24,9 @@
 
 #include "src/core/tsi/transport_security.h"
 
+typedef grpc_slice (*tsi_zero_copy_grpc_protector_allocator_cb)(
+    size_t size, void* user_data);
+
 // This method creates a tsi_zero_copy_grpc_protector object. It return TSI_OK
 // assuming there is no fatal error.
 // The caller is responsible for destroying the protector.
@@ -75,6 +78,15 @@ bool tsi_zero_copy_grpc_protector_read_frame_size(
     tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices,
     uint32_t* frame_size);
 
+// Sets the allocator callback for the tsi_zero_copy_grpc_protector object.
+// The allocator callback is used to allocate memory for the protected and
+// unprotected slices.
+// - alloc_cb is the allocator callback.
+// - user_data is the user data to be passed to the allocator callback.
+void tsi_zero_copy_grpc_protector_set_allocator(
+    tsi_zero_copy_grpc_protector* self,
+    tsi_zero_copy_grpc_protector_allocator_cb alloc_cb, void* user_data);
+
 // Base for tsi_zero_copy_grpc_protector implementations.
 // Implementations must guarantee that protect and unprotect can be called
 // concurrently.
@@ -92,6 +104,9 @@ struct tsi_zero_copy_grpc_protector_vtable {
   bool (*read_frame_size)(tsi_zero_copy_grpc_protector* self,
                           grpc_slice_buffer* protected_slices,
                           uint32_t* frame_size);
+  void (*set_allocator)(tsi_zero_copy_grpc_protector* self,
+                        tsi_zero_copy_grpc_protector_allocator_cb alloc_cb,
+                        void* user_data);
 };
 
 struct tsi_zero_copy_grpc_protector {

data/src/core/util/alloc.cc

@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "absl/log/check.h"
 #include "src/core/util/crash.h"
+#include "absl/log/check.h"
 
 void* gpr_malloc(size_t size) {
   void* p;

data/src/core/util/backoff.h

@@ -19,8 +19,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_BACKOFF_H
 #define GRPC_SRC_CORE_UTIL_BACKOFF_H
 
-#include "absl/random/random.h"
 #include "src/core/util/time.h"
+#include "absl/random/random.h"
 
 namespace grpc_core {
 

data/src/core/util/crash.h

@@ -17,8 +17,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/strings/string_view.h"
 #include "src/core/util/debug_location.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/util/dual_ref_counted.h

@@ -22,13 +22,13 @@
 #include <atomic>
 #include <cstdint>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 namespace grpc_core {
 

data/src/core/util/event_log.cc

@@ -19,9 +19,9 @@
 #include <algorithm>
 #include <atomic>
 
+#include "src/core/util/grpc_check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "src/core/util/grpc_check.h"
 
 namespace grpc_core {
 

data/src/core/util/event_log.h

@@ -22,12 +22,12 @@
 #include <string>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/span.h"
 #include "src/core/util/per_cpu.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time_precise.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 
 namespace grpc_core {
 

data/src/core/util/gcp_metadata_query.cc

@@ -27,11 +27,6 @@
 #include <memory>
 #include <utility>
 
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/grpc_check.h"
@@ -39,6 +34,11 @@
 #include "src/core/util/status_helper.h"
 #include "src/core/util/time.h"
 #include "src/core/util/uri.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/util/gcp_metadata_query.h

@@ -21,8 +21,6 @@
 
 #include <string>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/status/statusor.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
@@ -30,6 +28,8 @@
 #include "src/core/util/http_client/parser.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/time.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_core {
 

data/src/core/util/grpc_check.cc

@@ -19,4 +19,6 @@ bool PostMortemEmitAndReturnTrue() {
   grpc_core::PostMortemEmit();
   return true;
 }
+#else
+bool PostMortemEmitAndReturnTrue() { return true; }
 #endif

data/src/core/util/grpc_check.h

@@ -18,8 +18,8 @@
 #ifdef GRPC_POSTMORTEM_CHECKS
 #include <limits.h>
 
-#include "absl/log/log.h"
 #include "src/core/util/postmortem_emit.h"
+#include "absl/log/log.h"
 
 bool PostMortemEmitAndReturnTrue();
 

data/src/core/util/grpc_if_nametoindex_posix.cc

@@ -25,9 +25,9 @@
 #include <errno.h>
 #include <net/if.h>
 
-#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_if_nametoindex.h"
+#include "absl/log/log.h"
 
 uint32_t grpc_if_nametoindex(char* name) {
   uint32_t out = if_nametoindex(name);

data/src/core/util/grpc_if_nametoindex_unsupported.cc

@@ -22,9 +22,9 @@
 
 #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX)
 
-#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_if_nametoindex.h"
+#include "absl/log/log.h"
 
 uint32_t grpc_if_nametoindex(char* name) {
   VLOG(2) << "Not attempting to convert interface name " << name

data/src/core/util/http_client/format_request.cc

@@ -27,11 +27,11 @@
 #include <string>
 #include <vector>
 
+#include "src/core/util/http_client/httpcli.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-#include "src/core/util/http_client/httpcli.h"
 
 static void fill_common_header(const grpc_http_request* request,
                                const char* host, const char* path,

data/src/core/util/http_client/httpcli.cc

@@ -27,9 +27,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/functional/bind_front.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_format.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/credentials/transport/transport_credentials.h"
@@ -52,6 +49,9 @@
 #include "src/core/util/http_client/format_request.h"
 #include "src/core/util/http_client/parser.h"
 #include "src/core/util/status_helper.h"
+#include "absl/functional/bind_front.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_format.h"
 
 namespace grpc_core {
 

data/src/core/util/http_client/httpcli.h

@@ -30,10 +30,6 @@
 #include <optional>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -52,6 +48,10 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/uri.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 // User agent this library reports
 #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0"

data/src/core/util/http_client/httpcli_security_connector.cc

@@ -28,10 +28,6 @@
 #include <optional>
 #include <string>
 
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/security_connector.h"
 #include "src/core/credentials/transport/tls/ssl_utils.h"
 #include "src/core/credentials/transport/transport_credentials.h"
@@ -50,6 +46,10 @@
 #include "src/core/util/debug_location.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/unique_type_name.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/util/http_client/parser.cc

@@ -24,9 +24,9 @@
 
 #include <algorithm>
 
+#include "src/core/util/grpc_check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-#include "src/core/util/grpc_check.h"
 
 static char* buf2str(void* buffer, size_t length) {
   char* out = static_cast<char*>(gpr_malloc(length + 1));

data/src/core/util/json/json_channel_args.h

@@ -19,9 +19,9 @@
 
 #include <optional>
 
-#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/json/json_args.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/util/json/json_object_loader.h

@@ -25,18 +25,18 @@
 #include <string>
 #include <vector>
 
-#include "absl/meta/type_traits.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/no_destruct.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/meta/type_traits.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 // Provides a means to load JSON objects into C++ objects, with the aim of
 // minimizing object code size.

data/src/core/util/json/json_reader.cc

@@ -26,6 +26,8 @@
 #include <variant>
 #include <vector>
 
+#include "src/core/util/json/json.h"
+#include "src/core/util/match.h"
 #include "absl/base/attributes.h"
 #include "absl/log/check.h"
 #include "absl/status/status.h"
@@ -34,8 +36,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-#include "src/core/util/json/json.h"
-#include "src/core/util/match.h"
 
 #define GRPC_JSON_MAX_DEPTH 255
 #define GRPC_JSON_MAX_ERRORS 16

data/src/core/util/json/json_reader.h

@@ -19,9 +19,9 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/util/json/json.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "src/core/util/json/json.h"
 
 namespace grpc_core {
 

data/src/core/util/json/json_util.h

@@ -28,12 +28,12 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/time.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/util/json/json_writer.cc

@@ -25,8 +25,8 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/util/json/json.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/util/latent_see.cc

@@ -16,15 +16,19 @@
 
 #include <atomic>
 #include <cstdint>
+#include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
+#include "src/core/channelz/property_list.h"
 #include "src/core/util/backoff.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/sync.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core::latent_see {
 
@@ -38,10 +42,13 @@ std::string JsonOutput::MicrosString(int64_t nanos) {
   return absl::StrFormat("%d.%03d", micros, remainder);
 }
 
-void JsonOutput::Mark(absl::string_view name, int64_t tid, int64_t timestamp) {
+void JsonOutput::Mark(absl::string_view name, int64_t tid, int64_t timestamp,
+                      channelz::PropertyList property_list) {
+  auto properties_json = Json::FromObject(property_list.TakeJsonObject());
   out_ << absl::StrCat(sep_, "{\"name\":\"", name,
                        "\",\"ph\":\"i\",\"ts\":", MicrosString(timestamp),
-                       ",\"pid\":0,\"tid\":", tid, "}");
+                       ",\"pid\":0,\"tid\":", tid,
+                       ",\"args\":", JsonDump(properties_json), "}");
   sep_ = ",\n";
 }
 
@@ -55,9 +62,10 @@ void JsonOutput::FlowBegin(absl::string_view name, int64_t tid,
 
 void JsonOutput::FlowEnd(absl::string_view name, int64_t tid, int64_t timestamp,
                          int64_t flow_id) {
-  out_ << absl::StrCat(sep_, "{\"name\":\"", name,
-                       "\",\"ph\":\"f\",\"ts\":", MicrosString(timestamp),
-                       ",\"pid\":0,\"tid\":", tid, ",\"id\":", flow_id, "}");
+  out_ << absl::StrCat(
+      sep_, "{\"name\":\"", name,
+      "\",\"ph\":\"f\",\"bp\":\"e\",\"ts\":", MicrosString(timestamp),
+      ",\"pid\":0,\"tid\":", tid, ",\"id\":", flow_id, "}");
   sep_ = ",\n";
 }
 
@@ -130,7 +138,7 @@ std::unique_ptr<Sink::EventDump> Sink::Stop() {
 void Sink::Record(std::unique_ptr<Bin> bin) {
   MutexLock lock(&mu_);
   if (events_ == nullptr) return;
-  CHECK_LE(bin->num_events, Bin::kEventsPerBin);
+  CHECK_LE(bin->used_space, Bin::kMaxBinSize);
   events_->emplace_back(std::move(bin));
   if (events_->size() > max_bins_) events_->pop_front();
 }
@@ -177,11 +185,16 @@ void Collect(Notification* n, absl::Duration timeout, size_t memory_limit,
         earliest_timestamp = std::min(
             {earliest_timestamp, event.timestamp_begin, event.timestamp_end});
       } else {
-        earliest_timestamp = std::min(earliest_timestamp, -event.timestamp_end);
+        earliest_timestamp =
+            std::min(earliest_timestamp, abs(event.timestamp_end));
       }
     }
   }
   std::string json = "[\n";
+  // Add a mark for the actual timestamp when collection started.
+  output->Mark(
+      "LatentseeCollectionStart", /*tid=*/0, /*timestamp=*/0,
+      channelz::PropertyList().Set("actual_start_time", earliest_timestamp));
   // TODO(ctiller): Fuschia Trace Format backend
   absl::flat_hash_map<gpr_thd_id, size_t> thread_id_map;
   for (const auto& bin : *events) {
@@ -193,22 +206,30 @@ void Collect(Notification* n, absl::Duration timeout, size_t memory_limit,
     } else {
       displayed_thread_id = it->second;
     }
-    for (const auto& event : *bin) {
-      if (event.timestamp_begin == event.timestamp_end) {
-        output->Mark(event.metadata->name, displayed_thread_id,
-                     event.timestamp_begin - earliest_timestamp);
-      } else if (event.timestamp_begin < 0 && event.timestamp_end > 0) {
-        output->FlowBegin(event.metadata->name, displayed_thread_id,
-                          event.timestamp_end - earliest_timestamp,
-                          -event.timestamp_begin);
-      } else if (event.timestamp_begin < 0) {
-        output->FlowEnd(event.metadata->name, displayed_thread_id,
-                        -event.timestamp_end - earliest_timestamp,
-                        -event.timestamp_begin);
+    for (auto it = bin->begin(); it != bin->end(); ++it) {
+      if (it->timestamp_begin == it->timestamp_end) {
+        if (it->metadata->extra_event_size > 0) {
+          output->Mark(
+              it->metadata->name, displayed_thread_id,
+              it->timestamp_begin - earliest_timestamp,
+              it->metadata->to_property_list(it.ptr() + sizeof(Bin::Event)));
+        } else {
+          output->Mark(it->metadata->name, displayed_thread_id,
+                       it->timestamp_begin - earliest_timestamp,
+                       channelz::PropertyList());
+        }
+      } else if (it->timestamp_begin < 0 && it->timestamp_end > 0) {
+        output->FlowBegin(it->metadata->name, displayed_thread_id,
+                          it->timestamp_end - earliest_timestamp,
+                          -it->timestamp_begin);
+      } else if (it->timestamp_begin < 0) {
+        output->FlowEnd(it->metadata->name, displayed_thread_id,
+                        -it->timestamp_end - earliest_timestamp,
+                        -it->timestamp_begin);
       } else {
-        output->Span(event.metadata->name, displayed_thread_id,
-                     event.timestamp_begin - earliest_timestamp,
-                     event.timestamp_end - event.timestamp_begin);
+        output->Span(it->metadata->name, displayed_thread_id,
+                     it->timestamp_begin - earliest_timestamp,
+                     it->timestamp_end - it->timestamp_begin);
       }
     }
   }