From 876b1e7b82ef5aa2f6d333d23d6ffc72aba9343f Mon Sep 17 00:00:00 2001 From: Douglas Barker Date: Fri, 22 Aug 2025 17:47:55 -0600 Subject: [PATCH 1/2] upgrade googletest and benchmark to the latest releases --- MODULE.bazel | 4 ++-- bazel/repository.bzl | 12 ++++++------ third_party/benchmark | 2 +- third_party/googletest | 2 +- third_party_release | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index f0597b59e0..f77d68dd7c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,5 +21,5 @@ bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf" bazel_dep(name = "rules_proto", version = "5.3.0-21.7") bazel_dep(name = "zlib", version = "1.3.1.bcr.1") -bazel_dep(name = "google_benchmark", version = "1.8.3", dev_dependency = True, repo_name = "com_github_google_benchmark") -bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True, repo_name = "com_google_googletest") +bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_github_google_benchmark") +bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True, repo_name = "com_google_googletest") diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 0c4b15e091..9f94c2e8bb 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -25,10 +25,10 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_github_google_benchmark", - sha256 = "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce", - strip_prefix = "benchmark-1.8.3", + sha256 = "b334658edd35efcf06a99d9be21e4e93e092bd5f95074c1673d5c8705d95c104", + strip_prefix = "benchmark-1.9.4", urls = [ - "https://github.com/google/benchmark/archive/v1.8.3.tar.gz", + "https://github.com/google/benchmark/archive/v1.9.4.tar.gz", ], ) @@ -37,10 +37,10 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_google_googletest", - sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7", - strip_prefix = "googletest-1.14.0", + sha256 = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c", + strip_prefix = "googletest-1.17.0", urls = [ - "https://github.com/google/googletest/archive/v1.14.0.tar.gz", + "https://github.com/google/googletest/archive/v1.17.0.tar.gz", ], ) diff --git a/third_party/benchmark b/third_party/benchmark index 344117638c..eddb024138 160000 --- a/third_party/benchmark +++ b/third_party/benchmark @@ -1 +1 @@ -Subproject commit 344117638c8ff7e239044fd0fa7085839fc03021 +Subproject commit eddb0241389718a23a42db6af5f0164b6e0139af diff --git a/third_party/googletest b/third_party/googletest index f8d7d77c06..52eb8108c5 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571 +Subproject commit 52eb8108c5bdec04579160ae17225d66034bd723 diff --git a/third_party_release b/third_party_release index 93b6ce47a5..d63c7b34d9 100644 --- a/third_party_release +++ b/third_party_release @@ -19,8 +19,8 @@ zlib=v1.3.1 curl=curl-8_12_0 protobuf=v3.21.6 grpc=v1.49.2 -benchmark=v1.8.3 -googletest=v1.14.0 +benchmark=v1.9.4 +googletest=v1.17.0 ms-gsl=v3.1.0 nlohmann-json=v3.12.0 opentelemetry-proto=v1.7.0 From 7734be9fbc4b4143b9bbda9681bd0f62a8350873 Mon Sep 17 00:00:00 2001 From: Douglas Barker Date: Sat, 23 Aug 2025 13:37:27 -0600 Subject: [PATCH 2/2] roll back to googletest and benchmark versions that support c++14 --- MODULE.bazel | 4 ++-- bazel/repository.bzl | 12 ++++++------ third_party/benchmark | 2 +- third_party/googletest | 2 +- third_party_release | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index f77d68dd7c..4ffdd5f930 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,5 +21,5 @@ bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf" bazel_dep(name = "rules_proto", version = "5.3.0-21.7") bazel_dep(name = "zlib", version = "1.3.1.bcr.1") -bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_github_google_benchmark") -bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True, repo_name = "com_google_googletest") +bazel_dep(name = "google_benchmark", version = "1.9.0", dev_dependency = True, repo_name = "com_github_google_benchmark") +bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True, repo_name = "com_google_googletest") diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 9f94c2e8bb..2e139277ff 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -25,10 +25,10 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_github_google_benchmark", - sha256 = "b334658edd35efcf06a99d9be21e4e93e092bd5f95074c1673d5c8705d95c104", - strip_prefix = "benchmark-1.9.4", + sha256 = "35a77f46cc782b16fac8d3b107fbfbb37dcd645f7c28eee19f3b8e0758b48994", + strip_prefix = "benchmark-1.9.0", urls = [ - "https://github.com/google/benchmark/archive/v1.9.4.tar.gz", + "https://github.com/google/benchmark/archive/v1.9.0.tar.gz", ], ) @@ -37,10 +37,10 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_google_googletest", - sha256 = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c", - strip_prefix = "googletest-1.17.0", + sha256 = "78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399", + strip_prefix = "googletest-1.16.0", urls = [ - "https://github.com/google/googletest/archive/v1.17.0.tar.gz", + "https://github.com/google/googletest/archive/v1.16.0.tar.gz", ], ) diff --git a/third_party/benchmark b/third_party/benchmark index eddb024138..12235e2465 160000 --- a/third_party/benchmark +++ b/third_party/benchmark @@ -1 +1 @@ -Subproject commit eddb0241389718a23a42db6af5f0164b6e0139af +Subproject commit 12235e24652fc7f809373e7c11a5f73c5763fc4c diff --git a/third_party/googletest b/third_party/googletest index 52eb8108c5..6910c9d916 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit 52eb8108c5bdec04579160ae17225d66034bd723 +Subproject commit 6910c9d9165801d8827d628cb72eb7ea9dd538c5 diff --git a/third_party_release b/third_party_release index d63c7b34d9..0665ba8021 100644 --- a/third_party_release +++ b/third_party_release @@ -19,8 +19,8 @@ zlib=v1.3.1 curl=curl-8_12_0 protobuf=v3.21.6 grpc=v1.49.2 -benchmark=v1.9.4 -googletest=v1.17.0 +benchmark=v1.9.0 +googletest=v1.16.0 ms-gsl=v3.1.0 nlohmann-json=v3.12.0 opentelemetry-proto=v1.7.0