Add OTEL build test and for NGINX v1.25 (#10889)

* Add OTEL build test

* Simplify otel compilation

* Remove http2 deprecated arg

* Move image build to CI

* Turn image from scratch to optimize usage

* rollback image from scratch

* Final reviews on nginx v1.25 image

* Remove s390x from final image

images/opentelemetry/rootfs/CMakeLists.txt

@@ -64,98 +64,9 @@ find_package(OpenSSL REQUIRED)
 message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
 message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
 
-set(GRPC_GIT_TAG
-    "v1.45.2"
-    CACHE STRING "gRPC version")
-
-include(ExternalProject)
-set(ABSEIL_GIT_TAG "20230802.1" CACHE STRING "Abseil version")
-
-ExternalProject_Add(
-  Abseil
-  GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
-  GIT_TAG ${ABSEIL_GIT_TAG}
-  GIT_SHALLOW 1
-  UPDATE_COMMAND ""
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
-             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-             -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-             -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-  USES_TERMINAL_BUILD TRUE
-  DOWNLOAD_NO_PROGRESS TRUE
-  LOG_CONFIGURE TRUE
-  LOG_BUILD TRUE
-  LOG_INSTALL TRUE)
-
-# RE2 settings
-set(RE2_GIT_TAG "2023-11-01" CACHE STRING "RE2 version")
-
-ExternalProject_Add(
-  RE2
-  DEPENDS Abseil
-  GIT_REPOSITORY https://github.com/google/re2.git
-  GIT_TAG ${RE2_GIT_TAG}
-  GIT_SHALLOW 1
-  UPDATE_COMMAND ""
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
-             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-             -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-             -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-  USES_TERMINAL_BUILD TRUE
-  DOWNLOAD_NO_PROGRESS TRUE
-  LOG_CONFIGURE TRUE
-  LOG_BUILD TRUE
-  LOG_INSTALL TRUE)
-
-ExternalProject_Add(
-  gRPC
-  DEPENDS Abseil RE2
-  GIT_REPOSITORY https://github.com/grpc/grpc.git
-  GIT_TAG ${GRPC_GIT_TAG}
-  GIT_SHALLOW 1
-  UPDATE_COMMAND ""
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
-             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-             -DgRPC_SSL_PROVIDER=package
-             -DgRPC_RE2_PROVIDER=package
-             -DgRPC_ABSEIL_PROVIDER=package
-             -DOPENSSL_ROOT_DIR=OpenSSL
-             -DgRPC_BUILD_TESTS=OFF
-             -DBUILD_SHARED_LIBS=OFF
-             -DgRPC_INSTALL=ON
-             -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
-             -DgRPC_USE_PROTO_LITE=OFF
-             -DgRPC_BUILD_CSHARP_EXT=OFF
-             -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_JAVA_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_GRPC_JAVA_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_WEB_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_C_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
-             -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-             CMAKE_CACHE_ARGS -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-  TEST_AFTER_INSTALL FALSE
-  USES_TERMINAL_BUILD TRUE
-  DOWNLOAD_NO_PROGRESS TRUE
-  LOG_CONFIGURE TRUE
-  LOG_BUILD TRUE
-  LOG_INSTALL TRUE)
+find_package(Protobuf REQUIRED)
+find_package(gRPC REQUIRED)
+find_package(OpentelemetryCPP REQUIRED)
 
 install(
   DIRECTORY ${STAGED_INSTALL_PREFIX}/

images/opentelemetry/rootfs/Dockerfile

@@ -26,23 +26,12 @@ RUN apk update \
 
 ENV NINJA_STATUS "[%p/%f/%t] "
 
-# install gRPC
-FROM base as grpc
-RUN bash /opt/third_party/build.sh -g v1.60.0
-
-
-# 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.11.0
-
 # install otel_ngx_module.so
 FROM base as nginx
-COPY --from=grpc /opt/third_party/install/ /usr
-COPY --from=otel-cpp /opt/third_party/install/ /usr
-RUN bash /opt/third_party/build.sh -n
+ARG NGINX_VERSION=1.25.3
+RUN bash /opt/third_party/build.sh -n ${NGINX_VERSION}
 
-FROM cgr.dev/chainguard/go:latest as build-init
+FROM golang:1.21.6-bullseye as build-init
 
 WORKDIR /go/src/app
 COPY . .

images/opentelemetry/rootfs/build.sh

@@ -17,12 +17,12 @@
 set -o errexit
 set -o nounset
 set -o pipefail
-
-export GRPC_GIT_TAG=${GRPC_GIT_TAG:="v1.43.2"}
+set -x
 # Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.2.0...main
-export OPENTELEMETRY_CPP_VERSION=${OPENTELEMETRY_CPP_VERSION:="1.2.0"}
-export ABSL_CPP_VERSION=${ABSL_CPP_VERSION:="20230802.0"}
-export INSTAL_DIR=/opt/third_party/install
+export OPENTELEMETRY_CPP_VERSION=${OPENTELEMETRY_CPP_VERSION:="v1.11.0"}
+export INSTALL_DIR=/opt/third_party/install
+
+export NGINX_VERSION=${NGINX_VERSION:="1.25.3"}
 # improve compilation times
 CORES=$(($(grep -c ^processor /proc/cpuinfo) - 1))
 
@@ -41,10 +41,9 @@ Help()
    # Display Help
    echo "Add description of the script functions here."
    echo
-   echo "Syntax: scriptTemplate [-h|g|o|n|p|]"
+   echo "Syntax: scriptTemplate [-h|o|n|p|]"
    echo "options:"
    echo "h     Print Help."
-   echo "g     gRPC git tag"
    echo "o     OpenTelemetry git tag"
    echo "n     install nginx"
    echo "p     prepare"
@@ -53,6 +52,7 @@ Help()
 
 prepare()
 {
+  echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
   apk add \
     linux-headers \
     cmake \
@@ -65,48 +65,26 @@ prepare()
     pcre-dev \
     curl \
     git \
-    build-base
-}
+    build-base \
+    coreutils \
+    build-base \
+    openssl-dev \
+    pkgconfig \
+    c-ares-dev \
+    re2-dev \
+    grpc-dev \
+    protobuf-dev \
+    opentelemetry-cpp-dev
 
-install_grpc()
-{
-  mkdir -p $BUILD_PATH/grpc
-  cd ${BUILD_PATH}/grpc
-  cmake -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
-    -G Ninja \
-    -DGRPC_GIT_TAG=${GRPC_GIT_TAG} /opt/third_party
-
-  cmake --build . -j ${CORES} --target all install --verbose
-}
-
-install_absl()
-{
-  cd ${BUILD_PATH}
-  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+LD_LIBRARY_PATH:}${INSTAL_DIR}/lib:/usr/local"
-  export PATH="${PATH}:${INSTAL_DIR}/bin"
-  git clone --recurse-submodules -j ${CORES} --depth=1 -b \
-    ${ABSL_CPP_VERSION} https://github.com/abseil/abseil-cpp.git abseil-cpp-${ABSL_CPP_VERSION}
-  cd "abseil-cpp-${ABSL_CPP_VERSION}"
-  mkdir -p .build
-  cd .build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-        -G Ninja \
-        -DCMAKE_CXX_STANDARD=17 \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \
-        -DBUILD_TESTING=OFF \
-        -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
-        -DABSL_PROPAGATE_CXX_STD=ON \
-        -DBUILD_SHARED_LIBS=OFF \
-        ..
-  cmake --build . -j ${CORES} --target install
+  git config --global http.version HTTP/1.1
+  git config --global http.postBuffer 157286400
 }
 
 install_otel()
 {
   cd ${BUILD_PATH}
-  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+LD_LIBRARY_PATH:}${INSTAL_DIR}/lib:/usr/local"
-  export PATH="${PATH}:${INSTAL_DIR}/bin"
+  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+LD_LIBRARY_PATH:}${INSTALL_DIR}/lib:/usr/local"
+  export PATH="${PATH}:${INSTALL_DIR}/bin"
   git clone --recurse-submodules -j ${CORES} --depth=1 -b \
     ${OPENTELEMETRY_CPP_VERSION} https://github.com/open-telemetry/opentelemetry-cpp.git opentelemetry-cpp-${OPENTELEMETRY_CPP_VERSION}
   cd "opentelemetry-cpp-${OPENTELEMETRY_CPP_VERSION}"
@@ -118,7 +96,7 @@ install_otel()
         -DCMAKE_CXX_STANDARD=17 \
         -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE  \
         -DWITH_ZIPKIN=OFF \
-        -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
+        -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         -DBUILD_TESTING=OFF \
         -DWITH_BENCHMARK=OFF \
         -DWITH_FUNC_TESTS=OFF \
@@ -132,23 +110,8 @@ install_otel()
   cmake --build . -j ${CORES} --target install
 }
 
-get_src()
-{
-  hash="$1"
-  url="$2"
-  f=$(basename "$url")
-
-  echo "Downloading $url"
-
-  curl -sSL --fail-with-body "$url" -o "$f"
-  echo "$hash  $f" | sha256sum -c - || exit 10
-  tar xzf "$f"
-  rm -rf "$f"
-}
-
 install_nginx()
 {
-  export NGINX_VERSION=1.25.3
 
   # Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/2656a4...main
   export OPENTELEMETRY_CONTRIB_COMMIT=aaa51e2297bcb34297f3c7aa44fa790497d2f7f3
@@ -170,39 +133,28 @@ install_nginx()
   cmake -DCMAKE_BUILD_TYPE=Release \
         -G Ninja \
         -DCMAKE_CXX_STANDARD=17 \
-        -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
+        -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         -DBUILD_SHARED_LIBS=ON \
         -DNGINX_VERSION=${NGINX_VERSION} \
         ..
   cmake --build . -j ${CORES} --target install
 
   mkdir -p /etc/nginx/modules
-  cp ${INSTAL_DIR}/otel_ngx_module.so /etc/nginx/modules/otel_ngx_module.so
+  cp ${INSTALL_DIR}/otel_ngx_module.so /etc/nginx/modules/otel_ngx_module.so
 }
 
-while getopts ":pha:g:o:n" option; do
+while getopts ":phn:" option; do
    case $option in
     h) # display Help
          Help
          exit;;
-    g) # install gRPC with git tag
-        GRPC_GIT_TAG=${OPTARG}
-        install_grpc
-        exit;;
-    o) # install OpenTelemetry tag
-        OPENTELEMETRY_CPP_VERSION=${OPTARG}
-        install_otel
-        exit;;
     p) # prepare
         prepare
         exit;;
     n) # install nginx
+        NGINX_VERSION=${OPTARG}
         install_nginx
         exit;;
-    a) # install abseil
-        ABSL_CPP_VERSION=${OPTARG}
-        install_absl
-        exit;;
     \?)
         Help
         exit;;