add OpenTelemetry to nginx base image (#7669)
This commit is contained in:
parent
69577e58f5
commit
0c16980018
2 changed files with 44 additions and 0 deletions
|
@ -4,6 +4,8 @@ This custom image contains:
|
||||||
|
|
||||||
- [nginx-http-auth-digest](https://github.com/atomx/nginx-http-auth-digest)
|
- [nginx-http-auth-digest](https://github.com/atomx/nginx-http-auth-digest)
|
||||||
- [ngx_http_substitutions_filter_module](https://github.com/yaoweibin/ngx_http_substitutions_filter_module)
|
- [ngx_http_substitutions_filter_module](https://github.com/yaoweibin/ngx_http_substitutions_filter_module)
|
||||||
|
- [OpenTelemetry-CPP](https://github.com/open-telemetry/opentelemetry-cpp)
|
||||||
|
- [OpenTelemetry-CPP-Nginx](https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/nginx)
|
||||||
- [nginx-opentracing](https://github.com/opentracing-contrib/nginx-opentracing)
|
- [nginx-opentracing](https://github.com/opentracing-contrib/nginx-opentracing)
|
||||||
- [opentracing-cpp](https://github.com/opentracing/opentracing-cpp)
|
- [opentracing-cpp](https://github.com/opentracing/opentracing-cpp)
|
||||||
- [zipkin-cpp-opentracing](https://github.com/rnburn/zipkin-cpp-opentracing)
|
- [zipkin-cpp-opentracing](https://github.com/rnburn/zipkin-cpp-opentracing)
|
||||||
|
|
|
@ -35,6 +35,12 @@ export NGINX_DIGEST_AUTH=1.0.0
|
||||||
# Check for recent changes: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/compare/v0.6.4...master
|
# Check for recent changes: https://github.com/yaoweibin/ngx_http_substitutions_filter_module/compare/v0.6.4...master
|
||||||
export NGINX_SUBSTITUTIONS=b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0
|
export NGINX_SUBSTITUTIONS=b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0
|
||||||
|
|
||||||
|
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.0.0...main
|
||||||
|
export OPENTELEMETRY_CPP_VERSION=1.0.0
|
||||||
|
|
||||||
|
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/4c4933...main
|
||||||
|
export OPENTELEMETRY_CONTRIB_COMMIT=4c4933dc207c04e3528a9b20c28b639bc99773ad
|
||||||
|
|
||||||
# Check for recent changes: https://github.com/opentracing-contrib/nginx-opentracing/compare/v0.19.0...master
|
# Check for recent changes: https://github.com/opentracing-contrib/nginx-opentracing/compare/v0.19.0...master
|
||||||
export NGINX_OPENTRACING_VERSION=0.19.0
|
export NGINX_OPENTRACING_VERSION=0.19.0
|
||||||
|
|
||||||
|
@ -131,11 +137,13 @@ export BUILD_PATH=/tmp/build
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
|
|
||||||
|
export USE_OPENTELEMETRY=true
|
||||||
if [[ ${ARCH} == "s390x" ]]; then
|
if [[ ${ARCH} == "s390x" ]]; then
|
||||||
export LUAJIT_VERSION=9d5750d28478abfdcaefdfdc408f87752a21e431
|
export LUAJIT_VERSION=9d5750d28478abfdcaefdfdc408f87752a21e431
|
||||||
export LUA_RESTY_CORE=0.1.17
|
export LUA_RESTY_CORE=0.1.17
|
||||||
export LUA_NGX_VERSION=0.10.15
|
export LUA_NGX_VERSION=0.10.15
|
||||||
export LUA_STREAM_NGX_VERSION=0.0.7
|
export LUA_STREAM_NGX_VERSION=0.0.7
|
||||||
|
export USE_OPENTELEMETRY=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
get_src()
|
get_src()
|
||||||
|
@ -215,6 +223,9 @@ get_src f09851e6309560a8ff3e901548405066c83f1f6ff88aa7171e0763bd9514762b \
|
||||||
get_src a98b48947359166326d58700ccdc27256d2648218072da138ab6b47de47fbd8f \
|
get_src a98b48947359166326d58700ccdc27256d2648218072da138ab6b47de47fbd8f \
|
||||||
"https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/$NGINX_SUBSTITUTIONS.tar.gz"
|
"https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/$NGINX_SUBSTITUTIONS.tar.gz"
|
||||||
|
|
||||||
|
get_src 49519dcf5a2324f9122819141045744fdcbcf411c730f173c4f3d993f02c92b5 \
|
||||||
|
"https://github.com/dmathieu/opentelemetry-cpp-contrib/archive/$OPENTELEMETRY_CONTRIB_COMMIT.tar.gz"
|
||||||
|
|
||||||
get_src 6f97776ebdf019b105a755c7736b70bdbd7e575c7f0d39db5fe127873c7abf17 \
|
get_src 6f97776ebdf019b105a755c7736b70bdbd7e575c7f0d39db5fe127873c7abf17 \
|
||||||
"https://github.com/opentracing-contrib/nginx-opentracing/archive/v$NGINX_OPENTRACING_VERSION.tar.gz"
|
"https://github.com/opentracing-contrib/nginx-opentracing/archive/v$NGINX_OPENTRACING_VERSION.tar.gz"
|
||||||
|
|
||||||
|
@ -468,6 +479,32 @@ cmake -DCMAKE_BUILD_TYPE=Release \
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
|
|
||||||
|
if [ $USE_OPENTELEMETRY ]; then
|
||||||
|
# build opentelemetry lib
|
||||||
|
apk add protobuf-dev \
|
||||||
|
grpc \
|
||||||
|
grpc-dev \
|
||||||
|
gtest-dev \
|
||||||
|
c-ares-dev
|
||||||
|
|
||||||
|
cd $BUILD_PATH
|
||||||
|
git clone --recursive https://github.com/open-telemetry/opentelemetry-cpp opentelemetry-cpp-$OPENTELEMETRY_CPP_VERSION
|
||||||
|
cd "opentelemetry-cpp-$OPENTELEMETRY_CPP_VERSION"
|
||||||
|
git checkout v$OPENTELEMETRY_CPP_VERSION
|
||||||
|
mkdir .build
|
||||||
|
cd .build
|
||||||
|
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DBUILD_TESTING=OFF \
|
||||||
|
-DWITH_EXAMPLES=OFF \
|
||||||
|
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
||||||
|
-DWITH_OTLP=ON \
|
||||||
|
-DWITH_OTLP_HTTP=OFF \
|
||||||
|
..
|
||||||
|
make
|
||||||
|
make install
|
||||||
|
fi
|
||||||
|
|
||||||
# Get Brotli source and deps
|
# Get Brotli source and deps
|
||||||
cd "$BUILD_PATH"
|
cd "$BUILD_PATH"
|
||||||
git clone --depth=1 https://github.com/google/ngx_brotli.git
|
git clone --depth=1 https://github.com/google/ngx_brotli.git
|
||||||
|
@ -635,6 +672,11 @@ WITH_MODULES=" \
|
||||||
--add-dynamic-module=$BUILD_PATH/ngx_http_geoip2_module-${GEOIP2_VERSION} \
|
--add-dynamic-module=$BUILD_PATH/ngx_http_geoip2_module-${GEOIP2_VERSION} \
|
||||||
--add-dynamic-module=$BUILD_PATH/ngx_brotli"
|
--add-dynamic-module=$BUILD_PATH/ngx_brotli"
|
||||||
|
|
||||||
|
if [ $USE_OPENTELEMETRY ]; then
|
||||||
|
WITH_MODULES+=" \
|
||||||
|
--add-dynamic-module=$BUILD_PATH/opentelemetry-cpp-contrib-$OPENTELEMETRY_CONTRIB_COMMIT/instrumentation/nginx"
|
||||||
|
fi
|
||||||
|
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr/local/nginx \
|
--prefix=/usr/local/nginx \
|
||||||
--conf-path=/etc/nginx/nginx.conf \
|
--conf-path=/etc/nginx/nginx.conf \
|
||||||
|
|
Loading…
Reference in a new issue