Refactoring: use logger from base metricset #11754
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
ycombinator
added
review
refactoring
Metricbeat
|
Pinging @elastic/stack-monitoring |
ruflin
approved these changes
Apr 11, 2019
There was a problem hiding this comment.
PR LGTM.
I would suggest in a second PR to go to the new error interface. I remember trying to do this in the past but it cause some issues on the testing side as I did not migrate all metricsets at once. So let's merge this first and then do the second step as it's perhaps more complex.
| @@ -60,19 +60,19 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) { | |||
| isMaster, err := elasticsearch.IsMaster(m.HTTP, m.GetServiceURI()) | |||
| if err != nil { | |||
| err = errors.Wrap(err, "error determining if connected Elasticsearch node is master") | |||
| elastic.ReportAndLogError(err, r, m.Log) | |||
| elastic.ReportAndLogError(err, r, m.Logger()) | |||
There was a problem hiding this comment.
Why not directly go to func (m *MetricSet) Fetch(r mb.ReporterV2) error { interface and return the error so you don't have to do this additional code as the new interface will do it for you?
There was a problem hiding this comment.
Yeah, I was planning on putting up a PR following your work in #10727 today.
| return | ||
| } | ||
|
|
||
| info, err := elasticsearch.GetInfo(m.HTTP, m.GetServiceURI()) | ||
| if err != nil { | ||
| elastic.ReportAndLogError(err, r, m.Log) | ||
| elastic.ReportAndLogError(err, r, m.Logger()) |
| @@ -81,22 +81,22 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) { | |||
| ccrUnavailableMessage, err := m.checkCCRAvailability(info.Version.Number) | |||
| if err != nil { | |||
| err = errors.Wrap(err, "error determining if CCR is available") | |||
| elastic.ReportAndLogError(err, r, m.Log) | |||
| elastic.ReportAndLogError(err, r, m.Logger()) | |||
ycombinator
removed
the
needs_backport
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
With #11106, the base
Metricsetstruct started defining aLogger()method which returned a*logp.Loggerfor metricsets to use. With this change, each metricset no longer needs to define its own logger.This PR updates Elastic Stack metricsets to use the base
Metricset'sLogger()instead of defining their own.