Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Thrift version from 0.14.1 to 0.18.1 #2119

Closed
wants to merge 1 commit into from
Closed

Upgrade Thrift version from 0.14.1 to 0.18.1 #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel/repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ def opentelemetry_cpp_deps():
http_archive,
name = "com_github_thrift",
build_file_content = _ALL_CONTENT,
sha256 = "5ae1c4d16452a22eaf9d802ba7489907147c2b316ff38c9758918552fae5132c",
strip_prefix = "thrift-0.14.1",
sha256 = "9cea30b9700153329ae1926cc05a20bbe3e8451ae270b0c8c5c5fe9929924cb3",
strip_prefix = "thrift-0.18.1",
urls = [
"https://github.com/apache/thrift/archive/refs/tags/v0.14.1.tar.gz",
"https://github.com/apache/thrift/archive/refs/tags/v0.18.1.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ elif [[ "$1" == "code.coverage" ]]; then
exit 0
elif [[ "$1" == "third_party.tags" ]]; then
echo "gRPC=v1.49.2" > third_party_release
echo "thrift=0.14.1" >> third_party_release
echo "thrift=0.18.1" >> third_party_release
echo "abseil=20220623.1" >> third_party_release
git submodule foreach --quiet 'echo "$name=$(git describe --tags HEAD)"' | sed 's:.*/::' >> third_party_release
exit 0
Expand Down
2 changes: 1 addition & 1 deletion ci/setup_thrift.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

set -e
export DEBIAN_FRONTEND=noninteractive
export THRIFT_VERSION=0.14.1
export THRIFT_VERSION=0.18.1

install_dir='/usr/local/'
while getopts ":i:" o; do
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN git clone --depth=1 -b $GRPC_VERSION https://github.com/grpc/grpc.git \
make -j${nproc} install && make clean && ldconfig

# install thrift
ARG THRIFT_VERSION=0.14.1
ARG THRIFT_VERSION=0.18.1
RUN yum install -y \
boost169-devel \
libevent-devel \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.debian.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ FROM base as thrift
RUN apt-get install -y --no-install-recommends wget

# install thrift
ARG THRIFT_VERSION=0.14.1
ARG THRIFT_VERSION=0.18.1
ADD setup_thrift.sh .
RUN ./setup_thrift.sh -i "/opt/otel-cpp"

Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ it's dependencies within the desired base image.
The final image only contains the necessary files in `/`.

```sh
bash build.sh -b alpine -j ${nproc} -g v1.43.2 -o v1.3.0 -t 0.14.1
bash build.sh -b alpine -j ${nproc} -g v1.43.2 -o v1.3.0 -t 0.18.1

# copy to current dir
docker create -ti --name otel otel-cpp-<base_image> bash
Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Help()

base_image=${base_image:="alpine"}
grpc_git_tag=${grpc_git_tag:="v1.43.2"}
thrift_version=${thrift_version:="0.14.1"}
thrift_version=${thrift_version:="0.18.1"}
otel_git_tag=${otel_git_tag:="v1.3.0"}
cores=${cores:=1}

Expand Down
2 changes: 1 addition & 1 deletion docker/thrift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")

set(THRIFT_VERSION
"0.14.1"
"0.18.1"
CACHE STRING "thrift version")

include(ExternalProject)
Expand Down
2 changes: 1 addition & 1 deletion docker/thrift/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BASE_IMAGE=ubuntu:latest
FROM ${BASE_IMAGE} AS thrift

ARG CORES=${nproc}
ARG THRIFT_VERSION=0.14.1
ARG THRIFT_VERSION=0.18.1

RUN mkdir mkdir -p /opt/third_party/thrift

Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntuLatest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y build-essential autoconf libtool pkg-co
cd ../..

#install thrift
ARG THRIFT_VERSION=0.14.1
ARG THRIFT_VERSION=0.18.1
RUN apt-get install -y --no-install-recommends \
libboost-all-dev \
libevent-dev \
Expand Down
2 changes: 1 addition & 1 deletion third_party_release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#

gRPC=v1.49.2
thrift=0.14.1
thrift=0.18.1
abseil=20220623.1
benchmark=v1.5.3
googletest=release-1.12.1
Expand Down