PMM-13426: Fix PBM collector memory leak #928
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
idoqo
requested review from
BupycHuk and
JiriCtvrtka
and removed request for
a team
1 task
BupycHuk
reviewed
Oct 9, 2024
exporter/exporter.go
Outdated
Comment on lines
252
to
259
| pbmc, err := newPbmCollector(ctx, client, e.opts.URI, e.opts.Logger) | ||
| if err != nil { | ||
| e.logger.Errorf("Cannot create PBM collector: %v, collector will now be disabled.", err) | ||
| e.opts.EnablePBMMetrics = false | ||
| requestOpts.EnablePBMMetrics = false | ||
| } else { | ||
| registry.MustRegister(pbmc) | ||
| } |
There was a problem hiding this comment.
we create these objects on each request, so it won't help much
exporter/pbm_collector.go
Outdated
Comment on lines
56
to
83
| func newPbmCollector(ctx context.Context, client *mongo.Client, mongoURI string, logger *logrus.Logger) (*pbmCollector, error) { | ||
| // we can't get details of other cluster from PBM if directConnection is set to true, | ||
| // we re-write it if that option is set (e.g from PMM). | ||
| if strings.Contains(mongoURI, "directConnection=true") { | ||
| mongoURI = strings.ReplaceAll(mongoURI, "directConnection=true", "directConnection=false") | ||
| } | ||
| pbmClient, err := sdk.NewClient(ctx, mongoURI) | ||
| if err != nil { | ||
| logger.Errorf("failed to initialize PBM client from uri %s: %s", mongoURI, err.Error()) | ||
| return nil, err | ||
| } | ||
|
|
||
| defer func() { | ||
| err := pbmClient.Close(ctx) | ||
| if err != nil { | ||
| logger.Errorf("failed to close PBM client: %v", err) | ||
| } | ||
| }() | ||
| _, err = pbmClient.GetConfig(ctx) | ||
| if err != nil { | ||
| logger.Errorf("failed to get PBM configuration during initialization: %s", err.Error()) | ||
| return nil, err | ||
| } | ||
| return &pbmCollector{ | ||
| ctx: ctx, | ||
| mongoURI: mongoURI, | ||
| base: newBaseCollector(client, logger.WithFields(logrus.Fields{"collector": "pbm"})), | ||
| } | ||
| }, nil |
There was a problem hiding this comment.
let's revert it because of message above
BupycHuk
reviewed
Oct 10, 2024
exporter/pbm_collector.go
Outdated
| @@ -112,7 +95,7 @@ func (p *pbmCollector) collect(ch chan<- prometheus.Metric) { | |||
|
|
|||
| pbmConfig, err := pbmClient.GetConfig(p.ctx) | |||
| if err != nil { | |||
| logger.Errorf("failed to get PBM configuration: %s", err.Error()) | |||
| logger.Warnf("failed to get PBM configuration: %s", err.Error()) | |||
There was a problem hiding this comment.
I think it should be Info level if we expect that pbm config might not exist there
BupycHuk
approved these changes
Oct 10, 2024
JiriCtvrtka
approved these changes
Oct 10, 2024
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.
PMM-13426 (optional, if ticket reported)
Closes #922 and #924
Below we provide a basic checklist of things that would make it a good PR:
Once all checks pass and the code is ready for review, please add
pmm-review-exportersteam as the reviewer. That would assign people from the review team automatically. Report any issues on our Forum.