Repository navigation
fix: preserve custom logger option and add WithStructuredLogging - #2712
Open
reginaldalfret wants to merge 1 commit into
Open
reginaldalfret wants to merge 1 commit into
reginaldalfret wants to merge 1 commit into
Conversation
Signed-off-by: reginaldalfret <reginaldalfret@gmail.com>
blacksoxx
reviewed
Nov 3, 2026
blacksoxx
left a comment
There was a problem hiding this comment.
Ran this locally at d8a38c5: it merges clean with current main, go test -race ./cmd -run TestCommandOptions passes, and with only the two new WithLogger cases applied on main both fail with "custom logger was overridden", so the tests pin the behaviour change. go vet is clean.
The customLogger flag reads fine to me and keeps --quiet and --structured-logs working for callers who do not pass a logger. Nothing else from my side; the failing E2E check is the usual secrets gate for outside PRs rather than anything in this diff.
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
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.
Description of changes
This change ensures that a custom logger supplied via the programmatic
WithLoggeroption is preserved when CLI flags or configuration files specify--structured-logsor--quiet.Preserve custom logger:
loadConfig,c.loggerwas unconditionally re-assigned ifc.conf.StructuredLogsorc.conf.Quietwas true, overwriting any customcloudsql.Loggerpassed by the caller inWithLogger.customLoggerindicator toCommandset byWithLoggerso that custom loggers take precedence over default logger instantiation.Add
WithStructuredLogging()Option:WithStructuredLogging()tocmd/options.goalongsideWithQuietLogging()andWithDebugLogging(), allowing programmatic enablement of structured JSON logging.Regression Tests:
WithStructuredLoggingtest case toTestCommandOptions.TestCommandOptionsOverridesCLItest cases verifying thatWithLoggertakes precedence when--structured-logsor--quietflags are supplied.