merged from upstream

malkia · Jun 12, 2024 · e21ff96 · e21ff96
2 parents 21af67e + 5089105
commit e21ff96
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 54 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.2.0
+7.2.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -558,27 +558,6 @@ jobs:
     - name: run tests
       run: ./ci/do_ci.sh bazel.with_async_export.test
 
-  bazel_with_abseil:
-    name: Bazel with external abseil
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@v4
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_test
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.with_abseil
-
   bazel_valgrind:
     name: Bazel valgrind
     runs-on: ubuntu-latest

diff --git a/BUILD b/BUILD
@@ -17,7 +17,6 @@ config_setting(
     name = "with_dll_enabled",
     flag_values = {
         "with_dll": "true",
-        "//api:with_abseil": "false",
     },
     visibility = ["//visibility:public"],
 )

diff --git a/api/BUILD b/api/BUILD
@@ -1,15 +1,10 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
+load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 
 package(default_visibility = ["//visibility:public"])
 
-bool_flag(
-    name = "with_abseil",
-    build_setting_default = False,
-)
-
 CPP_STDLIBS = [
     "none",
     "best",
@@ -28,8 +23,7 @@ string_flag(
 cc_library(
     name = "api",
     hdrs = glob(["include/**/*.h"]),
-    defines = select({
-        ":with_external_abseil": ["HAVE_ABSEIL"],
+    defines = ["HAVE_ABSEIL"] + select({
         ":set_cxx_stdlib_none": [],
         ### automatic selection
         ":set_cxx_stdlib_best": ["OPENTELEMETRY_STL_VERSION=(__cplusplus/100)"],
@@ -47,19 +41,11 @@ cc_library(
     }),
     strip_include_prefix = "include",
     tags = ["api"],
-    deps = select({
-        ":with_external_abseil": [
-            "@com_google_absl//absl/base",
-            "@com_google_absl//absl/strings",
-            "@com_google_absl//absl/types:variant",
-        ],
-        "//conditions:default": [],
-    }),
-)
-
-config_setting(
-    name = "with_external_abseil",
-    flag_values = {":with_abseil": "true"},
+    deps = [
+        "@com_google_absl//absl/base",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:variant",
+    ],
 )
 
 cc_library(

diff --git a/ci/do_ci.ps1 b/ci/do_ci.ps1
@@ -10,6 +10,8 @@ $nproc = (Get-ComputerInfo).CsNumberOfLogicalProcessors
 
 $SRC_DIR = (Get-Item -Path ".\").FullName
 
+# Workaround https://github.com/bazelbuild/bazel/issues/18683
+$BAZEL_STARTUP_OPTIONS = "--output_base=C:\Out"
 $BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT"
 $BAZEL_TEST_OPTIONS = "$BAZEL_OPTIONS --test_output=errors"
 
@@ -27,7 +29,7 @@ $VCPKG_DIR = Join-Path "$SRC_DIR" "tools" "vcpkg"
 
 switch ($action) {
   "bazel.build" {
-    bazel build $BAZEL_OPTIONS --action_env=VCPKG_DIR=$VCPKG_DIR --deleted_packages=opentracing-shim -- //...
+    bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS --action_env=VCPKG_DIR=$VCPKG_DIR --deleted_packages=opentracing-shim -- //...
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -425,10 +425,6 @@ elif [[ "$1" == "cmake.install.test" ]]; then
   make -j $(nproc)
   sudo make install
   exit 0
-elif [[ "$1" == "bazel.with_abseil" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC --//api:with_abseil=true //...
-  bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS_ASYNC --//api:with_abseil=true //...
-  exit 0
 elif [[ "$1" == "cmake.test_example_plugin" ]]; then
   # Build the plugin
   cd "${BUILD_DIR}"
@@ -507,7 +503,7 @@ elif [[ "$1" == "bazel.tsan" ]]; then
   exit 0
 elif [[ "$1" == "bazel.valgrind" ]]; then
   bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC //...
-  bazel $BAZEL_STARTUP_OPTIONS test --run_under="/usr/bin/valgrind --leak-check=full --error-exitcode=1 --suppressions=\"${SRC_DIR}/ci/valgrind-suppressions\"" $BAZEL_TEST_OPTIONS_ASYNC //...
+  bazel $BAZEL_STARTUP_OPTIONS test --run_under="/usr/bin/valgrind --leak-check=full --error-exitcode=1 --errors-for-leak-kinds=definite --suppressions=\"${SRC_DIR}/ci/valgrind-suppressions\"" $BAZEL_TEST_OPTIONS_ASYNC //...
   exit 0
 elif [[ "$1" == "bazel.e2e" ]]; then
   cd examples/e2e

diff --git a/docs/dependencies.md b/docs/dependencies.md
@@ -35,10 +35,8 @@ Both these dependencies are listed here:
       `OPENTELEMETRY_OPTION_USE_STD_SPAN=0` to indicate nostd:span will always
       not be a alias for std::span.
   - Uses Abseil C++ Library for `absl::variant` as default `nostd::variant` if
-    `WITH_ABSEIL` cmake option or
-    `--@io_opentelemetry_cpp//api:with_abseil=true` (aka
-    `--//api:with_abseil=true`) bazel option is enabled. License: `Apache
-    License 2.0`
+    `WITH_ABSEIL` cmake option (always enabled with bazel)
+    License: `Apache License 2.0`
 
 - [OTLP/HTTP+JSON](/exporters/otlp)
   exporter: