fix(discovery): aws discovery test fix#17527
Merged
aknuds1 merged 2 commits intoprometheus:mainfrom Nov 16, 2025
Merged
Conversation
Contributor
Author
|
first commit is superseded by #17526 |
Contributor
|
Can you rebase on main please? Due to overlap with #17526. |
Contributor
|
Never mind, I could diff locally. |
Fixes a problem introduced after the merge of this prometheus#17138 PR didn't take into account another merged PR! ``` discovery/aws/aws.go:218:54: too many arguments in call to NewEC2Discovery have (*EC2SDConfig, *slog.Logger, *ec2Metrics) want (*EC2SDConfig, discovery.DiscovererOptions) discovery/aws/aws.go:222:66: too many arguments in call to NewLightsailDiscovery have (*LightsailSDConfig, *slog.Logger, *lightsailMetrics) want (*LightsailSDConfig, discovery.DiscovererOptions) ``` Signed-off-by: Will Bollock <wbollock@linode.com>
ECS was a new service discovery tool added after this PR was merged: prometheus#17138 Aligns the style of passing a single "opts" to it like almost all the other service discovery engines now use Signed-off-by: Will Bollock <wbollock@linode.com>
93a3c63 to
e5c93cd
Compare
Contributor
Author
|
rebased anyways! thanks |
Contributor
|
Can you try rebasing on main please? The consistently flaking |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes a problem introduced after the merge of this #17138
PR didn't take into account another merged PR!
Does this PR introduce a user-facing change?