diff --git a/README.md b/README.md index b733653994..3ddc0ccd7f 100644 --- a/README.md +++ b/README.md @@ -487,7 +487,7 @@ List of all available attributes can be found at [otel-webserver-module](https:/ #### Using Nginx autoinstrumentation -For `Nginx` autoinstrumentation, Nginx versions 1.22.0, 1.23.0, and 1.23.1 are supported at this time. The Nginx configuration file is expected to be `/etc/nginx/nginx.conf` by default, if it's different, see following example on how to change it. Instrumentation at this time also expects, that `conf.d` directory is present in the directory, where configuration file resides and that there is a `include /conf.d/*.conf;` directive in the `http { ... }` section of Nginx configuration file (like it is in the default configuration file of Nginx). You can also adjust OpenTelemetry SDK attributes. Example: +For `Nginx` autoinstrumentation, Nginx versions 1.24.0 and 1.25.3 are supported at this time. The Nginx configuration file is expected to be `/etc/nginx/nginx.conf` by default, if it's different, see following example on how to change it. Instrumentation at this time also expects, that `conf.d` directory is present in the directory, where configuration file resides and that there is a `include /conf.d/*.conf;` directive in the `http { ... }` section of Nginx configuration file (like it is in the default configuration file of Nginx). You can also adjust OpenTelemetry SDK attributes. Example: ```yaml apiVersion: opentelemetry.io/v1alpha1 diff --git a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml index 70fcc626a4..f69fcf8483 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: myapp - image: nginxinc/nginx-unprivileged:1.23.1 + image: nginxinc/nginx-unprivileged:1.25.3 imagePullPolicy: Always securityContext: runAsUser: 1000 diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml index 198cf20e1a..1f0a84072f 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml @@ -23,7 +23,7 @@ spec: fsGroup: 3000 containers: - name: myapp - image: nginxinc/nginx-unprivileged:1.23.1 + image: nginxinc/nginx-unprivileged:1.25.3 imagePullPolicy: Always securityContext: runAsUser: 1000 diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml index bc4ff47531..fe6be66c75 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml @@ -23,7 +23,7 @@ spec: fsGroup: 3000 containers: - name: myapp - image: nginxinc/nginx-unprivileged:1.23.1 + image: nginxinc/nginx-unprivileged:1.25.3 imagePullPolicy: Always securityContext: runAsUser: 1000 diff --git a/tests/e2e-instrumentation/instrumentation-nginx/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx/01-install-app.yaml index a7d86790ee..13304afb75 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx/01-install-app.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx/01-install-app.yaml @@ -21,7 +21,7 @@ spec: fsGroup: 3000 containers: - name: myapp - image: nginxinc/nginx-unprivileged:1.23.1 + image: nginxinc/nginx-unprivileged:1.25.3 imagePullPolicy: Always securityContext: allowPrivilegeEscalation: false diff --git a/versions.txt b/versions.txt index 9611cde36c..6f0b7f998d 100644 --- a/versions.txt +++ b/versions.txt @@ -38,4 +38,4 @@ autoinstrumentation-apache-httpd=1.0.4 # Represents the current release of Apache Nginx instrumentation. # Should match autoinstrumentation/apache-httpd/version.txt -autoinstrumentation-nginx=1.0.3 +autoinstrumentation-nginx=1.0.4