bump OpenTelemetry (#9489)
This commit is contained in:
parent
5bfd3e2a67
commit
96b3d21655
3 changed files with 6 additions and 6 deletions
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue