Skip to content

Commit

Permalink
bump webserver to v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
akselleirv committed Dec 1, 2023
1 parent e5f6ebd commit 9e3aa13
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <config-file-dir-path>/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 <config-file-dir-path>/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
Expand Down
2 changes: 1 addition & 1 deletion autoinstrumentation/apache-httpd/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.3
1.0.4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ autoinstrumentation-go=v0.8.0-alpha

# Represents the current release of Apache HTTPD instrumentation.
# Should match autoinstrumentation/apache-httpd/version.txt
autoinstrumentation-apache-httpd=1.0.3
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

0 comments on commit 9e3aa13

Please sign in to comment.