From 96b3d216550e8aa538a730fa112a40e8f75aec95 Mon Sep 17 00:00:00 2001
From: Ehsan Saei <71217171+esigo@users.noreply.github.com>
Date: Sun, 8 Jan 2023 00:37:27 +0100
Subject: [PATCH] bump OpenTelemetry (#9489)

---
 images/opentelemetry/rootfs/CMakeLists.txt | 2 +-
 images/opentelemetry/rootfs/Dockerfile     | 4 ++--
 images/opentelemetry/rootfs/build.sh       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/opentelemetry/rootfs/CMakeLists.txt b/images/opentelemetry/rootfs/CMakeLists.txt
index e4abc7346..ef90b5805 100644
--- a/images/opentelemetry/rootfs/CMakeLists.txt
+++ b/images/opentelemetry/rootfs/CMakeLists.txt
@@ -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")
diff --git a/images/opentelemetry/rootfs/Dockerfile b/images/opentelemetry/rootfs/Dockerfile
index 7746edbf1..aa4e219af 100644
--- a/images/opentelemetry/rootfs/Dockerfile
+++ b/images/opentelemetry/rootfs/Dockerfile
@@ -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
diff --git a/images/opentelemetry/rootfs/build.sh b/images/opentelemetry/rootfs/build.sh
index 19914932c..6ad4601c6 100755
--- a/images/opentelemetry/rootfs/build.sh
+++ b/images/opentelemetry/rootfs/build.sh
@@ -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"