From 3bad070c4796e5c8c7c634e009fd5fe702de0076 Mon Sep 17 00:00:00 2001
From: Oblivion <ehsan.sadroid@gmail.com>
Date: Sun, 27 Aug 2023 09:05:40 +0000
Subject: [PATCH] upgrade module

---
 images/opentelemetry/rootfs/Dockerfile |  3 +--
 images/opentelemetry/rootfs/build.sh   | 27 +++++++++++---------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/images/opentelemetry/rootfs/Dockerfile b/images/opentelemetry/rootfs/Dockerfile
index a0ed25910..819c0d42c 100644
--- a/images/opentelemetry/rootfs/Dockerfile
+++ b/images/opentelemetry/rootfs/Dockerfile
@@ -21,7 +21,7 @@ COPY . /opt/third_party/
 # install build tools
 RUN apk update \
 	&& apk upgrade \
-	&& apk add -U bash cmake ninja \
+	&& apk add -U bash \
 	&& bash /opt/third_party/build.sh -p
 
 ENV NINJA_STATUS "[%p/%f/%t] "
@@ -57,6 +57,5 @@ RUN CGO_ENABLED=0 go build -o /go/bin/init_module
 FROM cgr.dev/chainguard/static as final
 COPY --from=build-init /go/bin/init_module /
 COPY --from=nginx /etc/nginx/modules /etc/nginx/modules
-COPY --from=nginx /opt/third_party/install/lib /etc/nginx/modules
 
 CMD ["/init_module"]
diff --git a/images/opentelemetry/rootfs/build.sh b/images/opentelemetry/rootfs/build.sh
index 0e9459f14..ebf95e219 100755
--- a/images/opentelemetry/rootfs/build.sh
+++ b/images/opentelemetry/rootfs/build.sh
@@ -55,6 +55,8 @@ prepare()
 {
   apk add \
     linux-headers \
+    cmake \
+    ninja \
     openssl \
     curl-dev \
     openssl-dev \
@@ -90,6 +92,7 @@ install_absl()
 
   cmake -DCMAKE_BUILD_TYPE=Release \
         -G Ninja \
+        -DCMAKE_CXX_STANDARD=17 \
         -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \
         -DBUILD_TESTING=OFF \
         -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
@@ -148,7 +151,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=1ec94c82095bab61f06c7393b6f3272469d285af
+  export OPENTELEMETRY_CONTRIB_COMMIT=aaa51e2297bcb34297f3c7aa44fa790497d2f7f3
 
   mkdir -p /etc/nginx
   cd "$BUILD_PATH"
@@ -165,27 +168,19 @@ install_nginx()
   mkdir -p build
   cd build
   cmake -DCMAKE_BUILD_TYPE=Release \
-    -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
-    -DBUILD_SHARED_LIBS=ON \
-    -DNGINX_VERSION=${NGINX_VERSION} \
-    ..
+        -G Ninja \
+        -DCMAKE_CXX_STANDARD=17 \
+        -DCMAKE_INSTALL_PREFIX=${INSTAL_DIR} \
+        -DBUILD_SHARED_LIBS=ON \
+        -DNGINX_VERSION=${NGINX_VERSION} \
+        ..
   cmake --build . -j ${CORES} --target install
 
   mkdir -p /etc/nginx/modules
-
-  ldd_output=$(ldd "${INSTAL_DIR}/otel_ngx_module.so" 2>&1)
-  if [ $? -ne 0 ]; then
-      echo "ldd encountered an error:"
-      echo "$ldd_output"
-      exit 1
-  fi
   cp ${INSTAL_DIR}/otel_ngx_module.so /etc/nginx/modules/otel_ngx_module.so
-
-  mkdir -p ${INSTAL_DIR}/lib
 }
 
-while getopts ":hpn:a:g:o:" option; do
+while getopts ":pha:g:o:n" option; do
    case $option in
     h) # display Help
          Help