diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 847b8bb9d1..1621661da2 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -57,10 +57,10 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_google_absl", - sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8", - strip_prefix = "abseil-cpp-20220623.1", + sha256 = "9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906", + strip_prefix = "abseil-cpp-20230125.2", urls = [ - "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.2.tar.gz", ], ) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 64d3b72308..dce17301ed 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -60,7 +60,7 @@ mkdir -p "${BUILD_DIR}" mkdir -p "${PLUGIN_DIR}" BAZEL_OPTIONS_DEFAULT="--copt=-DENABLE_LOGS_PREVIEW --copt=-DENABLE_TEST --copt=-DENABLE_METRICS_EXEMPLAR_PREVIEW" -BAZEL_OPTIONS="--cxxopt=-std=c++14 $BAZEL_OPTIONS_DEFAULT" +BAZEL_OPTIONS="--cxxopt=-std=c++14 --host_cxxopt=-std=c++14 $BAZEL_OPTIONS_DEFAULT" BAZEL_TEST_OPTIONS="$BAZEL_OPTIONS --test_output=errors" @@ -163,6 +163,7 @@ elif [[ "$1" == "cmake.abseil.test" ]]; then -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \ -DWITH_ASYNC_EXPORT_PREVIEW=ON \ -DWITH_ABSEIL=ON \ + -DCMAKE_CXX_STANDARD=14 \ "${SRC_DIR}" make -j $(nproc) make test @@ -413,7 +414,7 @@ elif [[ "$1" == "code.coverage" ]]; then elif [[ "$1" == "third_party.tags" ]]; then echo "gRPC=v1.49.2" > third_party_release echo "thrift=0.14.1" >> third_party_release - echo "abseil=20220623.1" >> third_party_release + echo "abseil=20230125.2" >> third_party_release git submodule foreach --quiet 'echo "$name=$(git describe --tags HEAD)"' | sed 's:.*/::' >> third_party_release exit 0 fi diff --git a/ci/install_abseil.sh b/ci/install_abseil.sh index 7764b4d815..93d6e81e9e 100755 --- a/ci/install_abseil.sh +++ b/ci/install_abseil.sh @@ -8,12 +8,12 @@ export DEBIAN_FRONTEND=noninteractive BUILD_DIR=/tmp/ INSTALL_DIR=/usr/local/ -TAG=20220623.1 +TAG=20230125.2 pushd $BUILD_DIR git clone --depth=1 -b ${TAG} https://github.com/abseil/abseil-cpp.git cd abseil-cpp mkdir build && pushd build -cmake -DBUILD_TESTING=OFF -DCMAKE_CXX_STANDARD=11 \ +cmake -DBUILD_TESTING=OFF -DCMAKE_CXX_STANDARD=14 \ -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \ .. make -j $(nproc) diff --git a/third_party_release b/third_party_release index 7290896c2d..7c86d0e156 100644 --- a/third_party_release +++ b/third_party_release @@ -15,7 +15,7 @@ gRPC=v1.49.2 thrift=0.14.1 -abseil=20220623.1 +abseil=20230125.2 benchmark=v1.5.3 googletest=release-1.12.1 ms-gsl=v3.1.0-67-g6f45293