diff --git a/.chloggen/bump-apache-httpd.yaml b/.chloggen/bump-apache-httpd.yaml new file mode 100644 index 0000000000..bbeaa27a74 --- /dev/null +++ b/.chloggen/bump-apache-httpd.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action) +component: auto-instrumentation + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Bump Apache httpd version + +# One or more tracking issues related to the change +issues: [3487] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/README.md b/README.md index 6244ab90cf..5f417b1420 100644 --- a/README.md +++ b/README.md @@ -549,7 +549,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.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 /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/autoinstrumentation/apache-httpd/Dockerfile b/autoinstrumentation/apache-httpd/Dockerfile index 14d70d048d..80167f918f 100644 --- a/autoinstrumentation/apache-httpd/Dockerfile +++ b/autoinstrumentation/apache-httpd/Dockerfile @@ -1,8 +1,8 @@ ############################ -# STEP 1 download the webserver agent +# STEP 1 download the webserver agent ############################ -FROM alpine:latest as agent +FROM alpine:latest AS agent ARG version @@ -11,10 +11,10 @@ WORKDIR /opt/opentelemetry RUN mkdir agent RUN wget -c https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/download/webserver%2Fv$version/opentelemetry-webserver-sdk-x64-linux.tgz -RUN unzip -p opentelemetry-webserver-sdk-x64-linux.tgz | tar -zx -C agent +RUN tar -xvf opentelemetry-webserver-sdk-x64-linux.tgz -C agent ############################ -# STEP 2 download the webserver agent +# STEP 2 download the webserver agent ############################ FROM alpine:latest diff --git a/autoinstrumentation/apache-httpd/version.txt b/autoinstrumentation/apache-httpd/version.txt index a6a3a43c3a..1cc5f657e0 100644 --- a/autoinstrumentation/apache-httpd/version.txt +++ b/autoinstrumentation/apache-httpd/version.txt @@ -1 +1 @@ -1.0.4 \ No newline at end of file +1.1.0 \ No newline at end of file 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 d1ae0e239f..a716698c1f 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.25.3 + image: nginxinc/nginx-unprivileged:1.26.0 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 3a50ecd54d..bd4a6d8ac6 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.25.3 + image: nginxinc/nginx-unprivileged:1.26.0 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 0f2b3a828b..952ef85895 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.25.3 + image: nginxinc/nginx-unprivileged:1.26.0 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 3ca305fa63..d59a8d55d1 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.25.3 + image: nginxinc/nginx-unprivileged:1.26.0 imagePullPolicy: Always securityContext: allowPrivilegeEscalation: false diff --git a/versions.txt b/versions.txt index 0820a83d2a..4951b3874f 100644 --- a/versions.txt +++ b/versions.txt @@ -34,8 +34,8 @@ autoinstrumentation-go=v0.17.0-alpha # Represents the current release of Apache HTTPD instrumentation. # Should match autoinstrumentation/apache-httpd/version.txt -autoinstrumentation-apache-httpd=1.0.4 +autoinstrumentation-apache-httpd=1.1.0 # Represents the current release of Apache Nginx instrumentation. # Should match autoinstrumentation/apache-httpd/version.txt -autoinstrumentation-nginx=1.0.4 +autoinstrumentation-nginx=1.1.0