Skip to content

[DOC] Add policy order to sampling doc#5694

Merged
knylander-grafana merged 4 commits intomainfrom
update-sampling-doc-2
Oct 2, 2025
Merged

[DOC] Add policy order to sampling doc#5694
knylander-grafana merged 4 commits intomainfrom
update-sampling-doc-2

Conversation

@knylander-grafana
Copy link
Copy Markdown
Contributor

@knylander-grafana knylander-grafana commented Sep 29, 2025

What this PR does:

Add information about sampling policy order. Written with @ayah-el.

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 29, 2025

💻 Deploy preview deleted.

Comment thread .github/copilot-instructions.md Outdated
@knylander-grafana knylander-grafana merged commit a36fddc into main Oct 2, 2025
39 of 40 checks passed
@knylander-grafana knylander-grafana deleted the update-sampling-doc-2 branch October 2, 2025 15:11
@tempo-ci-app
Copy link
Copy Markdown

tempo-ci-app Bot commented Oct 8, 2025

The backport to release-v2.9 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5694-to-release-v2.9 origin/release-v2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x a36fddc7ff3e9a42ce06b8b249d7f4390a677289

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-5694-to-release-v2.9
# Create the PR body template
PR_BODY=$(gh pr view 5694 --json body --template 'Backport a36fddc7ff3e9a42ce06b8b249d7f4390a677289 from #5694{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.9] [DOC] Add policy order to sampling doc' --body-file - --label 'type/docs' --label 'backport' --base release-v2.9 --milestone release-v2.9 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-5694-to-release-v2.9

# Create a pull request where the `base` branch is `release-v2.9` and the `compare`/`head` branch is `backport-5694-to-release-v2.9`.

# Remove the local backport branch
git switch main
git branch -D backport-5694-to-release-v2.9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants