Skip to content

bdns: don't strip port number in metrics #9104

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.

Sign up for GitHub

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

Merged
ezekiel merged 2 commits into from
Oct 20, 2026
Merged

bdns: don't strip port number in metrics #9104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a85e3
bdns: don't strip port number in metrics
jsha Oct 16, 2026
fd13cad
Merge remote-tracking branch 'origin/main' into restore-port
jsha Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 11 additions & 21 deletions bdns/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,14 @@ func (c *impl) exchangeOne(ctx context.Context, hostname string, qtype uint16) (
}

// Prepare to increment a latency metric no matter whether we succeed or fail.
// The deferred function closes over resp, chosenServerIP, and tries, which
// The deferred function closes over resp, chosenServer, and tries, which
// are all modified in the loop below.
start := c.clk.Now()
qtypeStr := dns.TypeToString[qtype]
var (
resp *dns.Msg
chosenServerIP string
tries int
resp *dns.Msg
chosenServer string
tries int
)
defer func() {
result := "failed"
Expand All @@ -212,24 +212,14 @@ func (c *impl) exchangeOne(ctx context.Context, hostname string, qtype uint16) (
c.totalLookupTime.With(prometheus.Labels{
"qtype": qtypeStr,
"result": result,
"resolver": chosenServerIP,
"resolver": chosenServer,
"attempts": strconv.Itoa(tries),
}).Observe(c.clk.Since(start).Seconds())
}()

for i := range c.maxTries {
tries = i + 1
chosenServer := servers[i%len(servers)]

// Strip off the IP address part of the server address because
// we talk to the same server on multiple ports, and don't want
// to blow up the cardinality.
// Note: validateServerAddress() has already checked net.SplitHostPort()
// and ensures that chosenServer can't be a bare port, e.g. ":1337"
chosenServerIP, _, err = net.SplitHostPort(chosenServer)
if err != nil {
return nil, chosenServer, err
}
chosenServer = servers[i%len(servers)]

// Do a bare assignment (not :=) to populate the `resp` used by the defer above.
var rtt time.Duration
Expand All @@ -243,12 +233,12 @@ func (c *impl) exchangeOne(ctx context.Context, hostname string, qtype uint16) (
c.queryTime.With(prometheus.Labels{
"qtype": qtypeStr,
"result": result,
"resolver": chosenServerIP,
"resolver": chosenServer,
}).Observe(rtt.Seconds())

if err != nil {
if !errors.Is(err, errDohQueryTimeout) && !errors.Is(err, errDohQueryCanceled) {
c.dohTransportErrors.With(prometheus.Labels{"resolver": chosenServerIP}).Inc()
c.dohTransportErrors.With(prometheus.Labels{"resolver": chosenServer}).Inc()
}

c.log.Infof("logDNSError chosenServer=[%s] hostname=[%s] queryType=[%s] err=[%s]", chosenServer, hostname, qtypeStr, err)
Expand All @@ -262,21 +252,21 @@ func (c *impl) exchangeOne(ctx context.Context, hostname string, qtype uint16) (
c.timeoutCounter.With(prometheus.Labels{
"qtype": qtypeStr,
"result": "out of retries",
"resolver": chosenServerIP,
"resolver": chosenServer,
"isTLD": fmt.Sprintf("%t", !strings.Contains(hostname, ".")),
}).Inc()
} else if errors.Is(err, errDohQueryTimeout) {
c.timeoutCounter.With(prometheus.Labels{
"qtype": qtypeStr,
"result": "deadline exceeded",
"resolver": chosenServerIP,
"resolver": chosenServer,
"isTLD": fmt.Sprintf("%t", !strings.Contains(hostname, ".")),
}).Inc()
} else if errors.Is(err, errDohQueryCanceled) {
c.timeoutCounter.With(prometheus.Labels{
"qtype": qtypeStr,
"result": "canceled",
"resolver": chosenServerIP,
"resolver": chosenServer,
"isTLD": fmt.Sprintf("%t", !strings.Contains(hostname, ".")),
}).Inc()
}
Expand Down
4 changes: 2 additions & 2 deletions bdns/dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ func TestRetry(t *testing.T) {
t, dr.timeoutCounter, prometheus.Labels{
"qtype": "TXT",
"result": "out of retries",
"resolver": "127.0.0.1",
"resolver": "127.0.0.1:4053",
"isTLD": "false",
}, tc.metricsAllRetries)
}
Expand Down Expand Up @@ -767,7 +767,7 @@ func TestRetryMetrics(t *testing.T) {
t, dr.timeoutCounter, prometheus.Labels{
"qtype": "TXT",
"result": "canceled",
"resolver": "127.0.0.1",
"resolver": "127.0.0.1:4053",
}, 1)
}

Expand Down
Loading