Skip to content

Commit 8ac53a1

Browse files
committed
feat: bump apache httpd and nginx to latest version
Signed-off-by: David van der Spek <[email protected]>
1 parent 8483bfe commit 8ac53a1

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

.chloggen/bump-apache-httpd.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: auto-instrumentation
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Bump Apache httpd version
9+
10+
# One or more tracking issues related to the change
11+
issues: [3487]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ List of all available attributes can be found at [otel-webserver-module](https:/
549549

550550
#### Using Nginx autoinstrumentation
551551

552-
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:
552+
For `Nginx` autoinstrumentation, Nginx versions 1.22.0, 1.23.0, 1.23.1, 1.24.0, 1.25.3, 1.25.5, and 1.26.0 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:
553553

554554
```yaml
555555
apiVersion: opentelemetry.io/v1alpha1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.4
1+
1.1.0

versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ autoinstrumentation-go=v0.17.0-alpha
3434

3535
# Represents the current release of Apache HTTPD instrumentation.
3636
# Should match autoinstrumentation/apache-httpd/version.txt
37-
autoinstrumentation-apache-httpd=1.0.4
37+
autoinstrumentation-apache-httpd=1.1.0
3838

3939
# Represents the current release of Apache Nginx instrumentation.
4040
# Should match autoinstrumentation/apache-httpd/version.txt
41-
autoinstrumentation-nginx=1.0.4
41+
autoinstrumentation-nginx=1.1.0

0 commit comments

Comments
 (0)