Prepare release prs/0.76.0

.github/workflows/prepare-release.yml

@@ -6,15 +6,13 @@ on:
     # the minor version number and set the patch number to 0.
     inputs:
       candidate-stable:
-        required: true
         description: Release candidate version (stable, like 1.0.0-rc4)
 
       current-stable:
         required: true
         description: Current version (stable, like 1.0.0-rc3)
 
       candidate-beta:
-        required: true
         description: Release candidate version (beta, like 0.70.0)
 
       current-beta:
@@ -26,16 +24,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # To keep track of the progress, it might be helpful to create a tracking issue similar to #6067. You are responsible
-      # for all of the steps under the "Performed by collector release manager" heading. Once the issue is created, you can
-      # create the individual ones by hovering them and clicking the "Convert to issue" button on the right hand side.
-      - name: Create issue for tracking release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CANDIDATE_BETA: ${{ inputs.candidate-beta }}
-          CANDIDATE_STABLE: ${{ inputs.candidate-stable }}
-          REPO: open-telemetry/opentelemetry-collector
-        run: ./.github/workflows/scripts/release-create-tracking-issue.sh
+        with:
+          fetch-depth: 0
       # Make sure that there are no open issues with release:blocker label in Core. The release has to be delayed until they are resolved.
       - name: Check blockers in core
         env:
@@ -77,3 +67,15 @@ jobs:
           CURRENT_BETA: ${{ inputs.current-beta }}
           CURRENT_STABLE: ${{ inputs.current-stable }}
         run: ./.github/workflows/scripts/release-prepare-release.sh
+      # To keep track of the progress, it might be helpful to create a tracking issue similar to #6067. You are responsible
+      # for all of the steps under the "Performed by collector release manager" heading. Once the issue is created, you can
+      # create the individual ones by hovering them and clicking the "Convert to issue" button on the right hand side.
+      - name: Create issue for tracking release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CANDIDATE_BETA: ${{ inputs.candidate-beta }}
+          CANDIDATE_STABLE: ${{ inputs.candidate-stable }}
+          CURRENT_BETA: ${{ inputs.current-beta }}
+          CURRENT_STABLE: ${{ inputs.current-stable }}
+          REPO: open-telemetry/opentelemetry-collector
+        run: ./.github/workflows/scripts/release-create-tracking-issue.sh

.github/workflows/scripts/release-create-tracking-issue.sh

@@ -1,19 +1,24 @@
 #!/bin/bash -ex
 
-EXISTING_ISSUE=$( gh issue list --search "Release v${CANDIDATE_BETA}/v${CANDIDATE_STABLE}" --json url --jq '.[].url' --repo "${REPO}" )
+RELEASE_VERSION=v${CANDIDATE_STABLE}/v${CANDIDATE_BETA}
+if [ "${CANDIDATE_STABLE}" == "" ]; then
+    RELEASE_VERSION=v${CURRENT_STABLE}/v${CANDIDATE_BETA}
+elif [ "${CANDIDATE_BETA}" == "" ]; then
+    RELEASE_VERSION=v${CANDIDATE_STABLE}/v${CURRENT_BETA}
+fi
+
+EXISTING_ISSUE=$( gh issue list --search "Release ${RELEASE_VERSION}" --json url --jq '.[].url' --repo "${REPO}" )
 
 if [ "${EXISTING_ISSUE}" != "" ]; then
     echo "Issue already exists: ${EXISTING_ISSUE}"
     exit 0
 fi
 
-gh issue create -a "${GITHUB_ACTOR}" --repo "${REPO}" --label release --title "Release v${CANDIDATE_BETA}/v${CANDIDATE_STABLE}" --body "Like #4522, but for v${CANDIDATE_BETA}/v${CANDIDATE_STABLE}
+gh issue create -a "${GITHUB_ACTOR}" --repo "${REPO}" --label release --title "Release ${RELEASE_VERSION}" --body "Like #4522, but for ${RELEASE_VERSION}
 **Performed by collector release manager**
 
-- [ ] Prepare stable core release v${CANDIDATE_STABLE}
-- [ ] Prepare beta core release v${CANDIDATE_BETA}
-- [ ] Tag and release stable core v${CANDIDATE_STABLE}
-- [ ] Tag and release beta core v${CANDIDATE_BETA}
+- [ ] Prepare core release ${RELEASE_VERSION}
+- [ ] Tag and release core ${RELEASE_VERSION}
 - [ ] Prepare contrib release v${CANDIDATE_BETA}
 - [ ] Tag and release contrib v${CANDIDATE_BETA}
 - [ ] Prepare otelcol-releases v${CANDIDATE_BETA}

.github/workflows/scripts/release-prepare-release.sh

@@ -1,20 +1,36 @@
 #!/bin/bash -ex
 
-make chlog-update VERSION="v${CANDIDATE_STABLE}/v${CANDIDATE_BETA}"
+if [ "${CANDIDATE_STABLE}" == "" ] && [ "${CANDIDATE_BETA}" == "" ]; then
+    echo "One of CANDIDATE_STABLE or CANDIDATE_BETA must be set"
+    exit 1
+fi
+
+RELEASE_VERSION=v${CANDIDATE_STABLE}/v${CANDIDATE_BETA}
+if [ "${CANDIDATE_STABLE}" == "" ]; then
+    RELEASE_VERSION=v${CURRENT_STABLE}/v${CANDIDATE_BETA}
+elif [ "${CANDIDATE_BETA}" == "" ]; then
+    RELEASE_VERSION=v${CANDIDATE_STABLE}/v${CURRENT_BETA}
+fi
+
+make chlog-update VERSION="${RELEASE_VERSION}"
 git config user.name opentelemetrybot
 git config user.email [email protected]
-BRANCH="prepare-release-prs/${CANDIDATE_BETA}-${CANDIDATE_STABLE}"
+BRANCH="prepare-release-prs/${CANDIDATE_BETA}"
 git checkout -b "${BRANCH}"
 git add --all
-git commit -m "Changelog update ${CANDIDATE_BETA}/${CANDIDATE_STABLE}"
+git commit -m "Changelog update ${RELEASE_VERSION}"
 
-make prepare-release GH=none PREVIOUS_VERSION="${CURRENT_STABLE}" RELEASE_CANDIDATE="${CANDIDATE_STABLE}" MODSET=stable
-make prepare-release GH=none PREVIOUS_VERSION="${CURRENT_BETA}" RELEASE_CANDIDATE="${CANDIDATE_BETA}" MODSET=beta
+if [ "${CANDIDATE_STABLE}" != "" ]; then
+    make prepare-release GH=none PREVIOUS_VERSION="${CURRENT_STABLE}" RELEASE_CANDIDATE="${CANDIDATE_STABLE}" MODSET=stable
+fi
+if [ "${CANDIDATE_BETA}" != "" ]; then
+    make prepare-release GH=none PREVIOUS_VERSION="${CURRENT_BETA}" RELEASE_CANDIDATE="${CANDIDATE_BETA}" MODSET=beta
+fi
 git push origin "${BRANCH}"
 
-gh pr create --title "[chore] Prepare release ${CANDIDATE_BETA}/${CANDIDATE_STABLE}" --body "
+gh pr create --title "[chore] Prepare release ${RELEASE_VERSION}" --body "
 The following commands were run to prepare this release:
-- make chlog-update VERSION=v${CANDIDATE_BETA}/v${CANDIDATE_STABLE}
+- make chlog-update VERSION=${RELEASE_VERSION}
 - make prepare-release GH=none PREVIOUS_VERSION=${CURRENT_STABLE} RELEASE_CANDIDATE=${CANDIDATE_STABLE} MODSET=stable
 - make prepare-release GH=none PREVIOUS_VERSION=${CURRENT_BETA} RELEASE_CANDIDATE=${CANDIDATE_BETA} MODSET=beta
 "

CHANGELOG.md

@@ -4,6 +4,38 @@
 
 <!-- next version -->
 
+## v1.0.0-rc9/v0.76.0
+
+### 🛑 Breaking changes 🛑
+
+- `confmap`: Using an Invalid Scheme in a URI will throw an error. (#7504)
+
+### 🚩 Deprecations 🚩
+
+- `featuregate`: Deprecate Gate.RemovalVersion and WithRegisterRemovalVersion in favor of ToVersion. (#7043)
+
+### 💡 Enhancements 💡
+
+- `batchprocessor`: Support zero timeout. (#7508)
+  This allows the batchprocessor to limit request sizes without introducing delay in a pipeline, to act only as a splitter.
+- `service`: use the otel opencensus bridge when telemetry.useOtelForInternalMetrics is enabled (#7483)
+- `connector`: Mark 'service.connectors' featuregate as stable (#2336)
+- `featuregate`: Add a new Deprecated stage for feature gates, when features are abandoned. (#7043)
+- `loggingexporter`: Show more counters in not detailed verbosity (#7461)
+  The logging exporter now shows more counters when the verbosity is not detailed. The following numbers are added:
+  - Number of resource logs
+  - Number of resource spans
+  - Number of resource metrics
+  - Number of data points
+
+- `configtls`: Reload mTLS ClientCA certificates on file change (#6524)
+- `confmap`: Add support for nested URIs. (#7117)
+- `featuregate`: Add concept of gate lifetime, [fromVersion, toVersion]. (#7043)
+
+### 🧰 Bug fixes 🧰
+
+- `obsreport`: fix issue where send_failed_requests counter was reporting an incorrect value. (#7456)
+
 ## v1.0.0-rc9/v0.75.0
 
 ### 🛑 Breaking changes 🛑

Makefile

@@ -377,6 +377,36 @@ push-tags: $(MULTIMOD)
 		git push ${REMOTE} $${tag}; \
 	done;
 
+.PHONY: check-changes
+check-changes: $(YQ)
+ifndef MODSET
+	@echo "MODSET not defined"
+	@echo "usage: make check-changes PREVIOUS_VERSION=<version eg 0.52.0> MODSET=beta"
+	exit 1
+endif
+ifndef PREVIOUS_VERSION
+	@echo "PREVIOUS_VERSION not defined"
+	@echo "usage: make check-changes PREVIOUS_VERSION=<version eg 0.52.0> MODSET=beta"
+	exit 1
+endif
+	@all_submods=$$($(YQ) e '.module-sets.*.modules[] | select(. != "go.opentelemetry.io/collector")' versions.yaml | sed 's/^go\.opentelemetry\.io\/collector\///'); \
+	mods=$$($(YQ) e '.module-sets.$(MODSET).modules[]' versions.yaml | sed 's/^go\.opentelemetry\.io\/collector\///'); \
+	changed_files=""; \
+	for mod in $${mods}; do \
+		if [ "$${mod}" == "go.opentelemetry.io/collector" ]; then \
+			changed_files+=$$(git diff --name-only v$(PREVIOUS_VERSION) -- $$(printf '%s\n' $${all_submods[@]} | sed 's/^/:!/' | paste -sd' ' -) | grep -E '.+\.go$$'); \
+		else \
+			changed_files+=$$(git diff --name-only $${mod}/v$(PREVIOUS_VERSION) -- $${mod} | grep -E '.+\.go$$'); \
+		fi; \
+	done; \
+	if [ -n "$${changed_files}" ]; then \
+		echo "The following files changed in $(MODSET) modules since v$(PREVIOUS_VERSION): $${changed_files}"; \
+	else \
+		echo "No $(MODSET) modules have changed since v$(PREVIOUS_VERSION)"; \
+		echo "No need to release $(MODSET)."; \
+		exit 1; \
+	fi
+
 .PHONY: prepare-release
 prepare-release:
 ifndef MODSET
@@ -400,6 +430,9 @@ else
 endif
 	# ensure a clean branch
 	git diff -s --exit-code || (echo "local repository not clean"; exit 1)
+	# check if any modules have changed since the previous release
+	$(MAKE) check-changes
+	# update files with new version
 	sed -i.bak 's/$(PREVIOUS_VERSION)/$(RELEASE_CANDIDATE)/g' versions.yaml
 	sed -i.bak 's/$(PREVIOUS_VERSION)/$(RELEASE_CANDIDATE)/g' ./cmd/builder/internal/builder/config.go
 	sed -i.bak 's/$(PREVIOUS_VERSION)/$(RELEASE_CANDIDATE)/g' ./cmd/builder/test/core.builder.yaml