beater: CreatorParams.RunServer -> WrapRunServer #3803
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Codecov Report
@@ Coverage Diff @@
## master #3803 +/- ##
==========================================
+ Coverage 79.83% 79.89% +0.06%
==========================================
Files 136 136
Lines 6158 6158
==========================================
+ Hits 4916 4920 +4
+ Misses 1242 1238 -4
|
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
jalvz
reviewed
May 19, 2020
| @@ -137,7 +135,7 @@ func (bt *beater) Run(b *beat.Beat) error { | |||
| } | |||
| defer tracer.Close() | |||
|
|
|||
| runServer := bt.runServer | |||
| runServer := runServer | |||
There was a problem hiding this comment.
For clarity, can't you move L144 up here, and wrap that same origRunServer in L166?
There was a problem hiding this comment.
I'm not too sure what you mean, but I've extracted this tracer-related code to a separate function. Hopefully that will clarify things, let me know.
jalvz
approved these changes
May 20, 2020
axw
added a commit
to axw/apm-server
that referenced
this pull request
May 20, 2020
* 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
added a commit
to axw/apm-server
that referenced
this pull request
May 20, 2020
* 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
added a commit
that referenced
this pull request
May 20, 2020
* 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
added a commit
that referenced
this pull request
May 20, 2020
* 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
Rather than passing in a RunServerFunc to CreatorParams,
pass in a function that can wrap a RunServerFunc. This
enables us to run the tracer server with an overridden reporter,
such as the one provided by the transaction histogram
aggregator.
We unexport beater.RunServer to ensure wrappers do not
mistakenly call it directly, rather than going through the
RunServerFunc provided to them.
Checklist
- [ ] I have updated CHANGELOG.asciidocI have considered changes for:
- [ ] documentation- [ ] logging (add log lines, choose appropriate log selector, etc.)- [ ] metrics and monitoring (create issue for Kibana team to add metrics to visualizations, e.g. Kibana#44001)- [ ] telemetry- [ ] Elasticsearch Service (https://cloud.elastic.co)- [ ] Elastic Cloud Enterprise (https://www.elastic.co/products/ece)- [ ] Elastic Cloud on Kubernetes (https://www.elastic.co/elastic-cloud-kubernetes)How to test these changes
transaction.duration.histogrammetrics docs for the API requestsRelated issues
Fixes #3801