Skip to content

Commit f9c9ce9

Browse files
committed
Remove abseil optionality
1 parent 27c5f69 commit f9c9ce9

File tree

2 files changed

+10
-33
lines changed

2 files changed

+10
-33
lines changed

api/BUILD

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
4+
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
55

66
package(default_visibility = ["//visibility:public"])
77

8-
bool_flag(
9-
name = "with_abseil",
10-
build_setting_default = False,
11-
)
12-
138
CPP_STDLIBS = [
149
"none",
1510
"best",
@@ -28,10 +23,7 @@ string_flag(
2823
cc_library(
2924
name = "api",
3025
hdrs = glob(["include/**/*.h"]),
31-
defines = select({
32-
":with_external_abseil": ["HAVE_ABSEIL"],
33-
"//conditions:default": [],
34-
}) + select({
26+
defines = ["HAVE_ABSEIL"] + select({
3527
":set_cxx_stdlib_none": [],
3628
### automatic selection
3729
":set_cxx_stdlib_best": ["OPENTELEMETRY_STL_VERSION=(__cplusplus/100)"],
@@ -46,19 +38,11 @@ cc_library(
4638
}),
4739
strip_include_prefix = "include",
4840
tags = ["api"],
49-
deps = select({
50-
":with_external_abseil": [
51-
"@com_google_absl//absl/base",
52-
"@com_google_absl//absl/strings",
53-
"@com_google_absl//absl/types:variant",
54-
],
55-
"//conditions:default": [],
56-
}),
57-
)
58-
59-
config_setting(
60-
name = "with_external_abseil",
61-
flag_values = {":with_abseil": "true"},
41+
deps = [
42+
"@com_google_absl//absl/base",
43+
"@com_google_absl//absl/strings",
44+
"@com_google_absl//absl/types:variant",
45+
],
6246
)
6347

6448
[config_setting(

bazel/repository.bzl

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,12 @@ def opentelemetry_cpp_deps():
5555

5656
# Load abseil dependency(optional)
5757
maybe(
58-
#
59-
# Important note:
60-
#
61-
# The bazel build still uses abseil-cpp-20220623.1 here.
62-
#
63-
# Upgrading to abseil-cpp-20240116.1 breaks the OTLP build, reason unknown.
64-
#
6558
http_archive,
6659
name = "com_google_absl",
67-
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
68-
strip_prefix = "abseil-cpp-20220623.1",
60+
sha256 = "3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a",
61+
strip_prefix = "abseil-cpp-20240116.1",
6962
urls = [
70-
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
63+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20240116.1.tar.gz",
7164
],
7265
)
7366

0 commit comments

Comments
 (0)