-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Add SRV resolver to loadbalancer exporter to use hostnames and track IPs #29760
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
snuggie12
wants to merge
5
commits into
open-telemetry:main
from
snuggie12:add-dns-srv-no-a-resolver-to-lb-exporter
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0beac79
Add SRV resolver to loadbalancer exporter to use hostnames and track IPs
snuggie12 b2f3a19
PR feedback, renamed resolver and removed port from config
snuggie12 93c9bb8
config change missing from PR.
snuggie12 3701d15
Apply suggestions from code review
snuggie12 e8cfab5
Updated README to clear up what dnssrvnoa is and when to use it
snuggie12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: 'enhancement' | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: loadbalancingexporter | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: New SRV resolver for loadbalancing exporter for static hostnames with changing IPs | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: ["18412"] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: | ||
|
||
# If your change doesn't affect end users or the exported elements of any package, | ||
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [] |
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 |
---|---|---|
|
@@ -32,9 +32,10 @@ type Protocol struct { | |
|
||
// ResolverSettings defines the configurations for the backend resolver | ||
type ResolverSettings struct { | ||
Static *StaticResolver `mapstructure:"static"` | ||
DNS *DNSResolver `mapstructure:"dns"` | ||
K8sSvc *K8sSvcResolver `mapstructure:"k8s"` | ||
Static *StaticResolver `mapstructure:"static"` | ||
DNS *DNSResolver `mapstructure:"dns"` | ||
K8sSvc *K8sSvcResolver `mapstructure:"k8s"` | ||
DNSSRVNOA *DNSSRVNOAResolver `mapstructure:"dnssrvnoa"` | ||
} | ||
|
||
// StaticResolver defines the configuration for the resolver providing a fixed list of backends | ||
|
@@ -50,8 +51,16 @@ type DNSResolver struct { | |
Timeout time.Duration `mapstructure:"timeout"` | ||
} | ||
|
||
// K8sSvcResolver defines the configuration for the DNS resolver | ||
// K8sSvcResolver defines the configuration for the kubernetes Service resolver | ||
type K8sSvcResolver struct { | ||
Service string `mapstructure:"service"` | ||
Ports []int32 `mapstructure:"ports"` | ||
} | ||
|
||
// TODO: Make a common struct to be used for dns-based resolvers | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. TODO still needs to be done? |
||
// DNSSRVResolver defines the configuration for the DNS resolver of SRV records for headless Services | ||
type DNSSRVNOAResolver struct { | ||
Hostname string `mapstructure:"hostname"` | ||
Interval time.Duration `mapstructure:"interval"` | ||
Timeout time.Duration `mapstructure:"timeout"` | ||
} |
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.
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.
When would anyone ever specify all four? This got updated from "both" where it made sense, to "all three" which didn't make sense but someone got it through, but now "all four" doesn't make any sense at all.
Please change this to specify the resolution ordering.
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.
Can do, however, I don't think I really ever looked at how the order was determined. Now I'm wondering if there should be a prescribed precedence.
I would need to dig into this deeper, but my best guess is that these are merely in reverse order of when the resolver was added. If a resolver is at the bottom of this block then that resolver takes most precedence.
Happy to leave everything as is and either make the resolver I'm adding to have the most precedence or leaving it as k8s if that was a conscious decision. If not, my suggestion might be the regular DNS resolver. It seems to me it'd be the most commonly used one.