almalinux8

Author: Brihadh-Marpadga

.github/workflows/nginx.yml

@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         image: ["ubuntu:24.04", "debian:11", "alpine:3.20", "amazonlinux:2", "amazonlinux:2023"]
-        nginx: ["1.27.3", "1.27.2", "1.27.1", "1.26.2", "1.24.0", "1.22.1"]
+        nginx: ["1.29.3", "1.27.2", "1.27.1", "1.26.2", "1.24.0", "1.22.1"]
     steps:
       - name: checkout otel nginx
         uses: actions/checkout@v4

instrumentation/nginx/README.md

@@ -27,7 +27,7 @@ cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
 ```
 mkdir build
 cd build
-cmake -DNGINX_VERSION=1.27.3 ..
+cmake -DNGINX_VERSION=1.29.3 ..
 make
 ```
 

instrumentation/nginx/test/Dockerfile

@@ -2,7 +2,7 @@ ARG image=ubuntu:24.04
 FROM $image AS build
 
 ARG otel_cpp_version=1.17.0
-ARG nginx_version=1.27.3
+ARG nginx_version=1.29.3
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y \

instrumentation/nginx/test/Dockerfile_alpine

@@ -2,7 +2,7 @@ ARG image=alpine:3.20
 FROM $image AS build
 
 ARG otel_cpp_version=1.17.0
-ARG nginx_version=1.27.3
+ARG nginx_version=1.29.3
 
 RUN apk update && \
   apk add git cmake build-base curl curl-dev protobuf-dev pcre2-dev

instrumentation/nginx/test/Dockerfile_amazonlinux

@@ -2,7 +2,7 @@ ARG image=amazonlinux:2
 FROM $image AS build
 
 ARG otel_cpp_version=1.17.0
-ARG nginx_version=1.27.3
+ARG nginx_version=1.29.3
 
 RUN yum install -y git gcc-c++ make tar curl-devel unzip zlib-devel pcre2-devel
 

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.27.3"
+ARG NGINX_VERSION="1.29.3"
 
 
 # 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.27.3/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \
+    && sed -i '8i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.29.3/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \
     && sed -i '33i include /opt/opentelemetry_module.conf;' /etc/nginx/nginx.conf \ 
     && cd /
 

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.27.3"
+NGINX_VERSION="1.29.3"
 
 # Install GRPC
 git clone --shallow-submodules --depth 1 --recurse-submodules -b v${GRPC_VERSION} \

instrumentation/otel-webserver-module/docker/centos8/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.27.3"
+ARG NGINX_VERSION="1.29.3"
 
 # create default non-root user
 RUN groupadd -r swuser && useradd -u 1000 -g swuser -m -s /sbin/nologin -c "default non-root user" swuser
@@ -283,10 +283,10 @@ RUN echo "[nginx]" > /etc/yum.repos.d/nginx.repo && \
 # Install necessary tools
 RUN dnf install -y wget && dnf clean all
 
-# Download and install Nginx 1.27.3 from the correct path
-RUN wget https://nginx.org/packages/mainline/centos/8/x86_64/RPMS/nginx-1.27.3-1.el8.ngx.x86_64.rpm && \
-    dnf install -y ./nginx-1.27.3-1.el8.ngx.x86_64.rpm && \
-    rm -f nginx-1.27.3-1.el8.ngx.x86_64.rpm && \
+# Download and install Nginx 1.29.3 from the correct path
+RUN wget https://nginx.org/packages/mainline/centos/8/x86_64/RPMS/nginx-1.29.3-1.el8.ngx.x86_64.rpm && \
+    dnf install -y ./nginx-1.29.3-1.el8.ngx.x86_64.rpm && \
+    rm -f nginx-1.29.3-1.el8.ngx.x86_64.rpm && \
     dnf clean all
 
 
@@ -302,7 +302,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.27.3/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \
+    && sed -i '8i load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/1.29.3/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \
     && sed -i '33i include /opt/opentelemetry_module.conf;' /etc/nginx/nginx.conf \ 
     && cd /
 

instrumentation/otel-webserver-module/version.properties

@@ -1,4 +1,4 @@
 server-module-version=1.0.3
 release=GA
-nginxSupportedVersions=1.27.3
+nginxSupportedVersions=1.29.3
 CPP-SDK-version=1.2.0