grpc 1.76.0 → 1.78.0.pre1

data/src/core/telemetry/metrics.cc

@@ -174,6 +174,7 @@ GlobalStatsPluginRegistry::GetStatsPluginsForChannel(
       group->AddStatsPlugin(node->plugin, std::move(config));
     }
   }
+  group->Finish();
   return group;
 }
 
@@ -187,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>
@@ -484,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;
 
@@ -505,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"
 

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;

data/src/core/transport/auth_context.cc

@@ -25,7 +25,6 @@
 
 #include <algorithm>
 
-#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"
@@ -33,6 +32,7 @@
 #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)

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) {

data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc

@@ -26,9 +26,6 @@
 #include <memory>
 #include <string>
 
-#include "absl/log/log.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_split.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h"
@@ -37,6 +34,9 @@
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/sync.h"
 #include "upb/mem/arena.hpp"
+#include "absl/log/log.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/str_split.h"
 
 #define TSI_ALTS_INITIAL_BUFFER_SIZE 256
 

data/src/core/tsi/alts/handshaker/alts_handshaker_client.h

@@ -32,7 +32,7 @@
 #define ALTS_SERVICE_METHOD "/grpc.gcp.HandshakerService/DoHandshake"
 #define ALTS_APPLICATION_PROTOCOL "grpc"
 #define ALTS_RECORD_PROTOCOL "ALTSRP_GCM_AES128_REKEY"
-#define ALTS_INTEGRITY_ONLY_RECORD_PROTOCOL "ALTSRP_GCM_GMAC_128"
+#define ALTS_INTEGRITY_ONLY_RECORD_PROTOCOL "ALTSRP_GMAC_128"
 #define ALTS_HANDSHAKER_SERVICE_URL_FOR_TESTING "lame"
 
 const size_t kAltsAes128GcmRekeyKeyLength = 44;

data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc

@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/channel.h"
@@ -42,6 +41,7 @@
 #include "src/core/util/memory.h"
 #include "src/core/util/sync.h"
 #include "upb/mem/arena.hpp"
+#include "absl/log/log.h"
 
 namespace {
 constexpr absl::string_view kUseGrpcExperimentalAltsHandshakerKeepaliveParams =
@@ -220,13 +220,15 @@ static tsi_result handshaker_result_create_zero_copy_grpc_protector(
   VLOG(2) << "After Frame Size Negotiation, maximum frame size used by frame "
              "protector equals "
           << *max_output_protected_frame_size;
+  bool is_integrity_only =
+      (result->record_protocol == ALTS_INTEGRITY_ONLY_RECORD_PROTOCOL);
   tsi_result ok = alts_zero_copy_grpc_protector_create(
-      grpc_core::GsecKeyFactory({reinterpret_cast<uint8_t*>(result->key_data),
-                                 kAltsAes128GcmRekeyKeyLength},
-                                /*is_rekey=*/true),
-      result->is_client,
-      /*is_integrity_only=*/
-      (result->record_protocol == ALTS_INTEGRITY_ONLY_RECORD_PROTOCOL),
+      grpc_core::GsecKeyFactory(
+          {reinterpret_cast<uint8_t*>(result->key_data),
+           is_integrity_only ? kAes128GcmKeyLength
+                             : kAltsAes128GcmRekeyKeyLength},
+          !is_integrity_only),
+      result->is_client, is_integrity_only,
       /*enable_extra_copy=*/false, max_output_protected_frame_size, protector);
   if (ok != TSI_OK) {
     LOG(ERROR) << "Failed to create zero-copy grpc protector";

data/src/core/tsi/alts/handshaker/alts_tsi_utils.cc

@@ -21,10 +21,10 @@
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/grpc_check.h"
+#include "absl/log/log.h"
 
 tsi_result alts_tsi_utils_convert_to_tsi_result(grpc_status_code code) {
   switch (code) {

data/src/core/tsi/alts/handshaker/transport_security_common_api.cc

@@ -20,8 +20,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/log.h"
 #include "upb/mem/arena.hpp"
+#include "absl/log/log.h"
 
 bool grpc_gcp_rpc_protocol_versions_set_max(
     grpc_gcp_rpc_protocol_versions* versions, uint32_t max_major,

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc

@@ -22,13 +22,13 @@
 #include <grpc/support/port_platform.h>
 #include <string.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_check.h"
+#include "absl/log/log.h"
 
 // Main struct for alts_grpc_integrity_only_record_protocol.
 typedef struct alts_grpc_integrity_only_record_protocol {

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc

@@ -21,18 +21,26 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 #include "src/core/util/crash.h"
+#include "absl/log/log.h"
 
 // Privacy-integrity alts_grpc_record_protocol object uses the same struct
 // defined in alts_grpc_record_protocol_common.h.
 
 // --- alts_grpc_record_protocol methods implementation. ---
 
+static grpc_slice allocate_slice(alts_grpc_record_protocol* rp, size_t size) {
+  if (rp->alloc_cb != nullptr) {
+    return rp->alloc_cb(size, rp->alloc_user_data);
+  } else {
+    return GRPC_SLICE_MALLOC(size);
+  }
+}
+
 static tsi_result alts_grpc_privacy_integrity_protect(
     alts_grpc_record_protocol* rp, grpc_slice_buffer* unprotected_slices,
     grpc_slice_buffer* protected_slices) {
@@ -48,7 +56,7 @@ static tsi_result alts_grpc_privacy_integrity_protect(
   size_t protected_frame_size =
       unprotected_slices->length + rp->header_length +
       alts_iovec_record_protocol_get_tag_length(rp->iovec_rp);
-  grpc_slice protected_slice = GRPC_SLICE_MALLOC(protected_frame_size);
+  grpc_slice protected_slice = allocate_slice(rp, protected_frame_size);
   iovec_t protected_iovec = {GRPC_SLICE_START_PTR(protected_slice),
                              GRPC_SLICE_LENGTH(protected_slice)};
   // Calls alts_iovec_record_protocol protect.
@@ -88,7 +96,7 @@ static tsi_result alts_grpc_privacy_integrity_unprotect(
   }
   size_t unprotected_frame_size =
       protected_slices->length - rp->header_length - rp->tag_length;
-  grpc_slice unprotected_slice = GRPC_SLICE_MALLOC(unprotected_frame_size);
+  grpc_slice unprotected_slice = allocate_slice(rp, unprotected_frame_size);
   iovec_t unprotected_iovec = {GRPC_SLICE_START_PTR(unprotected_slice),
                                GRPC_SLICE_LENGTH(unprotected_slice)};
   // Strips frame header from protected slices.

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h

@@ -22,6 +22,7 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 
+#include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
 
 ///
@@ -86,4 +87,13 @@ size_t alts_grpc_record_protocol_max_unprotected_data_size(
 ///
 void alts_grpc_record_protocol_destroy(alts_grpc_record_protocol* self);
 
+///
+/// This method sets the allocation callback for the alts_grpc_record_protocol
+/// instance.
+///
+void alts_grpc_record_protocol_set_allocation_callback(
+    alts_grpc_record_protocol* self,
+    tsi_zero_copy_grpc_protector_allocator_cb allocator_cb,
+    void* allocator_user_data);
+
 #endif  // GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_RECORD_PROTOCOL_H

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc

@@ -22,12 +22,12 @@
 #include <grpc/support/port_platform.h>
 #include <string.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/useful.h"
+#include "absl/log/log.h"
 
 const size_t kInitialIovecBufferSize = 8;
 
@@ -173,3 +173,11 @@ size_t alts_grpc_record_protocol_max_unprotected_data_size(
   return alts_iovec_record_protocol_max_unprotected_data_size(
       self->iovec_rp, max_protected_frame_size);
 }
+
+void alts_grpc_record_protocol_set_allocation_callback(
+    alts_grpc_record_protocol* self,
+    tsi_zero_copy_grpc_protector_allocator_cb allocator_cb, void* user_data) {
+  if (self == nullptr) return;
+  self->alloc_cb = allocator_cb;
+  self->alloc_user_data = user_data;
+}

data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h

@@ -29,6 +29,7 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
+#include "src/core/tsi/transport_security_grpc.h"
 
 // V-table for alts_grpc_record_protocol implementations.
 struct alts_grpc_record_protocol_vtable {
@@ -53,6 +54,8 @@ struct alts_grpc_record_protocol {
   size_t tag_length;
   iovec_t* iovec_buf;
   size_t iovec_buf_length;
+  tsi_zero_copy_grpc_protector_allocator_cb alloc_cb;
+  void* alloc_user_data;
 };
 
 ///

data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc

@@ -25,7 +25,6 @@
 #include <memory>
 #include <utility>
 
-#include "absl/log/log.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
@@ -33,6 +32,7 @@
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/util/grpc_check.h"
+#include "absl/log/log.h"
 
 constexpr size_t kMinFrameLength = 1024;
 constexpr size_t kDefaultFrameLength = 16 * 1024;
@@ -256,13 +256,26 @@ static bool alts_zero_copy_grpc_protector_read_frame_size(
   return read_frame_size(protected_slices, frame_size);
 }
 
+static void alts_zero_copy_grpc_protector_set_allocator(
+    tsi_zero_copy_grpc_protector* self,
+    tsi_zero_copy_grpc_protector_allocator_cb alloc_cb, void* user_data) {
+  alts_zero_copy_grpc_protector* impl =
+      reinterpret_cast<alts_zero_copy_grpc_protector*>(self);
+  // Set on both protect and unprotect protocols
+  alts_grpc_record_protocol_set_allocation_callback(impl->record_protocol,
+                                                    alloc_cb, user_data);
+  alts_grpc_record_protocol_set_allocation_callback(impl->unrecord_protocol,
+                                                    alloc_cb, user_data);
+}
+
 static const tsi_zero_copy_grpc_protector_vtable
     alts_zero_copy_grpc_protector_vtable = {
         alts_zero_copy_grpc_protector_protect,
         alts_zero_copy_grpc_protector_unprotect,
         alts_zero_copy_grpc_protector_destroy,
         alts_zero_copy_grpc_protector_max_frame_size,
-        alts_zero_copy_grpc_protector_read_frame_size};
+        alts_zero_copy_grpc_protector_read_frame_size,
+        alts_zero_copy_grpc_protector_set_allocator};
 
 tsi_result alts_zero_copy_grpc_protector_create(
     const grpc_core::GsecKeyFactoryInterface& key_factory, bool is_client,

data/src/core/tsi/fake_transport_security.cc

@@ -23,13 +23,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/memory.h"
+#include "absl/log/log.h"
 
 // --- Constants. ---
 #define TSI_FAKE_FRAME_HEADER_SIZE 4
@@ -543,6 +543,7 @@ static const tsi_zero_copy_grpc_protector_vtable
         fake_zero_copy_grpc_protector_destroy,
         fake_zero_copy_grpc_protector_max_frame_size,
         fake_zero_copy_grpc_protector_read_frame_size,
+        nullptr /* set_allocator */
 };
 
 // --- tsi_handshaker_result methods implementation. ---

data/src/core/tsi/local_transport_security.cc

@@ -25,10 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/util/crash.h"
+#include "absl/log/log.h"
 
 namespace {
 

data/src/core/tsi/ssl/key_logging/ssl_key_logging.cc

@@ -18,12 +18,12 @@
 
 #include <map>
 
-#include "absl/log/log.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/sync.h"
+#include "absl/log/log.h"
 
 using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger;
 

data/src/core/tsi/ssl/key_logging/ssl_key_logging.h

@@ -24,10 +24,10 @@
 #include <iostream>
 #include <map>
 
-#include "absl/base/thread_annotations.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
+#include "absl/base/thread_annotations.h"
 
 namespace tsi {
 

data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc

@@ -21,12 +21,12 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
-#include "absl/log/log.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_check.h"
 #include "src/core/util/sync.h"
+#include "absl/log/log.h"
 
 namespace tsi {
 

data/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc

@@ -23,8 +23,8 @@
 
 #ifndef OPENSSL_IS_BORINGSSL
 
-#include "absl/memory/memory.h"
 #include "src/core/lib/slice/slice.h"
+#include "absl/memory/memory.h"
 
 // OpenSSL invalidates SSL_SESSION on SSL destruction making it pointless
 // to cache sessions. The workaround is to serialize (relatively expensive)

data/src/core/tsi/ssl_transport_security.cc

@@ -53,12 +53,6 @@
 #include <optional>
 #include <string>
 
-#include "absl/log/log.h"
-#include "absl/strings/match.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_split.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/tls/grpc_tls_crl_provider.h"
 #include "src/core/credentials/transport/tls/ssl_utils.h"
 #include "src/core/lib/surface/init.h"
@@ -74,6 +68,12 @@
 #include "src/core/util/match.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/useful.h"
+#include "absl/log/log.h"
+#include "absl/strings/match.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_split.h"
+#include "absl/strings/string_view.h"
 
 // Name of the environment variable controlling OpenSSL cleanup timeout.
 // This variable allows users to specify the timeout (in seconds) for OpenSSL

data/src/core/tsi/ssl_transport_security.h

@@ -26,11 +26,11 @@
 
 #include <memory>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/tls/spiffe_utils.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/ssl_transport_security_utils.h"
 #include "src/core/tsi/transport_security_interface.h"
+#include "absl/strings/string_view.h"
 
 // Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for X509 certs.
 #define TSI_X509_CERTIFICATE_TYPE "X509"

data/src/core/tsi/ssl_transport_security_utils.cc

@@ -30,11 +30,11 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
+#include "src/core/tsi/transport_security_interface.h"
+#include "src/core/util/grpc_check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "src/core/tsi/transport_security_interface.h"
-#include "src/core/util/grpc_check.h"
 
 namespace grpc_core {