From 714640d71f07d415a14aab2c68e8f37d74c644aa Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 25 Jan 2024 20:10:45 -0800 Subject: [PATCH] [Deps] Upgrade Abseil to 2024-01-16 (#35589) Closes #35589 PiperOrigin-RevId: 601647295 --- CMakeLists.txt | 4 + Makefile | 5 +- bazel/grpc_deps.bzl | 8 +- config.m4 | 6 +- config.w32 | 6 +- gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- grpc.gemspec | 17 ++- package.xml | 17 ++- src/abseil-cpp/preprocessed_builds.yaml | 128 ++++++++++++++++-- src/python/grpcio/grpc_core_dependencies.py | 5 +- .../observability_lib_deps.py | 5 +- templates/gRPC-C++.podspec.template | 2 +- templates/gRPC-Core.podspec.template | 2 +- third_party/abseil-cpp | 2 +- .../python/grpcio_tools/protoc_lib_deps.py | 6 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 17 files changed, 159 insertions(+), 60 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43f54c32be8..0dac2146cae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,7 @@ set(gRPC_ABSL_USED_TARGETS absl_base_internal absl_bind_front absl_bits + absl_charset absl_city absl_civil_time absl_cleanup @@ -151,6 +152,7 @@ set(gRPC_ABSL_USED_TARGETS absl_flat_hash_set absl_function_ref absl_graphcycles_internal + absl_has_ostream_operator absl_hash absl_hash_function_defaults absl_hash_policy_traits @@ -165,8 +167,10 @@ set(gRPC_ABSL_USED_TARGETS absl_low_level_hash absl_malloc_internal absl_memory + absl_no_destructor absl_non_temporal_arm_intrinsics absl_non_temporal_memcpy + absl_nullability absl_numeric_representation absl_optional absl_prefetch diff --git a/Makefile b/Makefile index c4a814cd147..72e033a07b4 100644 --- a/Makefile +++ b/Makefile @@ -3274,7 +3274,7 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/crc/internal/crc.cc \ third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc \ third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc \ - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc \ + third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc \ third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \ third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \ third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \ @@ -3284,7 +3284,6 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/debugging/stacktrace.cc \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ third_party/abseil-cpp/absl/flags/commandlineflag.cc \ - third_party/abseil-cpp/absl/flags/flag.cc \ third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc \ third_party/abseil-cpp/absl/flags/internal/flag.cc \ third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc \ @@ -3308,6 +3307,7 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/random/internal/seed_material.cc \ third_party/abseil-cpp/absl/random/seed_gen_exception.cc \ third_party/abseil-cpp/absl/random/seed_sequences.cc \ + third_party/abseil-cpp/absl/status/internal/status_internal.cc \ third_party/abseil-cpp/absl/status/status.cc \ third_party/abseil-cpp/absl/status/status_payload_printer.cc \ third_party/abseil-cpp/absl/status/statusor.cc \ @@ -3325,7 +3325,6 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc \ - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_info.cc \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index b40fc28efb6..6fda89920bc 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -348,11 +348,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5", - strip_prefix = "abseil-cpp-20230802.0", + sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440", + strip_prefix = "abseil-cpp-20240116.0", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz", ], ) diff --git a/config.m4 b/config.m4 index d043053e786..1538009a4f4 100644 --- a/config.m4 +++ b/config.m4 @@ -913,7 +913,7 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/crc/internal/crc.cc \ third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc \ third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc \ - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc \ + third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc \ third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \ third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \ third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \ @@ -923,7 +923,6 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/debugging/stacktrace.cc \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ third_party/abseil-cpp/absl/flags/commandlineflag.cc \ - third_party/abseil-cpp/absl/flags/flag.cc \ third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc \ third_party/abseil-cpp/absl/flags/internal/flag.cc \ third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc \ @@ -947,6 +946,7 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/random/internal/seed_material.cc \ third_party/abseil-cpp/absl/random/seed_gen_exception.cc \ third_party/abseil-cpp/absl/random/seed_sequences.cc \ + third_party/abseil-cpp/absl/status/internal/status_internal.cc \ third_party/abseil-cpp/absl/status/status.cc \ third_party/abseil-cpp/absl/status/status_payload_printer.cc \ third_party/abseil-cpp/absl/status/statusor.cc \ @@ -964,7 +964,6 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc \ - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_info.cc \ @@ -1598,6 +1597,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/random) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/random/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/status) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/status/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings/internal/str_format) diff --git a/config.w32 b/config.w32 index 03b9e633d4d..95fb787dae8 100644 --- a/config.w32 +++ b/config.w32 @@ -878,7 +878,7 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\crc\\internal\\crc.cc " + "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_cord_state.cc " + "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_memcpy_fallback.cc " + - "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_memcpy_x86_64.cc " + + "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_memcpy_x86_arm_combined.cc " + "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_non_temporal_memcpy.cc " + "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_x86_arm_combined.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\address_is_readable.cc " + @@ -888,7 +888,6 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\debugging\\stacktrace.cc " + "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " + "third_party\\abseil-cpp\\absl\\flags\\commandlineflag.cc " + - "third_party\\abseil-cpp\\absl\\flags\\flag.cc " + "third_party\\abseil-cpp\\absl\\flags\\internal\\commandlineflag.cc " + "third_party\\abseil-cpp\\absl\\flags\\internal\\flag.cc " + "third_party\\abseil-cpp\\absl\\flags\\internal\\private_handle_accessor.cc " + @@ -912,6 +911,7 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\random\\internal\\seed_material.cc " + "third_party\\abseil-cpp\\absl\\random\\seed_gen_exception.cc " + "third_party\\abseil-cpp\\absl\\random\\seed_sequences.cc " + + "third_party\\abseil-cpp\\absl\\status\\internal\\status_internal.cc " + "third_party\\abseil-cpp\\absl\\status\\status.cc " + "third_party\\abseil-cpp\\absl\\status\\status_payload_printer.cc " + "third_party\\abseil-cpp\\absl\\status\\statusor.cc " + @@ -929,7 +929,6 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree_reader.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_consume.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_crc.cc " + - "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_ring.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_functions.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_handle.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_info.cc " + @@ -1746,6 +1745,7 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\random"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\random\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\status"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\status\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings\\internal\\str_format"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 45f76a4aeaf..8ab2a1a20c2 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -225,7 +225,7 @@ Pod::Spec.new do |s| ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20230802.0' + abseil_version = '1.20240116.0' ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index d6da8ac9ee0..ac3da939cf7 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '1.20230802.0' + abseil_version = '1.20240116.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/grpc.gemspec b/grpc.gemspec index a63803a061e..aa1b6dd3af9 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -2020,8 +2020,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_alloc.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h ) + s.files += %w( third_party/abseil-cpp/absl/base/internal/nullability_impl.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/per_thread_tls.h ) - s.files += %w( third_party/abseil-cpp/absl/base/internal/prefetch.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/raw_logging.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/raw_logging.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/scheduling_mode.h ) @@ -2037,7 +2037,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/internal/strerror.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/sysinfo.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/sysinfo.h ) - s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_annotations.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_identity.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_identity.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/throw_delegate.cc ) @@ -2050,6 +2049,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/log_severity.cc ) s.files += %w( third_party/abseil-cpp/absl/base/log_severity.h ) s.files += %w( third_party/abseil-cpp/absl/base/macros.h ) + s.files += %w( third_party/abseil-cpp/absl/base/no_destructor.h ) + s.files += %w( third_party/abseil-cpp/absl/base/nullability.h ) s.files += %w( third_party/abseil-cpp/absl/base/optimization.h ) s.files += %w( third_party/abseil-cpp/absl/base/options.h ) s.files += %w( third_party/abseil-cpp/absl/base/policy_checks.h ) @@ -2091,7 +2092,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_internal.h ) s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy.h ) s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc ) - s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc ) + s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc ) s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc ) s.files += %w( third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc ) s.files += %w( third_party/abseil-cpp/absl/crc/internal/non_temporal_arm_intrinsics.h ) @@ -2128,13 +2129,11 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/flags/commandlineflag.h ) s.files += %w( third_party/abseil-cpp/absl/flags/config.h ) s.files += %w( third_party/abseil-cpp/absl/flags/declare.h ) - s.files += %w( third_party/abseil-cpp/absl/flags/flag.cc ) s.files += %w( third_party/abseil-cpp/absl/flags/flag.h ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/commandlineflag.h ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/flag.cc ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/flag.h ) - s.files += %w( third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/path_util.h ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc ) s.files += %w( third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h ) @@ -2219,6 +2218,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/random/uniform_int_distribution.h ) s.files += %w( third_party/abseil-cpp/absl/random/uniform_real_distribution.h ) s.files += %w( third_party/abseil-cpp/absl/random/zipf_distribution.h ) + s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.cc ) s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.h ) s.files += %w( third_party/abseil-cpp/absl/status/internal/statusor_internal.h ) s.files += %w( third_party/abseil-cpp/absl/status/status.cc ) @@ -2231,6 +2231,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/ascii.h ) s.files += %w( third_party/abseil-cpp/absl/strings/charconv.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/charconv.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/charset.h ) s.files += %w( third_party/abseil-cpp/absl/strings/cord.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/cord.h ) s.files += %w( third_party/abseil-cpp/absl/strings/cord_analysis.cc ) @@ -2239,7 +2240,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/cord_buffer.h ) s.files += %w( third_party/abseil-cpp/absl/strings/escaping.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/escaping.h ) - s.files += %w( third_party/abseil-cpp/absl/strings/internal/char_map.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/has_absl_stringify.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/has_ostream_operator.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc ) @@ -2258,9 +2260,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h ) - s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc ) - s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h ) - s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_functions.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc ) diff --git a/package.xml b/package.xml index b04db6f2ed5..9b52cdd1430 100644 --- a/package.xml +++ b/package.xml @@ -2024,8 +2024,8 @@ + - @@ -2041,7 +2041,6 @@ - @@ -2054,6 +2053,8 @@ + + @@ -2095,7 +2096,7 @@ - + @@ -2132,13 +2133,11 @@ - - @@ -2223,6 +2222,7 @@ + @@ -2235,6 +2235,7 @@ + @@ -2243,7 +2244,8 @@ - + + @@ -2262,9 +2264,6 @@ - - - diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml index d9354f889d5..6250c0fa12d 100644 --- a/src/abseil-cpp/preprocessed_builds.yaml +++ b/src/abseil-cpp/preprocessed_builds.yaml @@ -9,6 +9,7 @@ deps: - absl/algorithm:algorithm - absl/base:core_headers + - absl/base:nullability - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/algorithm/container.h @@ -31,6 +32,7 @@ - absl/base:cycleclock_internal - absl/base:dynamic_annotations - absl/base:log_severity + - absl/base:nullability - absl/base:raw_logging_internal - absl/base:spinlock_wait - absl/meta:type_traits @@ -78,7 +80,6 @@ headers: - third_party/abseil-cpp/absl/base/attributes.h - third_party/abseil-cpp/absl/base/const_init.h - - third_party/abseil-cpp/absl/base/internal/thread_annotations.h - third_party/abseil-cpp/absl/base/macros.h - third_party/abseil-cpp/absl/base/optimization.h - third_party/abseil-cpp/absl/base/port.h @@ -108,6 +109,7 @@ - absl/base:base - absl/base:config - absl/base:core_headers + - absl/base:nullability headers: - third_party/abseil-cpp/absl/base/internal/endian.h - third_party/abseil-cpp/absl/base/internal/unaligned_access.h @@ -150,6 +152,13 @@ name: absl/base:malloc_internal src: - third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc +- cmake_target: absl::no_destructor + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/base/no_destructor.h + name: absl/base:no_destructor + src: [] - cmake_target: absl::nullability deps: - absl/base:core_headers @@ -164,7 +173,6 @@ - absl/base:config - absl/base:core_headers headers: - - third_party/abseil-cpp/absl/base/internal/prefetch.h - third_party/abseil-cpp/absl/base/prefetch.h name: absl/base:prefetch src: [] @@ -394,6 +402,7 @@ src: [] - cmake_target: absl::inlined_vector_internal deps: + - absl/base:config - absl/base:core_headers - absl/container:compressed_tuple - absl/memory:memory @@ -407,6 +416,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/debugging:demangle_internal - absl/meta:type_traits - absl/strings:strings - absl/types:span @@ -449,6 +459,8 @@ src: [] - cmake_target: absl::raw_hash_map deps: + - absl/base:config + - absl/base:core_headers - absl/base:throw_delegate - absl/container:container_memory - absl/container:raw_hash_set @@ -493,7 +505,6 @@ deps: - absl/base:config - absl/base:core_headers - - absl/base:dynamic_annotations - absl/base:endian - absl/base:prefetch - absl/crc:cpu_detect @@ -510,7 +521,7 @@ src: - third_party/abseil-cpp/absl/crc/crc32c.cc - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc - - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc + - third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc - third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc - cmake_target: absl::crc_cord_state deps: @@ -525,10 +536,8 @@ - third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc - cmake_target: absl::crc_internal deps: - - absl/base:base - absl/base:config - absl/base:core_headers - - absl/base:dynamic_annotations - absl/base:endian - absl/base:prefetch - absl/base:raw_logging_internal @@ -710,10 +719,8 @@ headers: - third_party/abseil-cpp/absl/flags/declare.h - third_party/abseil-cpp/absl/flags/flag.h - - third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc name: absl/flags:flag - src: - - third_party/abseil-cpp/absl/flags/flag.cc + src: [] - cmake_target: absl::flags_internal deps: - absl/base:base @@ -808,6 +815,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/base:no_destructor - absl/container:flat_hash_map - absl/flags:commandlineflag - absl/flags:commandlineflag_internal @@ -838,7 +846,6 @@ deps: - absl/base:config - absl/base:core_headers - - absl/container:flat_hash_map - absl/flags:commandlineflag - absl/flags:config - absl/flags:flag @@ -848,6 +855,7 @@ - absl/flags:program_name - absl/flags:reflection - absl/strings:strings + - absl/synchronization:synchronization headers: - third_party/abseil-cpp/absl/flags/internal/usage.h name: absl/flags:usage_internal @@ -887,6 +895,14 @@ - third_party/abseil-cpp/absl/functional/internal/function_ref.h name: absl/functional:function_ref src: [] +- cmake_target: absl::overload + deps: + - absl/base:config + - absl/meta:type_traits + headers: + - third_party/abseil-cpp/absl/functional/overload.h + name: absl/functional:overload + src: [] - cmake_target: absl::city deps: - absl/base:config @@ -989,6 +1005,15 @@ - third_party/abseil-cpp/absl/log/internal/flags.h name: absl/log/internal:flags src: [] +- cmake_target: absl::log_internal_fnmatch + deps: + - absl/base:config + - absl/strings:strings + headers: + - third_party/abseil-cpp/absl/log/internal/fnmatch.h + name: absl/log/internal:fnmatch + src: + - third_party/abseil-cpp/absl/log/internal/fnmatch.cc - cmake_target: absl::log_internal_format deps: - absl/base:config @@ -1024,6 +1049,7 @@ - absl/log/internal:conditions - absl/log/internal:log_message - absl/log/internal:strip + - absl/log:absl_vlog_is_on headers: - third_party/abseil-cpp/absl/log/internal/log_impl.h name: absl/log/internal:log_impl @@ -1064,6 +1090,7 @@ - absl/base:config - absl/base:core_headers - absl/base:log_severity + - absl/base:no_destructor - absl/base:raw_logging_internal - absl/cleanup:cleanup - absl/log/internal:config @@ -1128,6 +1155,22 @@ - third_party/abseil-cpp/absl/log/internal/structured.h name: absl/log/internal:structured src: [] +- cmake_target: absl::vlog_config_internal + deps: + - absl/base:base + - absl/base:config + - absl/base:core_headers + - absl/base:no_destructor + - absl/log/internal:fnmatch + - absl/memory:memory + - absl/strings:strings + - absl/synchronization:synchronization + - absl/types:optional + headers: + - third_party/abseil-cpp/absl/log/internal/vlog_config.h + name: absl/log/internal:vlog_config + src: + - third_party/abseil-cpp/absl/log/internal/vlog_config.cc - cmake_target: absl::log_internal_voidify deps: - absl/base:config @@ -1149,6 +1192,16 @@ - third_party/abseil-cpp/absl/log/absl_log.h name: absl/log:absl_log src: [] +- cmake_target: absl::absl_vlog_is_on + deps: + - absl/base:config + - absl/base:core_headers + - absl/log/internal:vlog_config + - absl/strings:strings + headers: + - third_party/abseil-cpp/absl/log/absl_vlog_is_on.h + name: absl/log:absl_vlog_is_on + src: [] - cmake_target: absl::check deps: - absl/log/internal:check_impl @@ -1180,6 +1233,7 @@ - absl/flags:marshalling - absl/log/internal:config - absl/log/internal:flags + - absl/log/internal:vlog_config - absl/log:globals - absl/strings:strings headers: @@ -1195,6 +1249,7 @@ - absl/base:log_severity - absl/base:raw_logging_internal - absl/hash:hash + - absl/log/internal:vlog_config - absl/strings:strings headers: - third_party/abseil-cpp/absl/log/globals.h @@ -1215,6 +1270,7 @@ - cmake_target: absl::log deps: - absl/log/internal:log_impl + - absl/log:vlog_is_on headers: - third_party/abseil-cpp/absl/log/log.h name: absl/log:log @@ -1273,6 +1329,13 @@ - third_party/abseil-cpp/absl/log/structured.h name: absl/log:structured src: [] +- cmake_target: absl::vlog_is_on + deps: + - absl/log:absl_vlog_is_on + headers: + - third_party/abseil-cpp/absl/log/vlog_is_on.h + name: absl/log:vlog_is_on + src: [] - cmake_target: absl::memory deps: - absl/base:core_headers @@ -1648,32 +1711,42 @@ - cmake_target: absl::status deps: - absl/base:atomic_hook + - absl/base:config - absl/base:core_headers + - absl/base:no_destructor + - absl/base:nullability - absl/base:raw_logging_internal - absl/base:strerror - absl/container:inlined_vector - absl/debugging:stacktrace - absl/debugging:symbolize - absl/functional:function_ref + - absl/memory:memory - absl/strings:cord - absl/strings:str_format - absl/strings:strings - absl/types:optional + - absl/types:span headers: - third_party/abseil-cpp/absl/status/internal/status_internal.h - third_party/abseil-cpp/absl/status/status.h - third_party/abseil-cpp/absl/status/status_payload_printer.h name: absl/status:status src: + - third_party/abseil-cpp/absl/status/internal/status_internal.cc - third_party/abseil-cpp/absl/status/status.cc - third_party/abseil-cpp/absl/status/status_payload_printer.cc - cmake_target: absl::statusor deps: - absl/base:base + - absl/base:config - absl/base:core_headers + - absl/base:nullability - absl/base:raw_logging_internal - absl/meta:type_traits - absl/status:status + - absl/strings:has_ostream_operator + - absl/strings:str_format - absl/strings:strings - absl/types:variant - absl/utility:utility @@ -1683,15 +1756,24 @@ name: absl/status:statusor src: - third_party/abseil-cpp/absl/status/statusor.cc +- cmake_target: absl::charset + deps: + - absl/base:core_headers + - absl/strings:string_view + headers: + - third_party/abseil-cpp/absl/strings/charset.h + name: absl/strings:charset + src: [] - cmake_target: absl::cord deps: - absl/base:base - absl/base:config - absl/base:core_headers - absl/base:endian + - absl/base:nullability - absl/base:raw_logging_internal - - absl/container:fixed_array - absl/container:inlined_vector + - absl/crc:crc32c - absl/crc:crc_cord_state - absl/functional:function_ref - absl/meta:type_traits @@ -1741,8 +1823,6 @@ - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h - - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h - - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h name: absl/strings:cord_internal src: - third_party/abseil-cpp/absl/strings/internal/cord_internal.cc @@ -1751,7 +1831,6 @@ - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc - third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc - - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc - cmake_target: absl::cordz_functions deps: - absl/base:config @@ -1831,6 +1910,13 @@ - third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h name: absl/strings:cordz_update_tracker src: [] +- cmake_target: absl::has_ostream_operator + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/strings/has_ostream_operator.h + name: absl/strings:has_ostream_operator + src: [] - cmake_target: absl::strings_internal deps: - absl/base:config @@ -1839,7 +1925,6 @@ - absl/base:raw_logging_internal - absl/meta:type_traits headers: - - third_party/abseil-cpp/absl/strings/internal/char_map.h - third_party/abseil-cpp/absl/strings/internal/escaping.h - third_party/abseil-cpp/absl/strings/internal/ostringstream.h - third_party/abseil-cpp/absl/strings/internal/resize_uninitialized.h @@ -1851,7 +1936,12 @@ - third_party/abseil-cpp/absl/strings/internal/utf8.cc - cmake_target: absl::str_format deps: + - absl/base:config + - absl/base:core_headers + - absl/base:nullability - absl/strings:str_format_internal + - absl/strings:string_view + - absl/types:span headers: - third_party/abseil-cpp/absl/strings/str_format.h name: absl/strings:str_format @@ -1860,6 +1950,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/container:fixed_array - absl/container:inlined_vector - absl/functional:function_ref - absl/meta:type_traits @@ -1892,6 +1983,7 @@ - absl/base:base - absl/base:config - absl/base:core_headers + - absl/base:nullability - absl/base:throw_delegate headers: - third_party/abseil-cpp/absl/strings/string_view.h @@ -1904,18 +1996,21 @@ - absl/base:config - absl/base:core_headers - absl/base:endian + - absl/base:nullability - absl/base:raw_logging_internal - absl/base:throw_delegate - absl/memory:memory - absl/meta:type_traits - absl/numeric:bits - absl/numeric:int128 + - absl/strings:charset - absl/strings:internal - absl/strings:string_view headers: - third_party/abseil-cpp/absl/strings/ascii.h - third_party/abseil-cpp/absl/strings/charconv.h - third_party/abseil-cpp/absl/strings/escaping.h + - third_party/abseil-cpp/absl/strings/has_absl_stringify.h - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h - third_party/abseil-cpp/absl/strings/internal/charconv_parse.h - third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h @@ -2128,6 +2223,7 @@ - third_party/abseil-cpp/absl/types/bad_variant_access.cc - cmake_target: absl::compare deps: + - absl/base:config - absl/base:core_headers - absl/meta:type_traits headers: @@ -2139,6 +2235,7 @@ - absl/base:base_internal - absl/base:config - absl/base:core_headers + - absl/base:nullability - absl/memory:memory - absl/meta:type_traits - absl/types:bad_optional_access @@ -2152,6 +2249,7 @@ deps: - absl/algorithm:algorithm - absl/base:core_headers + - absl/base:nullability - absl/base:throw_delegate - absl/meta:type_traits headers: diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index cfbd3460c30..3f63633766f 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -877,7 +877,7 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/crc/internal/crc.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc', - 'third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc', + 'third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', @@ -887,7 +887,6 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/debugging/stacktrace.cc', 'third_party/abseil-cpp/absl/debugging/symbolize.cc', 'third_party/abseil-cpp/absl/flags/commandlineflag.cc', - 'third_party/abseil-cpp/absl/flags/flag.cc', 'third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc', 'third_party/abseil-cpp/absl/flags/internal/flag.cc', 'third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc', @@ -911,6 +910,7 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/random/internal/seed_material.cc', 'third_party/abseil-cpp/absl/random/seed_gen_exception.cc', 'third_party/abseil-cpp/absl/random/seed_sequences.cc', + 'third_party/abseil-cpp/absl/status/internal/status_internal.cc', 'third_party/abseil-cpp/absl/status/status.cc', 'third_party/abseil-cpp/absl/status/status_payload_printer.cc', 'third_party/abseil-cpp/absl/status/statusor.cc', @@ -928,7 +928,6 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc', - 'third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_info.cc', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index 8535e699759..3c8d1f09acb 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -83,7 +83,7 @@ CC_FILES = [ "third_party/abseil-cpp/absl/crc/internal/crc.cc", "third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc", "third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc", - "third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc", + "third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc", "third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc", "third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc", "third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc", @@ -93,7 +93,6 @@ CC_FILES = [ "third_party/abseil-cpp/absl/debugging/stacktrace.cc", "third_party/abseil-cpp/absl/debugging/symbolize.cc", "third_party/abseil-cpp/absl/flags/commandlineflag.cc", - "third_party/abseil-cpp/absl/flags/flag.cc", "third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc", "third_party/abseil-cpp/absl/flags/internal/flag.cc", "third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc", @@ -117,6 +116,7 @@ CC_FILES = [ "third_party/abseil-cpp/absl/random/internal/seed_material.cc", "third_party/abseil-cpp/absl/random/seed_gen_exception.cc", "third_party/abseil-cpp/absl/random/seed_sequences.cc", + "third_party/abseil-cpp/absl/status/internal/status_internal.cc", "third_party/abseil-cpp/absl/status/status.cc", "third_party/abseil-cpp/absl/status/status_payload_printer.cc", "third_party/abseil-cpp/absl/status/statusor.cc", @@ -134,7 +134,6 @@ CC_FILES = [ "third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc", "third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc", "third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc", - "third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc", "third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc", "third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc", "third_party/abseil-cpp/absl/strings/internal/cordz_info.cc", diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index e4b8bf3ecfd..2a4b559d705 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -183,7 +183,7 @@ ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20230802.0' + abseil_version = '1.20240116.0' % for abseil_spec in grpcpp_abseil_specs: ss.dependency '${abseil_spec}', abseil_version % endfor diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index a3a52d2e1b5..f32b3cd382b 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -122,7 +122,7 @@ s.requires_arc = false name = 'grpc' - abseil_version = '1.20230802.0' + abseil_version = '1.20240116.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 29bf8085f3b..4a2c63365ef 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 29bf8085f3bf17b84d30e34b3d7ff8248fda404e +Subproject commit 4a2c63365eff8823a5221db86ef490e828306f9d diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index a98ce9437d9..0ce3e73b662 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -34,7 +34,7 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/crc/internal/crc.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc', - 'third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_64.cc', + 'third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc', 'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc', 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', @@ -51,16 +51,19 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/log/initialize.cc', 'third_party/abseil-cpp/absl/log/internal/check_op.cc', 'third_party/abseil-cpp/absl/log/internal/conditions.cc', + 'third_party/abseil-cpp/absl/log/internal/fnmatch.cc', 'third_party/abseil-cpp/absl/log/internal/globals.cc', 'third_party/abseil-cpp/absl/log/internal/log_format.cc', 'third_party/abseil-cpp/absl/log/internal/log_message.cc', 'third_party/abseil-cpp/absl/log/internal/log_sink_set.cc', 'third_party/abseil-cpp/absl/log/internal/nullguard.cc', 'third_party/abseil-cpp/absl/log/internal/proto.cc', + 'third_party/abseil-cpp/absl/log/internal/vlog_config.cc', 'third_party/abseil-cpp/absl/log/log_entry.cc', 'third_party/abseil-cpp/absl/log/log_sink.cc', 'third_party/abseil-cpp/absl/numeric/int128.cc', 'third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc', + 'third_party/abseil-cpp/absl/status/internal/status_internal.cc', 'third_party/abseil-cpp/absl/status/status.cc', 'third_party/abseil-cpp/absl/status/status_payload_printer.cc', 'third_party/abseil-cpp/absl/status/statusor.cc', @@ -78,7 +81,6 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc', - 'third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_info.cc', diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 42eb98cd313..f9a313b8c70 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | sed 's/+//g' | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp 29bf8085f3bf17b84d30e34b3d7ff8248fda404e +third_party/abseil-cpp 4a2c63365eff8823a5221db86ef490e828306f9d third_party/benchmark 344117638c8ff7e239044fd0fa7085839fc03021 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel 2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b