From 8acdda68c3169ed6d8aacbf8d077e528a9f6457b Mon Sep 17 00:00:00 2001 From: tanvi-jagtap Date: Wed, 13 Mar 2024 06:35:28 +0000 Subject: [PATCH] Running the build scripts --- CMakeLists.txt | 35 ++++++++++++++--- Makefile | 13 +++++++ build_autogenerated.yaml | 2 + config.m4 | 15 ++++++++ config.w32 | 15 ++++++++ gRPC-C++.podspec | 2 + gRPC-Core.podspec | 2 + grpc.gemspec | 38 ++++++++++++++++++- grpc.gyp | 2 + package.xml | 38 ++++++++++++++++++- src/objective-c/BoringSSL-GRPC.podspec | 2 +- src/python/grpcio/grpc_core_dependencies.py | 13 +++++++ .../observability_lib_deps.py | 13 +++++++ 13 files changed, 180 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb8cc07afae..ce54082fb08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,7 @@ set(gRPC_ABSL_PROVIDER "module" CACHE STRING "Provider of absl library") set_property(CACHE gRPC_ABSL_PROVIDER PROPERTY STRINGS "module" "package") set(gRPC_ABSL_USED_TARGETS + absl_absl_vlog_is_on absl_algorithm absl_algorithm_container absl_any_invocable @@ -135,6 +136,7 @@ set(gRPC_ABSL_USED_TARGETS absl_dynamic_annotations absl_endian absl_errno_saver + absl_examine_stack absl_exponential_biased absl_fast_type_id absl_fixed_array @@ -163,7 +165,26 @@ set(gRPC_ABSL_USED_TARGETS absl_int128 absl_kernel_timeout_internal absl_layout + absl_log + absl_log_entry + absl_log_globals + absl_log_internal_append_truncated + absl_log_internal_conditions + absl_log_internal_config + absl_log_internal_fnmatch + absl_log_internal_format + absl_log_internal_globals + absl_log_internal_log_impl + absl_log_internal_log_sink_set + absl_log_internal_message + absl_log_internal_nullguard + absl_log_internal_nullstream + absl_log_internal_proto + absl_log_internal_strip + absl_log_internal_voidify absl_log_severity + absl_log_sink + absl_log_sink_registry absl_low_level_hash absl_malloc_internal absl_memory @@ -221,6 +242,8 @@ set(gRPC_ABSL_USED_TARGETS absl_type_traits absl_utility absl_variant + absl_vlog_config_internal + absl_vlog_is_on absl_meta ) @@ -1713,9 +1736,11 @@ target_link_libraries(gpr ${_gRPC_ALLTARGETS_LIBRARIES} absl::base absl::core_headers + absl::log_severity absl::flags absl::flags_marshalling absl::any_invocable + absl::log absl::memory absl::random_random absl::status @@ -36302,7 +36327,7 @@ generate_pkgconfig( "gpr" "gRPC platform support library" "${gRPC_CORE_VERSION}" - "absl_any_invocable absl_base absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_memory absl_optional absl_random_random absl_status absl_str_format absl_strings absl_synchronization absl_time absl_variant" + "absl_any_invocable absl_base absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_log absl_log_severity absl_memory absl_optional absl_random_random absl_status absl_str_format absl_strings absl_synchronization absl_time absl_variant" "" "-lgpr" "" @@ -36313,7 +36338,7 @@ generate_pkgconfig( "gRPC" "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" "libcares openssl re2 zlib" "-lgrpc" "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" @@ -36324,7 +36349,7 @@ generate_pkgconfig( "gRPC unsecure" "high performance general RPC framework without SSL" "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" "libcares zlib" "-lgrpc_unsecure" "-laddress_sorting -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" @@ -36335,7 +36360,7 @@ generate_pkgconfig( "gRPC++" "C++ wrapper for gRPC" "${gRPC_CPP_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" "libcares openssl re2 zlib" "-lgrpc++" "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" @@ -36346,7 +36371,7 @@ generate_pkgconfig( "gRPC++ unsecure" "C++ wrapper for gRPC without SSL" "${gRPC_CPP_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" "libcares zlib" "-lgrpc++_unsecure" "-laddress_sorting -lutf8_range_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" diff --git a/Makefile b/Makefile index 23f195b095a..a6fb5f7ddc3 100644 --- a/Makefile +++ b/Makefile @@ -1539,6 +1539,7 @@ LIBGRPC_SRC = \ third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \ third_party/abseil-cpp/absl/debugging/internal/demangle.cc \ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \ + third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \ third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \ third_party/abseil-cpp/absl/debugging/stacktrace.cc \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ @@ -1553,6 +1554,18 @@ LIBGRPC_SRC = \ third_party/abseil-cpp/absl/hash/internal/city.cc \ third_party/abseil-cpp/absl/hash/internal/hash.cc \ third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \ + third_party/abseil-cpp/absl/log/globals.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/random/discrete_distribution.cc \ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 91e82652419..5f99c2ecbaf 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -125,9 +125,11 @@ libs: deps: - absl/base:base - absl/base:core_headers + - absl/base:log_severity - absl/flags:flag - absl/flags:marshalling - absl/functional:any_invocable + - absl/log:log - absl/memory:memory - absl/random:random - absl/status:status diff --git a/config.m4 b/config.m4 index 71180188c82..0e5da21558c 100644 --- a/config.m4 +++ b/config.m4 @@ -924,6 +924,7 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \ third_party/abseil-cpp/absl/debugging/internal/demangle.cc \ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \ + third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \ third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \ third_party/abseil-cpp/absl/debugging/stacktrace.cc \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ @@ -938,6 +939,18 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/hash/internal/city.cc \ third_party/abseil-cpp/absl/hash/internal/hash.cc \ third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \ + third_party/abseil-cpp/absl/log/globals.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/random/discrete_distribution.cc \ @@ -1600,6 +1613,8 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/flags) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/flags/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/hash/internal) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/log) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/log/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/numeric) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/profiling/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/random) diff --git a/config.w32 b/config.w32 index b9e6c920b2e..0dea3cdcccf 100644 --- a/config.w32 +++ b/config.w32 @@ -889,6 +889,7 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\debugging\\internal\\address_is_readable.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\demangle.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\elf_mem_image.cc " + + "third_party\\abseil-cpp\\absl\\debugging\\internal\\examine_stack.cc " + "third_party\\abseil-cpp\\absl\\debugging\\internal\\vdso_support.cc " + "third_party\\abseil-cpp\\absl\\debugging\\stacktrace.cc " + "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " + @@ -903,6 +904,18 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\hash\\internal\\city.cc " + "third_party\\abseil-cpp\\absl\\hash\\internal\\hash.cc " + "third_party\\abseil-cpp\\absl\\hash\\internal\\low_level_hash.cc " + + "third_party\\abseil-cpp\\absl\\log\\globals.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\\random\\discrete_distribution.cc " + @@ -1747,6 +1760,8 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\flags\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\hash"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\hash\\internal"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\log"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\log\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\numeric"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\profiling"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\profiling\\internal"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index f459d1b7b85..b8e6e3d892b 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -230,6 +230,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version + ss.dependency 'abseil/base/log_severity', abseil_version ss.dependency 'abseil/base/no_destructor', abseil_version ss.dependency 'abseil/cleanup/cleanup', abseil_version ss.dependency 'abseil/container/flat_hash_map', abseil_version @@ -241,6 +242,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/functional/bind_front', abseil_version ss.dependency 'abseil/functional/function_ref', abseil_version ss.dependency 'abseil/hash/hash', abseil_version + ss.dependency 'abseil/log/log', abseil_version ss.dependency 'abseil/memory/memory', abseil_version ss.dependency 'abseil/meta/type_traits', abseil_version ss.dependency 'abseil/random/bit_gen_ref', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index dd30ea8829c..67f256a60e3 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -200,6 +200,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version + ss.dependency 'abseil/base/log_severity', abseil_version ss.dependency 'abseil/base/no_destructor', abseil_version ss.dependency 'abseil/cleanup/cleanup', abseil_version ss.dependency 'abseil/container/flat_hash_map', abseil_version @@ -211,6 +212,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/functional/bind_front', abseil_version ss.dependency 'abseil/functional/function_ref', abseil_version ss.dependency 'abseil/hash/hash', abseil_version + ss.dependency 'abseil/log/log', abseil_version ss.dependency 'abseil/memory/memory', abseil_version ss.dependency 'abseil/meta/type_traits', abseil_version ss.dependency 'abseil/random/bit_gen_ref', abseil_version diff --git a/grpc.gemspec b/grpc.gemspec index 64b5cf62e4b..bc0ac60c64c 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -2122,6 +2122,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/examine_stack.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ) @@ -2179,6 +2181,40 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.h ) s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc ) s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.h ) + s.files += %w( third_party/abseil-cpp/absl/log/absl_vlog_is_on.h ) + s.files += %w( third_party/abseil-cpp/absl/log/globals.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/globals.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/append_truncated.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/conditions.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/conditions.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/config.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/fnmatch.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/fnmatch.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/globals.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/globals.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_format.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_format.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_impl.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_message.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_message.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_sink_set.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/log_sink_set.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/nullguard.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/nullguard.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/nullstream.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/proto.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/proto.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/strip.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/vlog_config.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/vlog_config.h ) + s.files += %w( third_party/abseil-cpp/absl/log/internal/voidify.h ) + s.files += %w( third_party/abseil-cpp/absl/log/log.h ) + s.files += %w( third_party/abseil-cpp/absl/log/log_entry.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/log_entry.h ) + s.files += %w( third_party/abseil-cpp/absl/log/log_sink.cc ) + s.files += %w( third_party/abseil-cpp/absl/log/log_sink.h ) + s.files += %w( third_party/abseil-cpp/absl/log/log_sink_registry.h ) + s.files += %w( third_party/abseil-cpp/absl/log/vlog_is_on.h ) s.files += %w( third_party/abseil-cpp/absl/memory/memory.h ) s.files += %w( third_party/abseil-cpp/absl/meta/type_traits.h ) s.files += %w( third_party/abseil-cpp/absl/numeric/bits.h ) @@ -2844,8 +2880,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pkcs12.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pkcs7.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pkcs8.h ) - s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pki/certificate.h ) - s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pki/signature_verify_cache.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/poly1305.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/pool.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/posix_time.h ) diff --git a/grpc.gyp b/grpc.gyp index df31e5f4f3b..eb70fc54080 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -194,9 +194,11 @@ 'dependencies': [ 'absl/base:base', 'absl/base:core_headers', + 'absl/base:log_severity', 'absl/flags:flag', 'absl/flags:marshalling', 'absl/functional:any_invocable', + 'absl/log:log', 'absl/memory:memory', 'absl/random:random', 'absl/status:status', diff --git a/package.xml b/package.xml index 84621351c14..9115e098079 100644 --- a/package.xml +++ b/package.xml @@ -2126,6 +2126,8 @@ + + @@ -2183,6 +2185,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2848,8 +2884,6 @@ - - diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 4103011d3bc..6502a065759 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -76,7 +76,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/google/boringssl.git', - :commit => "e14d29f68c2d1b02e06f10c83b9b8ea4d061f8df", + :commit => "ae72a4514c7afd150596b0a80947f3ca9b8363b5", } s.ios.deployment_target = '10.0' diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index f3f4a909fd5..76daef457eb 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -888,6 +888,7 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', 'third_party/abseil-cpp/absl/debugging/internal/demangle.cc', 'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc', + 'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc', 'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc', 'third_party/abseil-cpp/absl/debugging/stacktrace.cc', 'third_party/abseil-cpp/absl/debugging/symbolize.cc', @@ -902,6 +903,18 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/hash/internal/city.cc', 'third_party/abseil-cpp/absl/hash/internal/hash.cc', 'third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc', + 'third_party/abseil-cpp/absl/log/globals.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/random/discrete_distribution.cc', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index eb117797788..fe161656970 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -89,6 +89,7 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc', 'third_party/abseil-cpp/absl/debugging/internal/demangle.cc', 'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc', + 'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc', 'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc', 'third_party/abseil-cpp/absl/debugging/stacktrace.cc', 'third_party/abseil-cpp/absl/debugging/symbolize.cc', @@ -103,6 +104,18 @@ CC_FILES=[ 'third_party/abseil-cpp/absl/hash/internal/city.cc', 'third_party/abseil-cpp/absl/hash/internal/hash.cc', 'third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc', + 'third_party/abseil-cpp/absl/log/globals.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/random/discrete_distribution.cc',