From 799ee30031315fb337a6a81d43361c3014ce3428 Mon Sep 17 00:00:00 2001
From: emdneto <9735060+emdneto@users.noreply.github.com>
Date: Thu, 21 May 2026 14:52:51 -0300
Subject: [PATCH] fix changelog

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>
---
 .github/workflows/prepare-patch-release.yml  | 19 ++++++++++++++-----
 .github/workflows/prepare-release-branch.yml |  2 +-
 CHANGELOG.md                                 |  9 +++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
index a4856eafdd0..4ba5b9955a9 100644
--- a/.github/workflows/prepare-patch-release.yml
+++ b/.github/workflows/prepare-patch-release.yml
@@ -101,6 +101,7 @@ jobs:
         run: .github/scripts/use-cla-approved-github-bot.sh
 
       - name: Backport patch release changelog to main
+        id: backport_pr
         env:
           GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
@@ -112,11 +113,19 @@ jobs:
           git fetch origin $release_branch
 
           # Copy the updated CHANGELOG.md from the release branch
-          git checkout $release_branch -- CHANGELOG.md
+          git checkout FETCH_HEAD -- CHANGELOG.md
           git commit -m "$message"
 
           git push origin HEAD:$branch
-          gh pr create --title "$message" \
-                       --body "$body" \
-                       --head $branch \
-                       --base main
+          pr_url=$(gh pr create --title "$message" \
+                                --body "$body" \
+                                --head $branch \
+                                --base main)
+          echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
+
+      - name: Add Skip Changelog label to backport PR
+        if: steps.backport_pr.outputs.pr_url != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit ${{ steps.backport_pr.outputs.pr_url }} --add-label "Skip Changelog"
diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml
index 47874581a3f..bac3dd082c6 100644
--- a/.github/workflows/prepare-release-branch.yml
+++ b/.github/workflows/prepare-release-branch.yml
@@ -212,4 +212,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr edit ${{ steps.create_main_pr.outputs.pr_url }}  --add-label "prepare-release"
+          gh pr edit ${{ steps.create_main_pr.outputs.pr_url }}  --add-label "prepare-release" --add-label "Skip Changelog"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b0b63f3094..045e251648e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- changelog start -->
 
+## Version 1.42.1/0.63b1 (2026-05-21)
+
+### Fixed
+
+- Preserve the random trace ID flag when creating child spans instead of always
+  setting the random trace id bit depending on the available trace id
+  generator.
+  ([#5241](https://github.com/open-telemetry/opentelemetry-python/pull/5241))
+
 ## Version 1.42.0/0.63b0 (2026-05-19)
 
 ### Added