Merge branch 'main' into renovate-collector-integration

mowies · mowies · commit dd1983cfbdb6 · 2025-09-16T11:36:37.000+02:00
# Conflicts:
#	.github/workflows/base-binary-release.yaml
#	.github/workflows/base-ci-binary.yaml
#	.github/workflows/base-ci-goreleaser.yaml
#	.github/workflows/base-release.yaml
diff --git a/.github/workflows/base-binary-release.yaml b/.github/workflows/base-binary-release.yaml
@@ -19,7 +19,10 @@ on:
 
 env:
   # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.11.2
+  GORELEASER_PRO_VERSION: v2.12.0
+
+permissions:
+  contents: read
 
 jobs:
   goreleaser:
diff --git a/.github/workflows/base-ci-binary.yaml b/.github/workflows/base-ci-binary.yaml
@@ -18,9 +18,12 @@ on:
         default: ""
         description: "The collector dependency will be put into this folder"
 
+permissions:
+  contents: read
+
 env:
   # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.11.2
+  GORELEASER_PRO_VERSION: v2.12.0
 
 jobs:
   check-goreleaser:
diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml
@@ -37,7 +37,7 @@ permissions:
 
 env:
   # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.11.2
+  GORELEASER_PRO_VERSION: v2.12.0
 
 jobs:
   check-goreleaser:
diff --git a/.github/workflows/base-package-tests.yaml b/.github/workflows/base-package-tests.yaml
@@ -15,6 +15,9 @@ on:
         default: false
         description: "Set to true if a GH issue should be generated upon failure"
 
+permissions:
+  contents: read
+
 jobs:
   package-tests:
     name: Package Tests
diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml
@@ -26,7 +26,7 @@ permissions:
 
 env:
   # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.11.2
+  GORELEASER_PRO_VERSION: v2.12.0
 
 jobs:
   prev-tag:
@@ -170,6 +170,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COSIGN_YES: true
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+          GORELEASER_CURRENT_TAG: ${{ github.ref_name }}
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -12,6 +12,9 @@ on:
       - main
       - release/*
 
+permissions:
+  contents: read
+
 env:
   # Make sure to exit early if cache segment download times out after 2 minutes.
   # We limit cache download as a whole to 5 minutes.
diff --git a/.github/workflows/ci-builder.yaml b/.github/workflows/ci-builder.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   ci:
     uses: ./.github/workflows/base-ci-binary.yaml
diff --git a/.github/workflows/ci-goreleaser-contrib.yaml b/.github/workflows/ci-goreleaser-contrib.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser:
     name: CI - Contrib - GoReleaser
diff --git a/.github/workflows/ci-goreleaser-core.yaml b/.github/workflows/ci-goreleaser-core.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser:
     name: CI - Core - GoReleaser
diff --git a/.github/workflows/ci-goreleaser-ebpf-profiler.yaml b/.github/workflows/ci-goreleaser-ebpf-profiler.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser-amd64:
     name: CI - eBPF Profiler - GoReleaser
diff --git a/.github/workflows/ci-goreleaser-k8s.yaml b/.github/workflows/ci-goreleaser-k8s.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser:
     name: CI - k8s - GoReleaser
diff --git a/.github/workflows/ci-goreleaser-otlp.yaml b/.github/workflows/ci-goreleaser-otlp.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser:
     name: CI - OTLP - GoReleaser
diff --git a/.github/workflows/ci-opampsupervisor.yaml b/.github/workflows/ci-opampsupervisor.yaml
@@ -27,6 +27,9 @@ on:
       - "go.mod"
       - "go.sum"
 
+permissions:
+  contents: read
+
 jobs:
   ci:
     uses: ./.github/workflows/base-ci-binary.yaml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,6 +11,9 @@ on:
       - main
       - release/*
 
+permissions:
+  contents: read
+
 jobs:
   build:
     name: Build
diff --git a/.github/workflows/msi-tests.yaml b/.github/workflows/msi-tests.yaml
@@ -10,6 +10,9 @@ on:
         required: true
         type: string
 
+permissions:
+  contents: read
+
 jobs:
   msi-tests:
     name: MSI Tests
diff --git a/.github/workflows/package-test.yaml b/.github/workflows/package-test.yaml
@@ -4,6 +4,9 @@ on:
   schedule:
     - cron: "0 2 * * *" # every day at 2am UTC
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser:
     name: Build - Contrib - GoReleaser
diff --git a/.github/workflows/regression-tests.yaml b/.github/workflows/regression-tests.yaml
@@ -7,6 +7,9 @@ on:
       - main
       - release/*
 
+permissions:
+  contents: read
+
 jobs:
   check-goreleaser:
     name: Check docker token
diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release Builder
diff --git a/.github/workflows/release-contrib.yaml b/.github/workflows/release-contrib.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release Contrib
diff --git a/.github/workflows/release-core.yaml b/.github/workflows/release-core.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release Core
diff --git a/.github/workflows/release-ebpf-profiler.yaml b/.github/workflows/release-ebpf-profiler.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release eBPF Profiler
diff --git a/.github/workflows/release-k8s.yaml b/.github/workflows/release-k8s.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release k8s
diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release OpAMP supervisor
diff --git a/.github/workflows/release-otlp.yaml b/.github/workflows/release-otlp.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["v*"]
 
+permissions:
+  contents: read
+
 jobs:
   release:
     name: Release OTLP
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -10,6 +10,9 @@ on:
       - main
       - release/*
 
+permissions:
+  contents: read
+
 jobs:
   shellcheck:
     name: Shellcheck
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -10,8 +10,8 @@ permissions:
 jobs:
   stale:
     permissions:
-      issues: write  # for actions/stale to close stale issues
-      pull-requests: write  # for actions/stale to close stale PRs
+      issues: write # for actions/stale to close stale issues
+      pull-requests: write # for actions/stale to close stale PRs
     runs-on: ubuntu-24.04
     env:
       GH_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/update-version.yaml b/.github/workflows/update-version.yaml
@@ -15,6 +15,9 @@ on:
         required: false
         default: ''
 
+permissions:
+  contents: read
+
 jobs:
   update-version:
     runs-on: ubuntu-24.04
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 <!-- next version -->
 
+## v0.135.0
+
+## v0.134.0
+
 ## v0.133.0
 
 ### 🚩 Deprecations 🚩
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ GORELEASER ?= goreleaser
 
 # SRC_ROOT is the top of the source tree.
 SRC_ROOT := $(shell git rev-parse --show-toplevel)
-OTELCOL_BUILDER_VERSION ?= 0.133.0
+OTELCOL_BUILDER_VERSION ?= 0.135.0
 OTELCOL_BUILDER_DIR ?= ${HOME}/bin
 OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
 
diff --git a/cmd/goreleaser/main.go b/cmd/goreleaser/main.go
@@ -19,9 +19,8 @@ import (
 	"log"
 	"os"
 
-	"gopkg.in/yaml.v3"
-
 	"github.com/open-telemetry/opentelemetry-collector-releases/cmd/goreleaser/internal"
+	"go.yaml.in/yaml/v3"
 )
 
 var (
diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml
diff --git a/distributions/otelcol-ebpf-profiler/Dockerfile b/distributions/otelcol-ebpf-profiler/Dockerfile
diff --git a/distributions/otelcol-ebpf-profiler/manifest.yaml b/distributions/otelcol-ebpf-profiler/manifest.yaml
diff --git a/distributions/otelcol-k8s/manifest.yaml b/distributions/otelcol-k8s/manifest.yaml
diff --git a/distributions/otelcol-otlp/manifest.yaml b/distributions/otelcol-otlp/manifest.yaml
diff --git a/distributions/otelcol/manifest.yaml b/distributions/otelcol/manifest.yaml
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
diff --git a/internal/tools/go.sum b/internal/tools/go.sum
diff --git a/scripts/package-tests/Dockerfile.test.deb b/scripts/package-tests/Dockerfile.test.deb
diff --git a/tests/golden/docker-compose.yaml b/tests/golden/docker-compose.yaml
