ci: introduce towncrier to generate changelog from fragments

.changelog/.gitignore

@@ -0,0 +1 @@
+!.gitignore

.github/workflows/changelog.yml

@@ -1,6 +1,6 @@
-# This action requires that any PR targeting the main branch should touch at
-# least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
-# Changelog" label to disable this action.
+# This action requires that any PR targeting the main branch should add a
+# changelog fragment file in a .changelog/ directory. If a changelog entry
+# is not required, add the "Skip Changelog" label to disable this action.
 
 name: changelog
 
@@ -22,18 +22,46 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Check for CHANGELOG changes
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.base_ref }} --depth=1
+
+      - name: Ensure no direct changes to CHANGELOG.md
         run: |
-          # Only the latest commit of the feature branch is available
-          # automatically. To diff with the base branch, we need to
-          # fetch that too (and we only need its latest commit).
-          git fetch origin ${{ github.base_ref }} --depth=1
-          if [[ $(git diff --name-only FETCH_HEAD | grep CHANGELOG) ]]
+          if [[ $(git diff --name-only FETCH_HEAD -- '**/CHANGELOG.md') ]]
           then
-            echo "A CHANGELOG was modified. Looks good!"
-          else
-            echo "No CHANGELOG was modified."
-            echo "Please add a CHANGELOG entry, or add the \"Skip Changelog\" label if not required."
+            echo "CHANGELOG.md files should not be directly modified."
+            echo "Please add a changelog fragment file to the appropriate .changelog/ directory instead."
+            echo "See CONTRIBUTING.md for details."
+            echo ""
+            echo "Or add the \"Skip Changelog\" label if this job should be skipped."
             false
           fi
+
+      - name: Check for changelog fragment
+        run: |
+          # Check for any new fragment files in any .changelog/ directory
+          fragments=$(git diff --diff-filter=A --name-only FETCH_HEAD -- '**/.changelog/*' '.changelog/*' | grep -v '.gitignore' || true)
+          if [[ -z "$fragments" ]]; then
+            echo "No changelog fragment found for this PR."
+            echo ""
+            echo "Add a file named .changelog/${{ github.event.pull_request.number }}.<type>"
+            echo "where <type> is one of: added, changed, deprecated, removed, fixed"
+            echo ""
+            echo "For coordinated packages, add to the root .changelog/ directory."
+            echo "For independently released packages, add to <package>/.changelog/"
+            echo "See CONTRIBUTING.md for details."
+            echo ""
+            echo "Or add the \"Skip Changelog\" label if this job should be skipped."
+            exit 1
+          fi
+          echo "Found changelog fragment(s):"
+          echo "$fragments"
+
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Preview changelog
+        run: towncrier build --draft --version Unreleased

.github/workflows/package-prepare-patch-release.yml

@@ -46,11 +46,6 @@ jobs:
             exit 1
           fi
 
-          if ! grep --quiet "^## Unreleased$" CHANGELOG.md; then
-            echo the $changelog is missing an \"Unreleased\" section
-            exit 1
-          fi
-
           version=$(./scripts/eachdist.py version --package ${{ inputs.package }})
 
           version_file=$(find $path -type f -path "**/version.py")
@@ -106,11 +101,11 @@ jobs:
       - name: run tox
         run: tox -e generate
 
-      - name: Update the change log with the approximate release date
-        run: |
-          # the actual release date on main will be updated at the end of the release workflow
-          date=$(date "+%Y-%m-%d")
-          sed -Ei "s/^## Unreleased$/## Unreleased\n\n## Version ${NEXT_VERSION} ($date)/" ${CHANGELOG}
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Generate changelog
+        run: towncrier build --yes --version "$NEXT_VERSION" --dir "$(dirname $CHANGELOG)"
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh

.github/workflows/package-prepare-release.yml

@@ -53,11 +53,6 @@ jobs:
             exit 1
           fi
 
-          if ! grep --quiet "^## Unreleased$" $changelog; then
-            echo the $changelog is missing an \"Unreleased\" section
-            exit 1
-          fi
-
           version_dev=$(./scripts/eachdist.py version --package ${{ inputs.package }})
 
           if [[ ! $version_dev =~ ^([0-9]+)\.([0-9]+)[\.|b]{1}([0-9]+).*.dev$ ]]; then
@@ -134,10 +129,11 @@ jobs:
       - name: run tox
         run: tox -e generate
 
-      - name: Update the change log with the approximate release date
-        run: |
-          date=$(date "+%Y-%m-%d")
-          sed -Ei "s/^## Unreleased$/## Version ${VERSION} ($date)/" ${CHANGELOG}
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Generate changelog
+        run: towncrier build --yes --version "$VERSION" --dir "$(dirname $CHANGELOG)"
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh
@@ -194,11 +190,11 @@ jobs:
       - name: run tox
         run: tox -e generate
 
-      - name: Update the change log on main
-        run: |
-          # the actual release date on main will be updated at the end of the release workflow
-          date=$(date "+%Y-%m-%d")
-          sed -Ei "s/^## Unreleased$/## Unreleased\n\n## Version ${VERSION} ($date)/" ${CHANGELOG}
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Generate changelog
+        run: towncrier build --yes --version "$VERSION" --dir "$(dirname $CHANGELOG)"
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh

.github/workflows/prepare-patch-release.yml

@@ -20,11 +20,6 @@ jobs:
             exit 1
           fi
 
-          if ! grep --quiet "^## Unreleased$" CHANGELOG.md; then
-            echo the change log is missing an \"Unreleased\" section
-            exit 1
-          fi
-
       - name: Set environment variables
         run: |
           stable_version=$(./scripts/eachdist.py version --mode stable)
@@ -68,10 +63,11 @@ jobs:
       - name: run tox
         run: tox -e generate
 
-      - name: Update the change log with the approximate release date
-        run: |
-          date=$(date "+%Y-%m-%d")
-          sed -Ei "s/^## Unreleased$/## Version ${STABLE_VERSION}\/${UNSTABLE_VERSION} ($date)/" CHANGELOG.md
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Generate changelog
+        run: towncrier build --yes --version "$STABLE_VERSION/$UNSTABLE_VERSION"
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh

.github/workflows/prepare-release-branch.yml

@@ -24,11 +24,6 @@ jobs:
             exit 1
           fi
 
-          if ! grep --quiet "^## Unreleased$" CHANGELOG.md; then
-            echo the change log is missing an \"Unreleased\" section
-            exit 1
-          fi
-
           if [[ ! -z $PRERELEASE_VERSION ]]; then
             stable_version=$(./scripts/eachdist.py version --mode stable)
             stable_version=${stable_version//.dev/}
@@ -91,10 +86,11 @@ jobs:
       - name: run tox
         run: tox -e generate
 
-      - name: Update the change log with the approximate release date
-        run: |
-          date=$(date "+%Y-%m-%d")
-          sed -Ei "s/^## Unreleased$/## Version ${STABLE_VERSION}\/${UNSTABLE_VERSION} ($date)/" CHANGELOG.md
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Generate changelog
+        run: towncrier build --yes --version "$STABLE_VERSION/$UNSTABLE_VERSION"
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh
@@ -193,11 +189,11 @@ jobs:
       - name: run tox
         run: tox -e generate
 
-      - name: Update the change log on main
-        run: |
-          # the actual release date on main will be updated at the end of the release workflow
-          date=$(date "+%Y-%m-%d")
-          sed -Ei "s/^## Unreleased$/## Unreleased\n\n## Version ${STABLE_VERSION}\/${UNSTABLE_VERSION} ($date)/" CHANGELOG.md
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Generate changelog
+        run: towncrier build --yes --version "$STABLE_VERSION/$UNSTABLE_VERSION"
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh

CHANGELOG.md

@@ -2,13 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+<!--
+Do *NOT* add changelog entries here!
+
+This changelog is managed by towncrier and is compiled at release time.
+
+See https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md#changelog for details.
+-->
+
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 > [!NOTE]
 > The following components are released independently and maintain individual CHANGELOG files.
 > Use [this search for a list of all CHANGELOG.md files in this repo](https://github.com/search?q=repo%3Aopen-telemetry%2Fopentelemetry-python-contrib+path%3A**%2FCHANGELOG.md&type=code).
 
+<!-- changelog start -->
+
 ## Unreleased
 
 ### Added

CONTRIBUTING.md

@@ -247,10 +247,46 @@ A PR is considered to be **ready to merge** when:
   reasonable time to review.
 * Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
 * Urgent fix can take exception as long as it has been actively communicated.
-* A changelog entry is added to the corresponding changelog for the code base, if there is any impact on behavior. e.g. doc entries are not required, but small bug entries are.
+* A changelog fragment is added (see [Changelog](#changelog) below), if there is any impact on behavior. e.g. doc entries are not required, but small bug entries are.
 
 Any Approver / Maintainer can merge the PR once it is **ready to merge**.
 
+### Changelog
+
+This project uses [towncrier](https://towncrier.readthedocs.io/) to manage changelogs. Instead of editing `CHANGELOG.md` directly, each PR should include a changelog fragment file.
+
+**Where to add fragments:**
+
+- **Coordinated packages** (most instrumentations, exporters, propagators): add to the root `.changelog/` directory
+- **Independently released packages** (`opentelemetry-opamp-client`, `opentelemetry-propagator-aws-xray`, `opentelemetry-resource-detector-azure`, `opentelemetry-sdk-extension-aws`): add to `<package>/.changelog/`
+
+**Creating a changelog fragment:**
+
+Create a file named `.changelog/<PR_NUMBER>.<TYPE>` where `TYPE` is one of: `added`, `changed`, `deprecated`, `removed`, `fixed`.
+
+The file should contain a one-line description of the change. For example, `.changelog/1234.fixed`:
+
+```
+`opentelemetry-instrumentation-flask`: fix request hook not being called for websocket connections
+```
+
+**Writing a good changelog entry:**
+
+- Write in imperative tone, as if completing the phrase "This change will..."
+- Keep entries concise — ideally under 80 characters
+- Prefix with the affected package name (e.g. `` `opentelemetry-instrumentation-flask`: ... ``)
+- Don't include the PR number — towncrier adds it automatically
+
+**Preview the changelog:**
+
+```console
+towncrier build --draft --version Unreleased
+```
+
+The CI will verify that a changelog fragment exists and that `CHANGELOG.md` files are not directly modified.
+
+If your change does not need a changelog entry, add the "Skip Changelog" label to the PR.
+
 ### Stale PRs
 
 PRs with no activity for 14 days will be automatically marked as stale and closed after a further 14 days of inactivity. To prevent a PR from being marked stale, ensure there is regular activity (commits, comments, reviews, etc).

RELEASING.md

@@ -46,11 +46,9 @@ To keep the process lightweight, it's OK to approve the PRs you generate and mer
 
 ### Backporting
 
-Creating manual backports of pull request(s) requires the `backport` label to be added in order to have a green CI. Even if there where
-no changes on a repo the patch release preparation workflow requires an empty `## Unreleased` header in `CHANGELOG.md`.
+Creating manual backports of pull request(s) requires the `backport` label to be added in order to have a green CI.
 
-Backport of pull request(s) can be automated by a workflow only if there where no changes that will create conflicts in the release
-branch, unfortunately every `CHANGELOG.md` change will create one.
+Changelog entries are now managed via towncrier fragment files (see [CONTRIBUTING.md](CONTRIBUTING.md#changelog)), which eliminates the merge conflicts that previously occurred with every `CHANGELOG.md` backport.
 
 To use the workflow to backport pull request(s) to the release branch:
   * Run the [Backport workflow](https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/backport.yml).
@@ -60,8 +58,6 @@ To use the workflow to backport pull request(s) to the release branch:
   * Add the label `backport` to the generated pull request.
   * In case label automation doesn't work, just close and reopen the PR so that the workflow will take into account the label automation we have in place.
   * Review and merge the backport pull request that it generates.
-* Merge a pull request to the release branch updating the `CHANGELOG.md`.
-  * The heading for the unreleased entries should be `## Unreleased`.
 
 ### Preparing a patch release
 

opamp/opentelemetry-opamp-client/.changelog/.gitignore

@@ -0,0 +1 @@
+!.gitignore

opamp/opentelemetry-opamp-client/CHANGELOG.md

@@ -2,9 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+<!--
+Do *NOT* add changelog entries here!
+
+This changelog is managed by towncrier and is compiled at release time.
+
+See https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md#changelog for details.
+-->
+
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+<!-- changelog start -->
+
 ## Unreleased
 
 ## Version 0.2b0 (2026-04-01)

opamp/opentelemetry-opamp-client/pyproject.toml

@@ -45,3 +45,37 @@ include = [
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]
+
+[tool.towncrier]
+directory = ".changelog"
+filename = "CHANGELOG.md"
+start_string = "<!-- changelog start -->\n"
+template = "../../scripts/changelog_template.j2"
+issue_format = "[#{issue}](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/{issue})"
+wrap = true
+issue_pattern = "^(\\d+)"
+
+[[tool.towncrier.type]]
+directory = "added"
+name = "Added"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "changed"
+name = "Changed"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "deprecated"
+name = "Deprecated"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "removed"
+name = "Removed"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "fixed"
+name = "Fixed"
+showcontent = true

propagator/opentelemetry-propagator-aws-xray/.changelog/.gitignore

@@ -0,0 +1 @@
+!.gitignore

propagator/opentelemetry-propagator-aws-xray/CHANGELOG.md

@@ -2,9 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+<!--
+Do *NOT* add changelog entries here!
+
+This changelog is managed by towncrier and is compiled at release time.
+
+See https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md#changelog for details.
+-->
+
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+<!-- changelog start -->
+
 ## Unreleased
 
 - Update `opentelemetry-api` version to 1.16