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

Jump to bottom

bump OpenTelemetry module #9489

Merged
merged 1 commit into from
Jan 7, 2023
Merged

bump OpenTelemetry module #9489

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
2 changes: 1 addition & 1 deletion images/opentelemetry/rootfs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ project(
LANGUAGES CXX
VERSION 0.0.1)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS "-O2")
Expand Down
4 changes: 2 additions & 2 deletions images/opentelemetry/rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ RUN apk update \

# install gRPC
FROM base as grpc
RUN bash /opt/third_party/build.sh -g v1.43.2
RUN bash /opt/third_party/build.sh -g v1.49.2

# install OpenTelemetry-cpp
FROM base as otel-cpp
COPY --from=grpc /opt/third_party/install/ /usr
RUN bash /opt/third_party/build.sh -o v1.3.0
RUN bash /opt/third_party/build.sh -o v1.8.1

# install otel_ngx_module.so
FROM base as nginx
Expand Down
6 changes: 3 additions & 3 deletions images/opentelemetry/rootfs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ install_otel()
-DBUILD_SHARED_LIBS=OFF \
-DWITH_OTLP=ON \
-DWITH_OTLP_GRPC=ON \
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DWITH_OTLP_HTTP=OFF \
-DWITH_ABSEIL=OFF \
-DWITH_EXAMPLES=OFF \
..
cmake --build . -j ${CORES} --target install
}
Expand All @@ -126,7 +126,7 @@ install_nginx()
export NGINX_VERSION=1.21.6

# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/2656a4...main
export OPENTELEMETRY_CONTRIB_COMMIT=6467ec2e4d67b08b44580b7eb7a298786f4eef91
export OPENTELEMETRY_CONTRIB_COMMIT=1ec94c82095bab61f06c7393b6f3272469d285af

mkdir -p /etc/nginx
cd "$BUILD_PATH"
Expand Down