Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nginx version update to 1.26.0 stable and 1.25.5 mainline for otel webserver agent #436

Merged
merged 1 commit into from
May 2, 2024
Merged

Nginx version update to 1.26.0 stable and 1.25.5 mainline for otel webserver agent #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions instrumentation/otel-webserver-module/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 /

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/otel-webserver-module/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

Expand Down Expand Up @@ -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**.
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/otel-webserver-module/codeql-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/otel-webserver-module/docker/centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 /

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/otel-webserver-module/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading