Skip to content

[8.x](backport #5492) Add apm trace sampling#5582

Merged
pchila merged 2 commits into8.xfrom
mergify/bp/8.x/pr-5492
Sep 23, 2024
Merged

[8.x](backport #5492) Add apm trace sampling#5582
pchila merged 2 commits into8.xfrom
mergify/bp/8.x/pr-5492

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 20, 2024

What does this PR do?

This PR adds the possibility to specify apm sample rate in elastic agent APM configuration

Why is it important?

Specifying a sample rate allows controlling the ingestion rate, reducing overhead and storage requirements when self-monitoring is active

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...
This is an automatic backport of pull request #5492 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner September 20, 2024 13:35
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 20, 2024
@mergify mergify bot requested review from blakerouse and pchila and removed request for a team September 20, 2024 13:35
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of b284e56 has failed:

On branch mergify/bp/8.x/pr-5492
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit b284e56ccf.
  (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:   NOTICE.txt
	modified:   internal/pkg/agent/application/apm_config_modifier_test.go
	modified:   internal/pkg/agent/application/coordinator/diagnostics_test.go
	modified:   internal/pkg/agent/cmd/run.go
	modified:   internal/pkg/core/monitoring/config/config.go
	modified:   internal/pkg/core/monitoring/config/config_test.go
	modified:   pkg/component/runtime/apm_config_mapper.go
	modified:   pkg/component/runtime/command_test.go
	modified:   pkg/component/runtime/manager_fake_input_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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

@mergify mergify bot assigned pchila Sep 20, 2024
@pchila pchila removed the request for review from blakerouse September 20, 2024 13:37
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Sep 20, 2024
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 20, 2024

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@pchila pchila removed the conflicts There is a conflict in the backported pull request label Sep 20, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 23, 2024

This pull request has not been merged yet. Could you please review and merge it @pchila? 🙏

@pchila
Add apm trace sampling (#5492)
bf85e59 
* Update elastic-agent-client dependency to 7.16.0

* Add support for APM sampling rate config

* fixup! Add support for APM sampling rate config

* Add unit tests for APM config triggering component changes

* make notice

(cherry picked from commit b284e56)

# Conflicts:
#	go.mod
#	go.sum
@pchila
resolve conflicts
0659a63
@pchila pchila force-pushed the mergify/bp/8.x/pr-5492 branch from 86ecafd to 0659a63 Compare September 23, 2024 06:04
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Sep 23, 2024

Quality Gate failed Quality Gate failed

Failed conditions
20.0% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube

@pchila pchila merged commit 6fda085 into 8.x Sep 23, 2024
@pchila pchila deleted the mergify/bp/8.x/pr-5492 branch September 23, 2024 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pchila pchila pchila approved these changes

Assignees

@pchila pchila

Labels

backport Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @pchila @pierrehilbert