DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump OpenTelemetry (#9489)

Browse source
This commit is contained in:
Ehsan Saei 2023-01-08 00:37:27 +01:00 committed by GitHub
parent 5bfd3e2a67
commit 96b3d21655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/opentelemetry/rootfs/CMakeLists.txt
View file

@ -21,7 +21,7 @@ project(
LANGUAGES CXX LANGUAGES CXX
VERSION 0.0.1) VERSION 0.0.1)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS "-O2") set(CMAKE_CXX_FLAGS "-O2")

4
images/opentelemetry/rootfs/Dockerfile
View file

@ -26,12 +26,12 @@ RUN apk update \
# install gRPC # install gRPC
FROM base as 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 # install OpenTelemetry-cpp
FROM base as otel-cpp FROM base as otel-cpp
COPY --from=grpc /opt/third_party/install/ /usr 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 # install otel_ngx_module.so
FROM base as nginx FROM base as nginx

6
images/opentelemetry/rootfs/build.sh
View file

@ -100,9 +100,9 @@ install_otel()
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DWITH_OTLP=ON \ -DWITH_OTLP=ON \
-DWITH_OTLP_GRPC=ON \ -DWITH_OTLP_GRPC=ON \
-DWITH_EXAMPLES=OFF \
-DWITH_ABSEIL=ON \
-DWITH_OTLP_HTTP=OFF \ -DWITH_OTLP_HTTP=OFF \
-DWITH_ABSEIL=OFF \
-DWITH_EXAMPLES=OFF \
.. ..
cmake --build . -j ${CORES} --target install cmake --build . -j ${CORES} --target install
} }
@ -126,7 +126,7 @@ install_nginx()
export NGINX_VERSION=1.21.6 export NGINX_VERSION=1.21.6
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/2656a4...main # 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 mkdir -p /etc/nginx
cd "$BUILD_PATH" cd "$BUILD_PATH"