Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.10] Fix tail-based sampling discarding low throughput and low sample rate traces (backport #11642) #11644

Merged
merged 1 commit into from
Sep 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2023

This is an automatic backport of pull request #11642 done by Mergify.
Cherry-pick of b0e8925 has failed:

On branch mergify/bp/8.10/pr-11642
Your branch is up to date with 'origin/8.10'.

You are currently cherry-picking commit b0e892589.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x-pack/apm-server/sampling/groups.go
	modified:   x-pack/apm-server/sampling/groups_test.go
	modified:   x-pack/apm-server/sampling/processor_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

… traces (#11642)

In tail-based sampling, use math.ceil instead of math.Round when computing desired total such that on low throughput and low sample rate traces e.g. throughput=1, sample rate = 0.4, desired total = math.Ceil(1 * 0.4) = 1 as opposed to 0 when using math.Round. This will fix cases where these traces were missing before the fix.

(cherry picked from commit b0e8925)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot requested a review from a team as a code owner September 14, 2023 08:49
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 14, 2023
@mergify mergify bot merged commit e2be3a4 into 8.10 Sep 14, 2023
17 checks passed
@mergify mergify bot deleted the mergify/bp/8.10/pr-11642 branch September 14, 2023 09:50
@carsonip
Copy link
Member

@kruskall oh no i meant to remove the changelog

carsonip added a commit that referenced this pull request Sep 14, 2023
Remove changelogs/head.asciidoc as it was added accidentally from backport PR #11644
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants