From e11348bb400d5472bf1da5d6128bead66fa111ff Mon Sep 17 00:00:00 2001 From: Aryan Ishan <54237311+aryanishan1001@users.noreply.github.com> Date: Thu, 2 May 2024 13:05:29 +0530 Subject: [PATCH] Nginx version update for otel webserver agent (#436) --- instrumentation/otel-webserver-module/Dockerfile | 4 ++-- instrumentation/otel-webserver-module/README.md | 4 ++-- instrumentation/otel-webserver-module/codeql-env.sh | 2 +- .../otel-webserver-module/docker/centos7/Dockerfile | 4 ++-- .../otel-webserver-module/docker/ubuntu20.04/Dockerfile | 4 ++-- instrumentation/otel-webserver-module/version.properties | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/instrumentation/otel-webserver-module/Dockerfile b/instrumentation/otel-webserver-module/Dockerfile index 79a6860b5..6deb7207a 100644 --- a/instrumentation/otel-webserver-module/Dockerfile +++ b/instrumentation/otel-webserver-module/Dockerfile @@ -24,7 +24,7 @@ ARG LOG4CXX_VERSION="0.11.0" ARG GTEST_VERSION="1.10.0" ARG AUTOMAKE_VERSION="1.16.3" ARG PCRE_VERSION="8.44" -ARG NGINX_VERSION="1.24.0" +ARG NGINX_VERSION="1.26.0" # create default non-root user @@ -273,7 +273,7 @@ RUN cd /otel-webserver-module/build \ && cd / RUN cp /otel-webserver-module/conf/nginx/opentelemetry_module.conf /opt/ \ - && sed -i '8i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.24.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ + && sed -i '8i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.26.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ && sed -i '33i include /opt/opentelemetry_module.conf;' /etc/nginx/nginx.conf \ && cd / diff --git a/instrumentation/otel-webserver-module/README.md b/instrumentation/otel-webserver-module/README.md index 651ece90b..55125f82b 100644 --- a/instrumentation/otel-webserver-module/README.md +++ b/instrumentation/otel-webserver-module/README.md @@ -150,7 +150,7 @@ Currently, Nginx Webserver module monitores some fixed set of modules, which get | Library | Present Version | | ---------------------------------------------- | ----------- | -| Nginx | 1.24.0, 1.25.3 | +| Nginx | 1.26.0, 1.25.5 | | Apr | 1.7.0 | | Apr-util | 1.6.1 | @@ -191,7 +191,7 @@ Currently, Nginx Webserver module monitores some fixed set of modules, which get - Docker Desktop should be installed on the system #### Platform Supported -- Supports both stable(1.24.0) and mainline(1.25.3). +- Supports both stable(1.26.0) and mainline(1.25.5). - Earlier support of v1.18.0 is deprecated. - The build is supported for **x86-64** platforms. - OS support: **Centos6**, **Centos7, ubuntu20.04**. diff --git a/instrumentation/otel-webserver-module/codeql-env.sh b/instrumentation/otel-webserver-module/codeql-env.sh index 5a8383dce..5402efa1b 100755 --- a/instrumentation/otel-webserver-module/codeql-env.sh +++ b/instrumentation/otel-webserver-module/codeql-env.sh @@ -36,7 +36,7 @@ APRUTIL_VERSION="1.6.1" LOG4CXX_VERSION="0.11.0" GTEST_VERSION="1.10.0" PCRE_VERSION="8.44" -NGINX_VERSION="1.24.0" +NGINX_VERSION="1.26.0" # Install GRPC git clone --shallow-submodules --depth 1 --recurse-submodules -b v${GRPC_VERSION} \ diff --git a/instrumentation/otel-webserver-module/docker/centos7/Dockerfile b/instrumentation/otel-webserver-module/docker/centos7/Dockerfile index ffbac410e..60ec1bf5c 100644 --- a/instrumentation/otel-webserver-module/docker/centos7/Dockerfile +++ b/instrumentation/otel-webserver-module/docker/centos7/Dockerfile @@ -26,7 +26,7 @@ ARG AUTOMAKE_VERSION="1.16.3" ARG PERL_VERSION="5.20.2" ARG PERL_CPANVERSION="5.0" ARG PCRE_VERSION="8.44" -ARG NGINX_VERSION="1.24.0" +ARG NGINX_VERSION="1.26.0" # create default non-root user RUN groupadd -r swuser && useradd -u 1000 -g swuser -m -s /sbin/nologin -c "default non-root user" swuser @@ -290,7 +290,7 @@ RUN cd /otel-webserver-module/build \ && cd / RUN cp /otel-webserver-module/conf/nginx/opentelemetry_module.conf /opt/ \ - && sed -i '8i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.24.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ + && sed -i '8i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.26.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ && sed -i '33i include /opt/opentelemetry_module.conf;' /etc/nginx/nginx.conf \ && cd / diff --git a/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile b/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile index 7df79b246..0df295570 100644 --- a/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile +++ b/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile @@ -38,7 +38,7 @@ ARG APRUTIL_VERSION="1.6.1" ARG LOG4CXX_VERSION="0.11.0" ARG GTEST_VERSION="1.10.0" ARG PCRE_VERSION="8.44" -ARG NGINX_VERSION="1.24.0" +ARG NGINX_VERSION="1.26.0" # Install GRPC RUN git clone --shallow-submodules --depth 1 --recurse-submodules -b v${GRPC_VERSION} \ @@ -213,7 +213,7 @@ RUN cd /otel-webserver-module/build \ RUN cd /otel-webserver-module/build \ && cp ../conf/nginx/opentelemetry_module.conf /opt/ \ - && sed -i '5i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.24.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ + && sed -i '5i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.26.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ && sed -i '33i include /opt/opentelemetry_module.conf;' /etc/nginx/nginx.conf \ && cd /opt/opentelemetry-webserver-sdk \ && ./install.sh \ diff --git a/instrumentation/otel-webserver-module/version.properties b/instrumentation/otel-webserver-module/version.properties index d0fb52b5c..416072198 100644 --- a/instrumentation/otel-webserver-module/version.properties +++ b/instrumentation/otel-webserver-module/version.properties @@ -1,4 +1,4 @@ server-module-version=1.0.3 release=GA -nginxSupportedVersions=1.24.0,1.25.3 +nginxSupportedVersions=1.26.0,1.25.5 CPP-SDK-version=1.2.0