diff --git a/instrumentation/otel-webserver-module/README.md b/instrumentation/otel-webserver-module/README.md index dd4a8c757..cc8367596 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.22.0, 1.23.0,1.23.1 | +| Nginx | 1.24.0, 1.25.3 | | Apr | 1.7.0 | | Apr-util | 1.6.1 | @@ -182,7 +182,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.22.0) and mainline(1.23.1). +- Supports both stable(1.24.0) and mainline(1.25.3). - 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/docker/centos7/Dockerfile b/instrumentation/otel-webserver-module/docker/centos7/Dockerfile index a6ffe2023..ffbac410e 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.22.0" +ARG NGINX_VERSION="1.24.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.22.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ + && 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 '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 81d717668..7df79b246 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.22.0" +ARG NGINX_VERSION="1.24.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.22.0/ngx_http_opentelemetry_module.so;' /etc/nginx/nginx.conf \ + && 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 '33i include /opt/opentelemetry_module.conf;' /etc/nginx/nginx.conf \ && cd /opt/opentelemetry-webserver-sdk \ && ./install.sh \ diff --git a/instrumentation/otel-webserver-module/include/core/api/Payload.h b/instrumentation/otel-webserver-module/include/core/api/Payload.h index a3325e0b2..e1cf2fe37 100644 --- a/instrumentation/otel-webserver-module/include/core/api/Payload.h +++ b/instrumentation/otel-webserver-module/include/core/api/Payload.h @@ -71,18 +71,18 @@ class RequestPayload void set_port(long aPort) {port = aPort; } - std::string get_uri() { return uri; } - std::string get_request_protocol() { return request_protocol; } - std::string get_http_get_parameter() { return http_get_parameter; } - std::string get_http_post_parameter() { return http_post_parameter; } - std::string get_http_request_method() { return http_request_method; } + std::string& get_uri() { return uri; } + std::string& get_request_protocol() { return request_protocol; } + std::string& get_http_get_parameter() { return http_get_parameter; } + std::string& get_http_post_parameter() { return http_post_parameter; } + std::string& get_http_request_method() { return http_request_method; } std::unordered_map get_http_headers() { return http_headers; } - std::string get_server_name() { return server_name; } - std::string get_scheme() {return scheme; } - std::string get_host() {return host; } - std::string get_target() {return target; } - std::string get_flavor() {return flavor; } - std::string get_client_ip() {return client_ip; } + std::string& get_server_name() { return server_name; } + std::string& get_scheme() {return scheme; } + std::string& get_host() {return host; } + std::string& get_target() {return target; } + std::string& get_flavor() {return flavor; } + std::string& get_client_ip() {return client_ip; } long get_port() {return port; } std::unordered_map& get_request_headers() { return request_headers; diff --git a/instrumentation/otel-webserver-module/version.properties b/instrumentation/otel-webserver-module/version.properties index 8e477b32d..d0fb52b5c 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.22.0,1.23.0,1.23.1 +nginxSupportedVersions=1.24.0,1.25.3 CPP-SDK-version=1.2.0