Adopt chloggen for changelog management to eliminate CHANGELOG.md merge conflicts - #3927
Draft
ps48 wants to merge 1 commit into
Draft
Adopt chloggen for changelog management to eliminate CHANGELOG.md merge conflicts#3927ps48 wants to merge 1 commit into
ps48 wants to merge 1 commit into
Conversation
ps48
force-pushed
the
chore/adopt-chloggen
branch
2 times, most recently
from
September 2, 2026 04:38
43c8b06 to
52d3ff9
Compare
…ge conflicts Fixes open-telemetry#3926. Assisted-by: Claude (Anthropic AI) Signed-off-by: Shenoy Pratik Gurudatt <4348487+ps48@users.noreply.github.com>
ps48
force-pushed
the
chore/adopt-chloggen
branch
from
September 2, 2026 04:44
52d3ff9 to
9cfac7b
Compare
Member
|
YES!!!! LMK when that's good to review |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #3926. Today every PR edits the shared
## Unreleasedsection ofCHANGELOG.md, so PRs that stay open collide on the same lines and constantly need changelog rebases.This adopts chloggen, the same tooling used by
opentelemetry-collectorandopentelemetry-collector-contrib, so each PR adds its own fragment file under.chloggen/that is folded intoCHANGELOG.mdat release time. Because every PR creates a new file, changelog merge conflicts are eliminated by construction.What's included:
.chloggen/TEMPLATE.yamlplusmake chlog-new/chlog-validate/chlog-preview/chlog-update(chloggen pinned to v0.30.0, matching the Collector).changelogCI job runningmake chlog-validate, wired into the build gate.## Unreleasedentries migrated into fragments (validated withmake chlog-validateand previewed withmake chlog-preview; yamllint and markdownlint also pass locally).Enforcement: CI validates fragment syntax only and does not require a fragment per PR. The
Skip Changeloglabel is documented as the convention for when/if the SIG decides to enforce fragment presence.Opening as draft to get SIG feedback on the approach before finalizing.