Merge branch 'main' into two-step-release-process

mowies · web-flow · commit d4bcc8c0e6fd · 2025-07-24T16:23:05.000+02:00
diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml
@@ -29,8 +29,8 @@ on:
         type: string
 
 env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.0
 
 jobs:
   check-goreleaser:
diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml
@@ -22,8 +22,8 @@ on:
         default: false
 
 env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.0
 
 jobs:
   prepare:
diff --git a/.github/workflows/ci-builder.yaml b/.github/workflows/ci-builder.yaml
@@ -24,8 +24,8 @@ on:
       - "go.sum"
 
 env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.0
 
 jobs:
   check-goreleaser:
diff --git a/.github/workflows/ci-opampsupervisor.yaml b/.github/workflows/ci-opampsupervisor.yaml
@@ -22,8 +22,8 @@ on:
       - "go.sum"
 
 env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.0
 
 jobs:
   check-goreleaser:
diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml
@@ -5,8 +5,8 @@ on:
       - "v*"
 
 env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.0
 
 jobs:
   goreleaser:
diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml
@@ -5,8 +5,8 @@ on:
       - "v*"
 
 env:
-  # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro
-  GORELEASER_PRO_VERSION: v2.7.0
+  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  GORELEASER_PRO_VERSION: v2.11.0
 
 jobs:
   goreleaser:
diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -68,11 +68,11 @@ builds:
       path: artifacts/otelcol-contrib-windows_{{ .Target }}/otelcol-contrib.exe
 archives:
   - id: otelcol-contrib
+    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
     builds:
       - otelcol-contrib-linux
       - otelcol-contrib-darwin
       - otelcol-contrib-windows
-    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
   - package_name: otelcol-contrib
     contents:
@@ -93,14 +93,14 @@ nfpms:
         dependencies:
           - /bin/sh
     id: otelcol-contrib
-    builds:
-      - otelcol-contrib-linux
     formats:
       - deb
       - rpm
     maintainer: The OpenTelemetry Collector maintainers <cncf-opentelemetry-maintainers@lists.cncf.io>
     description: OpenTelemetry Collector - otelcol-contrib
     license: Apache 2.0
+    builds:
+      - otelcol-contrib-linux
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-contrib_checksums.txt'
 dockers:
diff --git a/distributions/otelcol-ebpf-profiler/.goreleaser.yaml b/distributions/otelcol-ebpf-profiler/.goreleaser.yaml
@@ -22,9 +22,9 @@ builds:
       - '{{ .Env.BUILD_FLAGS }}'
 archives:
   - id: otelcol-ebpf-profiler
+    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
     builds:
       - otelcol-ebpf-profiler-linux
-    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-ebpf-profiler_checksums.txt'
 dockers:
diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml
@@ -38,10 +38,10 @@ builds:
       - '{{ .Env.BUILD_FLAGS }}'
 archives:
   - id: otelcol-k8s
+    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
     builds:
       - otelcol-k8s-linux
       - otelcol-k8s-windows
-    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-k8s_checksums.txt'
 dockers:
diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml
@@ -62,11 +62,11 @@ builds:
       - '{{ .Env.BUILD_FLAGS }}'
 archives:
   - id: otelcol-otlp
+    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
     builds:
       - otelcol-otlp-linux
       - otelcol-otlp-darwin
       - otelcol-otlp-windows
-    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
   - package_name: otelcol-otlp
     contents:
@@ -84,14 +84,14 @@ nfpms:
         dependencies:
           - /bin/sh
     id: otelcol-otlp
-    builds:
-      - otelcol-otlp-linux
     formats:
       - deb
       - rpm
     maintainer: The OpenTelemetry Collector maintainers <cncf-opentelemetry-maintainers@lists.cncf.io>
     description: OpenTelemetry Collector - otelcol-otlp
     license: Apache 2.0
+    builds:
+      - otelcol-otlp-linux
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-otlp_checksums.txt'
 dockers:
diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml
@@ -63,11 +63,11 @@ builds:
       - '{{ .Env.BUILD_FLAGS }}'
 archives:
   - id: otelcol
+    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
     builds:
       - otelcol-linux
       - otelcol-darwin
       - otelcol-windows
-    name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
   - package_name: otelcol
     contents:
@@ -88,14 +88,14 @@ nfpms:
         dependencies:
           - /bin/sh
     id: otelcol
-    builds:
-      - otelcol-linux
     formats:
       - deb
       - rpm
     maintainer: The OpenTelemetry Collector maintainers <cncf-opentelemetry-maintainers@lists.cncf.io>
     description: OpenTelemetry Collector - otelcol
     license: Apache 2.0
+    builds:
+      - otelcol-linux
 checksum:
   name_template: '{{ .ProjectName }}_otelcol_checksums.txt'
 dockers:
diff --git a/docs/release.md b/docs/release.md
@@ -0,0 +1,54 @@
+# opentelemetry-collector-releases Release Procedure
+
+This document describes the steps to follow when doing a new release of the
+opentelemetry-collector-releases repository. This release depends on the [opentelemetry-collector release][1] and the [opentelemetry-collector-contrib release][2] repositories.
+
+For general information about all Collector repositories release procedures, see the
+[opentelemetry-collector release process documentation][1].
+
+## Releasing opentelemetry-collector-releases
+
+0. Ensure that the [opentelemetry-collector][1] and [opentelemetry-collector-contrib][2] release procedures have been followed and a new
+   opentelemetry-collector and opentelemetry-collector-contrib version have been released. The opentelemetry-collector-releases release
+   should be done after both of these releases.
+1. Run the GitHub Action workflow "[Update Version in Distributions and Prepare PR](https://github.com/open-telemetry/opentelemetry-collector-releases/actions/workflows/update-version.yaml)" which will update the minor version automatically (e.g. v0.116.0 -> v0.117.0) or manually provide a new version if releasing a bugfix or skipping a version. Select "create pr" option.
+The PR needs to be manually closed and re-opened once to trigger pipelines.
+   -  🛑 **Do not move forward until this PR is merged.** 🛑
+2. Check out main and ensure it has the "Update version from ..." commit in your local
+   copy by pulling in the latest from
+   `open-telemetry/opentelemetry-collector-releases`. Assuming your upstream
+   remote is named `upstream`, you can try running:
+   - `git checkout main && git fetch upstream && git rebase upstream/main`
+3. Create a tag for the new release version by running:
+   
+   ⚠️ If you set your remote using `https` you need to include `REMOTE=https://github.com/open-telemetry/opentelemetry-collector-releases.git` in each command. ⚠️
+   
+   - `make push-tags TAG=v0.85.0`
+4. Wait for the new tag build to pass successfully.
+5. Ensure the "Release Core", "Release Contrib", "Release k8s", "Release OTLP", "Release Builder" and "Release OpAMP Suporvisor" actions pass, this will
+    1. push new container images to `https://hub.docker.com/repository/docker/otel/opentelemetry-collector`, `https://hub.docker.com/repository/docker/otel/opentelemetry-collector-contrib` and `https://hub.docker.com/repository/docker/otel/opentelemetry-collector-k8s` as well as their respective counterparts on GHCR
+    2. create a Github release for the tag and push all the build artifacts to the Github release. See [example](https://github.com/open-telemetry/opentelemetry-collector-releases/actions/workflows/release-core.yaml).
+    3. build and release ocb and opampsupervisor binaries under a separate tagged Github release, e.g. `cmd/{builder,opampsupervisor}/v0.85.0`
+    4. build and push ocb and opampsupervisor Docker images to `https://hub.docker.com/r/otel/opentelemetry-collector-builder` and the GitHub Container Registry within the releases repository (and opampsupervisor respectively)
+6. Update the release notes with the CHANGELOG.md updates.
+
+## Post-release steps
+
+After the release is complete, the release manager should do the following steps:
+
+1. Create an issue or update existing issues for each problem encountered throughout the release in
+the opentelemetry-collector-releases repository and label them with the `release:retro` label.
+Communicate the list of issues to the core release manager.
+
+## Bugfix releases
+
+See the [opentelemetry-collector release procedure][1] document for the bugfix release criteria and
+process.
+
+## Release schedule and release manager rotation
+
+See the [opentelemetry-collector release procedure][1] document for the release schedule and release
+manager rotation.
+
+[1]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/release.md
+[2]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/docs/release.md
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-releases
 go 1.23
 
 require (
-	github.com/goreleaser/goreleaser-pro/v2 v2.7.0
+	github.com/goreleaser/goreleaser-pro/v2 v2.11.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/goreleaser/goreleaser-pro/v2 v2.7.0 h1:07p7y2N3chwz1MIs5HwnkTE/OUo63asEQeuPyVP6eag=
-github.com/goreleaser/goreleaser-pro/v2 v2.7.0/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc=
+github.com/goreleaser/goreleaser-pro/v2 v2.11.0 h1:2OahvDpYJHHuFyLsfPDZxXHEEsXtqvTJ/rJUIjYMQOI=
+github.com/goreleaser/goreleaser-pro/v2 v2.11.0/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
diff --git a/renovate.json b/renovate.json
@@ -138,25 +138,6 @@
       ],
       "enabled": false
     },
-    {
-      "matchManagers": [
-        "custom.regex"
-      ],
-      "matchPackageNames": [
-        "goreleaser/goreleaser-pro"
-      ],
-      "extractVersion": "^(?<version>.*)-pro$"
-    },
-    {
-      "matchManagers": [
-        "gomod"
-      ],
-      "matchPackageNames": [
-        "github.com/goreleaser/goreleaser-pro/v2",
-        "github.com/goreleaser/goreleaser-pro"
-      ],
-      "versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?-(?<compatibility>.*)$"
-    },
     {
       "matchPackageNames": [
         "goreleaser/goreleaser-pro",
@@ -166,6 +147,21 @@
       "groupName": "GoReleaser Pro"
     }
   ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "managerFilePatterns": [
+        "/(^|\\/)Makefile$/",
+        "/(^|\\/)Dockerfile/",
+        "/(^|\\/).*\\.ya?ml$/",
+        "/(^|\\/).*\\.toml$/",
+        "/(^|\\/).*\\.sh$/"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.+?) depName=(?<depName>.+?)\\s.*(:|=|\\?=|:=|\\+=) ?\\\"?(?<currentValue>.+?)?\\\"?\\s"
+      ]
+    }
+  ],
   "prConcurrentLimit": 200,
   "suppressNotifications": [
     "prEditedNotification"
