[chore] Use renovate to update collector components (#1087)

* [chore] use renovate to update collector components

* update release doc

* add note on manual renovate triggers

* combine core and contrib components

* try out builtin manager

Author: mowies

.github/workflows/base-binary-release.yaml

@@ -18,7 +18,7 @@ on:
         description: "The collector dependency will be put into this folder"
 
 env:
-  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
   GORELEASER_PRO_VERSION: v2.12.1
 
 permissions:

.github/workflows/base-ci-binary.yaml

@@ -22,7 +22,7 @@ permissions:
   contents: read
 
 env:
-  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
   GORELEASER_PRO_VERSION: v2.12.1
 
 jobs:

.github/workflows/base-ci-goreleaser.yaml

@@ -36,7 +36,7 @@ permissions:
   contents: read
 
 env:
-  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
   GORELEASER_PRO_VERSION: v2.12.1
 
 jobs:

.github/workflows/base-release.yaml

@@ -25,7 +25,7 @@ permissions:
   contents: read
 
 env:
-  # renovate: datasource=github-releases depName=goreleaser/goreleaser-pro
+  # renovate: datasource=github-releases packageName=goreleaser/goreleaser-pro
   GORELEASER_PRO_VERSION: v2.12.1
 
 jobs:

.github/workflows/scripts/bump-versions.sh

@@ -139,11 +139,6 @@ if [ -n "$current_stable" ] && [ -z "$next_stable_core" ]; then
   next_stable_core=$(bump_version "$current_stable")
 fi
 
-# add escape characters to the current versions to work with sed
-escaped_current_beta_core=${current_beta_core//./\\.}
-escaped_current_beta_contrib=${current_beta_contrib//./\\.}
-escaped_current_stable=${current_stable//./\\.}
-
 # Update versions in each manifest file
 echo "Making the following updates:"
 echo "  - core beta module set from $current_beta_core to $next_beta_core"
@@ -152,23 +147,13 @@ echo "  - contrib beta module set from $current_beta_contrib to $next_beta_contr
 echo "  - distribution version to $next_distribution_version"
 for file in "${manifest_files[@]}"; do
   if [ -f "$file" ]; then
-    sed "s/\(^.*go\.opentelemetry\.io\/collector\/.*\) v$escaped_current_beta_core/\1 v$next_beta_core/" "$file" > "$file.tmp"
-    mv "$file.tmp" "$file"
-    sed "s/\(^.*github\.com\/open-telemetry\/opentelemetry-collector-contrib\/.*\) v$escaped_current_beta_contrib/\1 v$next_beta_contrib/" "$file" > "$file.tmp"
-    mv "$file.tmp" "$file"
-    sed "s/\(^.*go\.opentelemetry\.io\/collector\/.*\) v$escaped_current_stable/\1 v$next_stable_core/" "$file" > "$file.tmp"
-    mv "$file.tmp" "$file"
     sed "s/version: .*/version: $next_distribution_version/" "$file" > "$file.tmp"
     mv "$file.tmp" "$file"
   else
     echo "File $file does not exist"
   fi
 done
 
-# Update Makefile OCB version
-sed "s/OTELCOL_BUILDER_VERSION ?= $escaped_current_beta_core/OTELCOL_BUILDER_VERSION ?= $next_beta_core/" Makefile > Makefile.tmp
-mv Makefile.tmp Makefile
-
 echo "Version update completed."
 
 # Make a new changelog update

docs/release.md

@@ -11,26 +11,27 @@ For general information about all Collector repositories release procedures, see
 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.
+1. Review and merge the 2 Renovate PRs for core and contrib components, including OCB. If they were not created or updated yet, you can go to the **Dependency Dashboard** GitHub issue and check the boxes for the updates or for a manual Renovate run to expedite the process.
+2. 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
+3. 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:
+4. 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
+5. Wait for the new tag build to pass successfully.
+6. 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.
+7. Update the release notes with the CHANGELOG.md updates.
 
 ## Post-release steps
 

renovate.json

@@ -14,6 +14,9 @@
     "config:best-practices",
     "helpers:pinGitHubActionDigestsToSemver"
   ],
+  "ocb": {
+    "managerFilePatterns": ["/(^|\\/)manifest.ya?ml$/"]
+  },
   "packageRules": [
     {
       "matchManagers": [
@@ -98,15 +101,6 @@
         "golang.org/x{/,}**"
       ]
     },
-    {
-      "matchManagers": [
-        "gomod"
-      ],
-      "groupName": "All go.opentelemetry.io/collector packages",
-      "matchPackageNames": [
-        "go.opentelemetry.io/collector{/,}**"
-      ]
-    },
     {
       "matchManagers": [
         "gomod"
@@ -145,6 +139,15 @@
         "github.com/goreleaser/goreleaser-pro"
       ],
       "groupName": "GoReleaser Pro"
+    },
+    {
+      "matchPackageNames": [
+        "open-telemetry/opentelemetry-collector",
+        "/^go\\.opentelemetry\\.io/collector//",
+        "open-telemetry/opentelemetry-collector-contrib",
+        "/^github\\.com/open-telemetry/opentelemetry-collector-contrib//"
+      ],
+      "groupName": "OpenTelemetry Collector Components"
     }
   ],
   "customManagers": [
@@ -158,7 +161,7 @@
         "/(^|\\/).*\\.sh$/"
       ],
       "matchStrings": [
-        "# renovate: datasource=(?<datasource>.+?) depName=(?<depName>.+?)\\s.*(:|=|\\?=|:=|\\+=) ?\\\"?(?<currentValue>.+?)?\\\"?\\s"
+        "# renovate: datasource=(?<datasource>.+?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)\\s.*(:|=|\\?=|:=|\\+=) ?\\\"?(?<currentValue>.+?)?\\\"?\\s"
       ]
     }
   ],