Remove unnecessary functions in PrometheusRemoteWriteExporter #3261
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
bogdandrutu
reviewed
May 24, 2021
| dropped++ | ||
| errs = append(errs, consumererror.Permanent(err)) | ||
| errs = append(errs, consumererror.Permanent(fmt.Errorf("empty data points. %s is dropped", metric.Name()))) |
There was a problem hiding this comment.
In a separate PR we should discuss about this, I don't think this should be an error.
Comment on lines
148
to
154
| if dataPoints.Len() == 0 { | ||
| dropped++ | ||
| errs = append(errs, consumererror.Permanent(fmt.Errorf("empty data points. %s is dropped", metric.Name()))) | ||
| } | ||
| for x := 0; x < dataPoints.Len(); x++ { | ||
| addSingleIntDataPoint(dataPoints.At(x), resource, metric, prwe.namespace, tsMap, prwe.externalLabels) | ||
| } |
There was a problem hiding this comment.
I think we can reduce some of the duplicate code here by having a func that accepts IntDataPointSlice. So this and IntSum will call into the same func, as well as for double.
func addIntDataPoints(dataPoints pdata.IntDataPointSlice, ...) error {
if dataPoints.Len() == 0 {
dropped++
return consumererror.Permanent(fmt.Errorf("empty data points. %s is dropped", metric.Name()))
}
for x := 0; x < dataPoints.Len(); x++ {
addSingleIntDataPoint(dataPoints.At(x), resource, metric, prwe.namespace, tsMap, prwe.externalLabels)
}
return nil
}
There was a problem hiding this comment.
Actually addSingleIntDataPoint requires the metric as a parameter. So I both passed datapoints and metric to the new function.
There was a problem hiding this comment.
Updated in dcbc7ff
dashpole
approved these changes
Jun 3, 2021
Aneurysm9
approved these changes
Jun 4, 2021
bogdandrutu
approved these changes
Jun 7, 2021
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.
Description:
Modify code as suggested here: #3184 (comment)
Testing:
All unit tests passed.