PMM-12832 Add exporter connection timeout to DSN/config based exporters. #5275
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // Copyright (C) 2023 Percona LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package commands | ||
|
|
||
| import ( | ||
| "strconv" | ||
| "time" | ||
| ) | ||
|
|
||
| // DurationString returns the string representation of a duration flag. | ||
| func DurationString(value *time.Duration) string { | ||
| if value == nil { | ||
| return "" | ||
| } | ||
|
|
||
| return strconv.FormatFloat(value.Seconds(), 'f', -1, 64) + "s" | ||
| } | ||
|
Comment on lines
+23
to
+29
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // Copyright (C) 2023 Percona LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package commands | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestDurationString(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| t.Run("nil", func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| assert.Equal(t, "", DurationString(nil)) | ||
| }) | ||
|
|
||
| for _, testCase := range []struct { | ||
| name string | ||
| value time.Duration | ||
| expected string | ||
| }{ | ||
| { | ||
| name: "sub-second", | ||
| value: 500 * time.Millisecond, | ||
| expected: "0.5s", | ||
| }, | ||
| { | ||
| name: "multi-minute", | ||
| value: 90 * time.Second, | ||
| expected: "90s", | ||
| }, | ||
| { | ||
| name: "hour", | ||
| value: time.Hour, | ||
| expected: "3600s", | ||
| }, | ||
| } { | ||
| t.Run(testCase.name, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| assert.Equal(t, testCase.expected, DurationString(&testCase.value)) | ||
| }) | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ package inventory | |
| import ( | ||
| "fmt" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/percona/pmm/admin/commands" | ||
| "github.com/percona/pmm/admin/pkg/flags" | ||
|
|
@@ -89,9 +90,10 @@ type ChangeAgentMongodbExporterCommand struct { | |
| CollectionsLimit *int32 `help:"Collections limit"` | ||
|
|
||
| // Exporter options | ||
| DisableCollectors []string `help:"List of collector names to disable"` | ||
| ExposeExporter *bool `help:"Expose the exporter process on all public interfaces"` | ||
| PushMetrics *bool `help:"Enable push metrics with vmagent"` | ||
| ConnectionTimeout *time.Duration `placeholder:"DURATION" help:"Connection timeout to use for exporter (e.g. 1s, 1.5s)"` | ||
|
|
||
| // Custom labels | ||
| CustomLabels *map[string]string `mapsep:"," help:"Custom user-assigned labels"` | ||
|
|
@@ -152,6 +154,7 @@ func (cmd *ChangeAgentMongodbExporterCommand) RunCmd() (commands.Result, error) | |
| ExposeExporter: cmd.ExposeExporter, | ||
| EnablePushMetrics: cmd.PushMetrics, | ||
| LogLevel: convertLogLevelPtr(cmd.LogLevel), | ||
| ConnectionTimeout: commands.DurationString(cmd.ConnectionTimeout), | ||
|
There was a problem hiding this comment. Change commands may unintentionally clear connection timeoutMedium Severity
Additional Locations (2)  Reviewed by Cursor Bugbot for commit ca21749. Configure here. |
||
| } | ||
|
|
||
| if customLabels != nil { | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Linter issue from original PR, there and in admin commands.