Merged main

.chloggen/feat_drop-lease-on-exit.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: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Release leader election lease on exit
+
+# One or more tracking issues related to the change
+issues: [3058]
+
+# (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:

.chloggen/fix-otelcol-crd.yaml

@@ -0,0 +1,18 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# 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: collector
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Fix deletion issue of `otelcol` CR by making `spec.config.service.pipelines.processors` optional"
+
+# One or more tracking issues related to the change
+issues: [3075]
+
+# (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: |
+  This change makes `spec.config.service.pipelines.processors` in `OpenTelemetryCollector` CRD optional, aligning with OTel Collector best practices. It resolves deletion issues by providing flexibility in CRD configuration, addressing conflicts between strict validation and practical uses.
+  Note: Updating the `opentelemetrycollectors.opentelemetry.io` CRD resource is required.

.chloggen/implement-dnsconfig.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: collector, target allocator, opamp
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Enabling PodDnsConfig for OpenTelemetry Collector, TargetAllocator and OpAMPBridge.
+
+# One or more tracking issues related to the change
+issues: [2658]
+
+# (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:

.chloggen/make-otelcol-mode-immutable.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: collector
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Make the `spec.mode` field of the `OpenTelemetryCollector` Custom Resource (CR) immutable"
+
+# One or more tracking issues related to the change
+issues: [3055]
+
+# (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:

.github/workflows/e2e.yaml

@@ -60,7 +60,7 @@ jobs:
         path: bin
         key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
     - name: Install chainsaw
-      uses: kyverno/action-install-chainsaw@v0.2.4
+      uses: kyverno/action-install-chainsaw@v0.2.5
     - name: Install tools
       run: make install-tools
     - name: Prepare e2e tests

.github/workflows/publish-autoinstrumentation-apache-httpd.yaml

@@ -57,7 +57,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: autoinstrumentation/apache-httpd
           platforms: linux/amd64

.github/workflows/publish-autoinstrumentation-dotnet.yaml

@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: autoinstrumentation/dotnet
           platforms: linux/amd64,linux/arm64

.github/workflows/publish-autoinstrumentation-java.yaml

@@ -68,7 +68,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: autoinstrumentation/java
           platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le

.github/workflows/publish-autoinstrumentation-nodejs.yaml

@@ -68,7 +68,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: autoinstrumentation/nodejs
           platforms: linux/amd64,linux/arm64

.github/workflows/publish-autoinstrumentation-python.yaml

@@ -68,7 +68,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: autoinstrumentation/python
           platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le

.github/workflows/publish-images.yaml

@@ -19,12 +19,12 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.21.3'
+          go-version: '~1.22.4'
 
-      - name: Unshallow 
+      - name: Unshallow
         run: git fetch --prune --unshallow
 
-      - name: Describe the current state 
+      - name: Describe the current state
         run: git describe --tags
 
       - name: Set env vars for the job
@@ -41,15 +41,15 @@ jobs:
           grep -v '\#' versions.txt | grep autoinstrumentation-nginx | awk -F= '{print "AUTO_INSTRUMENTATION_NGINX_VERSION="$2}' >> $GITHUB_ENV
           echo "VERSION_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
           echo "VERSION=$(git describe --tags | sed 's/^v//')" >> $GITHUB_ENV
-      
+
       - name: Build the binary for each supported architecture
         run: |
           for platform in $(echo $PLATFORMS | tr "," "\n"); do
             arch=${platform#*/}
             echo "Building manager for $arch"
             make manager ARCH=$arch
           done
-        
+
       - name: Docker meta
         id: docker_meta
         uses: docker/metadata-action@v5
@@ -93,7 +93,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Operator image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile

.github/workflows/publish-operator-bundle.yaml

@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Operator image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./bundle.Dockerfile

.github/workflows/publish-operator-opamp-bridge.yaml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      
+
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.21.3'
+          go-version: '~1.22.4'
 
       # TODO: We're currently not using this. Should we?
       - name: Read version
@@ -82,7 +82,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: cmd/operator-opamp-bridge
           platforms: ${{ env.PLATFORMS }}

.github/workflows/publish-target-allocator.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.21.3'
+          go-version: '~1.22.4'
 
       # TODO: We're currently not using this. Should we?
       - name: Read version
@@ -82,7 +82,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: cmd/otel-allocator
           platforms: ${{ env.PLATFORMS }}

.github/workflows/publish-test-e2e-images.yaml

@@ -0,0 +1,55 @@
+name: "Publish Test E2E images"
+
+on:
+  push:
+    paths:
+      - 'tests/test-e2e-apps/**'
+      - '.github/workflows/publish-test-e2e-images.yaml'
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'tests/test-e2e-apps/**'
+      - '.github/workflows/publish-test-e2e-images.yaml'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  bridge-server:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: bridge-server
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  golang:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: golang
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  python:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: python
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  java:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: java
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  apache-httpd:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: apache-httpd
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  dotnet:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: dotnet
+      platforms: linux/arm64,linux/amd64
+  nodejs:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: nodejs
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le

.github/workflows/reusable-operator-hub-release.yaml

@@ -70,7 +70,7 @@ jobs:
           message="Update the opentelemetry to $VERSION"
           body="Release opentelemetry-operator \`$VERSION\`.
 
-          cc @pavolloffay @frzifus @yuriolisa @jaronoff97 @TylerHelmuth @swiatekm-sumo
+          cc @pavolloffay @frzifus @yuriolisa @jaronoff97 @TylerHelmuth @swiatekm
           "
           branch="update-opentelemetry-operator-to-${VERSION}"
 

.github/workflows/reusable-publish-autoinstrumentation-e2e-images.yaml → .github/workflows/reusable-publish-test-e2e-images.yaml

@@ -3,7 +3,7 @@ name: Reusable - Publish autoinstrumentation E2E images
 on:
   workflow_call:
     inputs:
-      language:
+      path:
         type: string
         required: true
       platforms:
@@ -22,7 +22,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-${{ inputs.language }}
+            ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-${{ inputs.path }}
           tags: |
             type=ref,event=branch
 
@@ -48,10 +48,10 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           tags: ${{ steps.meta.outputs.tags }}
-          context: tests/instrumentation-e2e-apps/${{ inputs.language }}
+          context: tests/test-e2e-apps/${{ inputs.path }}
           platforms: ${{ inputs.platforms }}
           push: ${{ github.event_name == 'push' }}
           cache-from: type=local,src=/tmp/.buildx-cache

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 <!-- next version -->
 
+## 0.103.0
+
+### 💡 Enhancements 💡
+
+- `collector, target allocator, opamp`: Require Go 1.22 for building the operator (#2757)
+
+### 🧰 Bug fixes 🧰
+
+- `auto-instrumentation`: Fix webserver instrumentation log file name (#2978)
+
+  Since webserver instrumentation 1.0.4, the configuration log file has been renamed from appdynamics_sdk_log4cxx.xml.template to opentelemetry_sdk_log4cxx.xml.template. The operator upgraded the webserver instrumentation version but haven't change the configuration file name.
+- `target-allocator`: Fixes a bug that didn't automatically create a PDB for a TA with per-node strategy (#2900)
+
+### Components
+
+* [OpenTelemetry Collector - v0.103.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.103.0)
+* [OpenTelemetry Contrib - v0.103.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.103.0)
+* [Java auto-instrumentation - v1.32.1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.32.1)
+* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
+* [Node.JS - v0.51.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.51.0)
+* [Python - v0.46b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.46b0)
+* [Go - v0.13.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.13.0-alpha)
+* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+
 ## 0.102.0
 
 ### 💡 Enhancements 💡