Merge branch 'prepare-for-v3.0.0' into v3_otel_v1_24

Author: scotthart

MODULE.bazel

@@ -30,23 +30,19 @@ bazel_dep(name = "abseil-cpp", version = "20250814.1")
 # a native repository we cannot override.
 # See https://github.com/googleapis/google-cloud-cpp/issues/15393
 bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
-bazel_dep(name = "boringssl", version = "0.20241024.0")
-bazel_dep(name = "nlohmann_json", version = "3.11.3")
+bazel_dep(name = "boringssl", version = "0.20251124.0")
+bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
 bazel_dep(name = "curl", version = "8.8.0.bcr.3")
 bazel_dep(name = "opentelemetry-cpp", version = "1.24.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_python", version = "1.6.3")
 bazel_dep(name = "rules_apple", version = "4.3.2")
-bazel_dep(name = "googletest", version = "1.17.0")
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
 
 bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_google_benchmark")
 bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp")
 bazel_dep(name = "pugixml", version = "1.15", dev_dependency = True, repo_name = "com_github_zeux_pugixml")
 
-# Our `curl.BUILD` file uses these.
-bazel_dep(name = "zlib", version = "1.3.1.bcr.7")
-bazel_dep(name = "c-ares", version = "1.34.5.bcr.2", repo_name = "com_github_cares_cares")
-
 # Pin this to fix a break in bazel/deps-cache.py
 bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.2", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate")
 

ci/cloudbuild/builds/checkers.sh

@@ -94,19 +94,6 @@ time {
     xargs -r -P "$(nproc)" -n 50 -0 awk -f "ci/check-include-guards.gawk"
 }
 
-# TODO(#4501) - this fixup can be removed if #include <absl/...> works
-# Apply transformations to fix errors on MSVC+x86. See the bug for a detailed
-# explanation as to why this is needed:
-#   https://github.com/googleapis/google-cloud-cpp/issues/4501
-# This should run before clang-format because it might alter the order of any
-# includes.
-printf "%-50s" "Running Abseil header fixes:" >&2
-time {
-  expressions=("-e" "'s;#include \"absl/strings/str_\(cat\|replace\|join\).h\";#include \"google/cloud/internal/absl_str_\1_quiet.h\";'")
-  (git grep -zEl '#include "absl/strings/str_(cat|replace|join).h"' -- '*.h' '*.cc' ':!google/cloud/internal/absl_str_*quiet.h' || true) |
-    xargs -r -P "$(nproc)" -n 50 -0 bash -c "sed_edit ${expressions[*]} \"\$0\" \"\$@\""
-}
-
 # Apply several transformations that cannot be enforced by clang-format:
 #     - Replace any #include for grpc++/* with grpcpp/*. The paths with grpc++
 #       are obsoleted by the gRPC team, so we should not use them in our code.

ci/cloudbuild/builds/lib/quickstart.sh

@@ -89,12 +89,16 @@ function quickstart::build_one_quickstart() {
 #   quickstart::build_cmake_and_make "/usr/local"
 #   quickstart::run_cmake_and_make "/usr/local"
 function quickstart::run_cmake_and_make() {
+  io::run ulimit -c unlimited
+  io::run ulimit -a
   local prefix="$1"
   for lib in $(quickstart::libraries); do
     io::log_h2 "Running quickstart: ${lib}"
     mapfile -t run_args < <(quickstart::arguments "${lib}")
     quickstart::run_one_quickstart "${prefix}" "${lib}" "${run_args[@]}"
   done
+
+  io::run find . -name '*core*'
 }
 
 function quickstart::run_gcs_grpc_quickstart() {
@@ -104,7 +108,12 @@ function quickstart::run_gcs_grpc_quickstart() {
 
   io::log "[ CMake ]"
   local cmake_bin_dir="${PROJECT_ROOT}/cmake-out/quickstart/cmake-storage_grpc"
-  "${cmake_bin_dir}/quickstart_grpc" "${run_args[@]}"
+
+  if command -v /usr/bin/valgrind >/dev/null 2>&1; then
+    io::run valgrind --leak-check=full "${cmake_bin_dir}/quickstart_grpc" "${run_args[@]}"
+  else
+    io::run env MALLOC_CHECK_=3 "${cmake_bin_dir}/quickstart_grpc" "${run_args[@]}"
+  fi
 
   #  echo
   #  io::log "[ Make ]"

generator/generator.cc

@@ -17,10 +17,10 @@
 #include "generator/internal/descriptor_utils.h"
 #include "generator/internal/generator_interface.h"
 #include "generator/internal/make_generators.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/filesystem.h"
 #include "google/cloud/status_or.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "google/api/client.pb.h"
 #include <future>

generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc

@@ -17,8 +17,9 @@
 // source: generator/integration_tests/test_deprecated.proto
 
 #include "generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
 #include "google/cloud/grpc_options.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/api_client_header.h"
 #include "google/cloud/internal/url_encode.h"
 #include "google/cloud/status_or.h"

generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc

@@ -17,8 +17,8 @@
 // source: generator/integration_tests/test_deprecated.proto
 
 #include "generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/api_client_header.h"
 #include "google/cloud/internal/rest_set_metadata.h"
 #include "google/cloud/status_or.h"

generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc

@@ -17,8 +17,8 @@
 // source: generator/integration_tests/test_deprecated.proto
 
 #include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h"
+#include "absl/strings/str_cat.h"
 #include "google/cloud/common_options.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/rest_stub_helpers.h"
 #include "google/cloud/status_or.h"
 #include "generator/integration_tests/test_deprecated.pb.h"

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc

@@ -17,9 +17,9 @@
 // source: generator/integration_tests/test.proto
 
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
 #include "google/cloud/grpc_options.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
-#include "google/cloud/internal/absl_str_join_quiet.h"
 #include "google/cloud/internal/api_client_header.h"
 #include "google/cloud/internal/routing_matcher.h"
 #include "google/cloud/internal/url_encode.h"

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc

@@ -17,8 +17,8 @@
 // source: generator/integration_tests/test.proto
 
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/api_client_header.h"
 #include "google/cloud/internal/rest_set_metadata.h"
 #include "google/cloud/internal/routing_matcher.h"

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc

@@ -17,8 +17,8 @@
 // source: generator/integration_tests/test.proto
 
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h"
+#include "absl/strings/str_cat.h"
 #include "google/cloud/common_options.h"
-#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/rest_stub_helpers.h"
 #include "google/cloud/status_or.h"
 #include "generator/integration_tests/test.pb.h"