Skip to content

Commit 2939571

Browse files
yashyktpaulosjca
authored andcommitted
[deps] Update absl to 20250512.1 (grpc#39571)
Update absl dependency to https://github.com/abseil/abseil-cpp/releases/tag/20250512.1 As part of this upgrade, remove gRPC's usage of internal absl helper functions. A similar fix is needed for OpenCensus-Cpp, but since that repo is archived, I am choosing to add in a patch. The aim is to delete our OpenCensus plugin so that we don't have to maintain this forever as per grpc/proposal#496. Closes grpc#39571 PiperOrigin-RevId: 777770232
1 parent ce375c5 commit 2939571

File tree

27 files changed

+337
-195
lines changed

27 files changed

+337
-195
lines changed

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2816,8 +2816,8 @@ grpc_cc_library(
28162816
],
28172817
external_deps = [
28182818
"absl/base:core_headers",
2819-
"absl/base:endian",
28202819
"absl/log:check",
2820+
"absl/numeric:bits",
28212821
"absl/status",
28222822
"absl/status:statusor",
28232823
"absl/strings",

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ module(
2222
# Regular dependencies
2323
# ====================
2424

25-
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "com_google_absl")
25+
bazel_dep(name = "abseil-cpp", version = "20250512.1", repo_name = "com_google_absl")
2626
bazel_dep(name = "apple_support", version = "1.17.1", repo_name = "build_bazel_apple_support")
2727
bazel_dep(name = "bazel_skylib", version = "1.7.1")
2828
bazel_dep(name = "boringssl", version = "0.20241024.0") # mistmatched 20241211
2929
bazel_dep(name = "c-ares", version = "1.19.1", repo_name = "com_github_cares_cares")
3030
bazel_dep(name = "envoy_api", version = "0.0.0-20250128-4de3c74")
3131
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
3232
bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
33-
bazel_dep(name = "opencensus-cpp", version = "0.0.0-20230502-50eb5de", repo_name = "io_opencensus_cpp")
33+
bazel_dep(name = "opencensus-cpp", version = "0.0.0-20230502-50eb5de.bcr.2", repo_name = "io_opencensus_cpp")
3434
bazel_dep(name = "openssl", version = "3.3.1.bcr.1")
3535
bazel_dep(name = "opentelemetry-cpp", version = "1.19.0", repo_name = "io_opentelemetry_cpp")
3636
bazel_dep(name = "platforms", version = "0.0.10")

Makefile

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/grpc_deps.bzl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ def grpc_deps():
151151
if "com_google_absl" not in native.existing_rules():
152152
http_archive(
153153
name = "com_google_absl",
154-
sha256 = "b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811",
155-
strip_prefix = "abseil-cpp-20250127.1",
154+
sha256 = "9b7a064305e9fd94d124ffa6cc358592eb42b5da588fb4e07d09254aa40086db",
155+
strip_prefix = "abseil-cpp-20250512.1",
156156
urls = [
157-
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/releases/download/20250127.1/abseil-cpp-20250127.1.tar.gz",
158-
"https://github.com/abseil/abseil-cpp/releases/download/20250127.1/abseil-cpp-20250127.1.tar.gz",
157+
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/refs/tags/20250512.1.tar.gz",
158+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20250512.1.tar.gz",
159159
],
160160
repo_mapping = {
161161
"@googletest": "@com_google_googletest",
@@ -204,6 +204,10 @@ def grpc_deps():
204204
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/5501a1a255805e0be83a41348bb5f2630d5ed6b3.tar.gz",
205205
"https://github.com/census-instrumentation/opencensus-cpp/archive/5501a1a255805e0be83a41348bb5f2630d5ed6b3.tar.gz",
206206
],
207+
patches = [
208+
"@com_github_grpc_grpc//third_party:opencensus-cpp.patch",
209+
],
210+
patch_args = ["-p1"],
207211
)
208212

209213
if "envoy_api" not in native.existing_rules():

build_handwritten.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ configs:
127127
CXX: clang++
128128
DEFINES: NDEBUG GRPC_UBSAN
129129
LD: clang++
130-
LDFLAGS: -stdlib=libc++ -fsanitize=undefined,unsigned-integer-overflow
130+
LDFLAGS: -stdlib=libc++ -fsanitize=undefined
131131
LDXX: clang++
132132
compile_the_world: true
133133
test_environ:

config.m4

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.w32

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gRPC-C++.podspec

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gRPC-Core.podspec

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)