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

[7.x] beater: CreatorParams.RunServer -> WrapRunServer (#3803) #3805

Merged
merged 1 commit into from
May 20, 2020

Conversation

axw
Copy link
Member

@axw axw commented May 20, 2020

Backports the following commits to 7.x:

* beater: CreatorParams.RunServer -> WrapRunServer

Rather than passing in a RunServerFunc to CreatorParams,
pass in a function that can wrap a RunServerFunc, like
middleware. This enables us to run the tracer server
with an overridden reporter, such as the one provided
by the transaction histogram aggregator.

Unexport beater.RunServer to ensure wrappers do not
mistakenly call it directly, rather than going through
the RunServerFunc provided to them.

* beater: extract runServerWithTracerServer
@axw axw added the backport label May 20, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #3805 into 7.x will decrease coverage by 0.03%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##              7.x    #3805      +/-   ##
==========================================
- Coverage   79.83%   79.79%   -0.04%     
==========================================
  Files         136      136              
  Lines        6158     6158              
==========================================
- Hits         4916     4914       -2     
- Misses       1242     1244       +2     
Impacted Files Coverage Δ
x-pack/apm-server/main.go 0.00% <ø> (ø)
beater/beater.go 71.90% <100.00%> (+1.90%) ⬆️
beater/server.go 69.04% <100.00%> (ø)
kibana/connecting_client.go 64.51% <0.00%> (-8.07%) ⬇️

@apmmachine
Copy link
Contributor

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 3014
Skipped 142
Total 3156

@axw axw merged commit 0e87b80 into elastic:7.x May 20, 2020
@axw axw deleted the backport/7.x/pr-3803 branch May 20, 2020 13:00
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.

3 participants