[client] Improve dns match trace log #3928
Merged
Conversation
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
|
There was a problem hiding this comment.
Pull Request Overview
This PR improves the DNS handler chain’s trace logging by consolidating per-handler logs into a single formatted block and extracts the matching logic into a new helper.
- Consolidates individual
Tracefcalls into a multi-line string logged once - Extracts domain-match logic into
isHandlerMatch - Enhances trace messages with domain context for continue/no-match cases
Comments suppressed due to low confidence (3)
client/internal/dns/handler_chain.go:158
- [nitpick] The variable name
bis generic; consider renaming it tosborbuilderfor clarity.
var b strings.Builder
client/internal/dns/handler_chain.go:199
- Consider adding a doc comment above
isHandlerMatchto explain its behavior and edge cases (e.g., wildcard and subdomain matching).
func (c *HandlerChain) isHandlerMatch(qname string, entry HandlerEntry) bool {
client/internal/dns/handler_chain.go:199
- New helper
isHandlerMatchencapsulates important logic; consider adding unit tests covering exact, wildcard, and subdomain match scenarios.
func (c *HandlerChain) isHandlerMatch(qname string, entry HandlerEntry) bool {
Comment on lines
+159
to
+162
| b.WriteString(fmt.Sprintf("DNS request domain=%s, handlers (%d):\n", qname, len(handlers))) | ||
| for _, h := range handlers { | ||
| log.Tracef(" - pattern: domain=%s original: domain=%s wildcard=%v match_subdomain=%v priority=%d", | ||
| h.Pattern, h.OrigPattern, h.IsWildcard, h.MatchSubdomains, h.Priority) | ||
| b.WriteString(fmt.Sprintf(" - pattern: domain=%s original: domain=%s wildcard=%v match_subdomain=%v priority=%d\n", | ||
| h.Pattern, h.OrigPattern, h.IsWildcard, h.MatchSubdomains, h.Priority)) |
There was a problem hiding this comment.
Using fmt.Sprintf inside a tight loop can be less efficient; consider using builder.WriteString and string concatenation or builder.WriteByte to avoid repeated formatting calls.
Copilot uses AI. Check for mistakes.
pappz
approved these changes
Jun 5, 2025
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.
Describe your changes
This combines several log lines into one. On a busy machine those could become detached from each other and it was impossible to read.
Issue ticket number and link
Stack
Checklist