From 835f03344b9839b1b8677a21b5eff1d3737b80d4 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Fri, 12 May 2023 11:46:14 +0200 Subject: [PATCH 1/2] Fix OTel C++ build and update OTel version --- src/currencyservice/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/currencyservice/Dockerfile b/src/currencyservice/Dockerfile index cda395e18b..68efe19c24 100644 --- a/src/currencyservice/Dockerfile +++ b/src/currencyservice/Dockerfile @@ -19,14 +19,16 @@ FROM alpine as builder RUN apk update RUN apk add git cmake make g++ grpc-dev re2-dev protobuf-dev c-ares-dev -ARG OPENTELEMETRY_CPP_VERSION=1.8.2 +ARG OPENTELEMETRY_CPP_VERSION=1.9.0 RUN git clone https://github.com/open-telemetry/opentelemetry-cpp \ && cd opentelemetry-cpp/ \ && git checkout tags/v${OPENTELEMETRY_CPP_VERSION} -b v${OPENTELEMETRY_CPP_VERSION} \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DWITH_EXAMPLES=OFF -DWITH_OTLP=ON -DWITH_OTLP_GRPC=ON \ + && cmake .. -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \ + -DWITH_EXAMPLES=OFF -DWITH_OTLP=ON -DWITH_OTLP_GRPC=ON \ && make -j$(nproc || sysctl -n hw.ncpu || echo 1) install && cd ../.. && rm -rf opentelemetry-cpp COPY . /currencyservice From b34d994a61c54daf61c83f97e5cc1cb75435b1a5 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Fri, 12 May 2023 11:49:26 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 910d15b4a8..25f465c95a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ release. ([#878](https://github.com/open-telemetry/opentelemetry-demo/pull/878)) * [kafka] remove KRaft mode support workarounds ([#880](https://github.com/open-telemetry/opentelemetry-demo/pull/880)) +* [currencyservice] Fix OTel C++ build and update OTel version to 1.9.0 + ([#886](https://github.com/open-telemetry/opentelemetry-demo/pull/886)) ## 1.4.0