Skip to content

Conversation

@axw
Copy link
Member

@axw axw commented May 5, 2020

Backports the following commits to 7.x:

* beater/config: add Config.Sampling

* Handle "apm-server.sampling.keep_non_sampled"

Add a publisher.Reporter middleware, which drops
non-sampled transactions.

* tests/system: test sampling.keep_non_sampled

* Add changelog entry

* Non-sampled => unsampled

* Rename approvals
@axw axw added the backport label May 5, 2020
@codecov-io
Copy link

Codecov Report

Merging #3742 into 7.x will decrease coverage by 0.03%.
The diff coverage is 74.19%.

@@            Coverage Diff             @@
##              7.x    #3742      +/-   ##
==========================================
- Coverage   79.78%   79.75%   -0.04%     
==========================================
  Files         132      134       +2     
  Lines        6080     6110      +30     
==========================================
+ Hits         4851     4873      +22     
- Misses       1229     1237       +8     
Impacted Files Coverage Δ
beater/config/config.go 67.21% <14.28%> (-6.87%) ⬇️
beater/beater.go 70.00% <50.00%> (-0.95%) ⬇️
beater/config/sampling.go 100.00% <100.00%> (ø)
sampling/sampling.go 100.00% <100.00%> (ø)

@ghost
Copy link

ghost commented May 5, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 3005
Skipped 142
Total 3147

Steps errors

Expand to view the steps failures

  • Name: Test Sync
    • Description: ./script/jenkins/sync.sh

    • Result: FAILURE

    • Duration: 3 min 55 sec<

    • Start Time: 2020-05-05T03:53:52.588+0000

@axw axw merged commit 2f4b64a into elastic:7.x May 5, 2020
@axw axw deleted the backport/7.x/pr-3702 branch May 5, 2020 04:56
@simitt simitt self-assigned this May 12, 2020
@simitt
Copy link
Contributor

simitt commented May 12, 2020

Tested that only sampled transactions are recorded and a warning is logged, in case aggregation is not configured but unsampled transactions are dropped.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants