-
Notifications
You must be signed in to change notification settings - Fork 279
fix: removed unexpected raw_resp from jsonl response
#916
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
Merged
Merged
Changes from all commits
Commits
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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
RawRespclearing still mutates the original and any sharedDNSDataThe intent here is to omit
RawResponly from the JSON representation and avoid mutating the originalResponseData, but due to the embedded pointer this still has side effects:ResponseDataembeds*retryabledns.DNSData, sodataToMarshal := *dcopies the pointer, not the underlying value.dataToMarshal.RawResp = niloperates through that shared pointer, sod.RawResp(and any other alias of the sameDNSData) is also cleared.WithoutAllRecordscontinue to mutate the sharedDNSDatainstance, not just the JSON copy.That makes
JSON()non‑pure and more invasive than the PR description suggests; anything readingRawResp(or otherDNSDatafields touched by options) after aJSON()call will now see modified state.A safer pattern is to deep‑copy the embedded
DNSDatabefore applying JSON‑only tweaks:func (d *ResponseData) JSON(options ...MarshalOption) (string, error) { - dataToMarshal := *d - // Always remove RawResp from JSON output as it's redundant and bloats the output - dataToMarshal.RawResp = nil - for _, option := range options { - option(&dataToMarshal) - } - b, err := json.Marshal(dataToMarshal) + dataToMarshal := *d + + // Work on a deep copy of DNSData to keep JSON-specific mutations isolated. + if d.DNSData != nil { + dnsDataCopy := *d.DNSData + // Always remove RawResp from JSON output as it's redundant and bloats the output. + dnsDataCopy.RawResp = nil + dataToMarshal.DNSData = &dnsDataCopy + } + + for _, option := range options { + option(&dataToMarshal) + } + + b, err := json.Marshal(dataToMarshal) return string(b), err }This keeps
RawRespout of the JSON while preserving the originalResponseData/DNSDatafor any subsequent use, and makes MarshalOptions truly JSON‑only in effect.🤖 Prompt for AI Agents
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.
mutating the copy would be ideal
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.
@dogancanbakir, understood! Here's the corrected implementation that deep-copies the embedded
DNSDatato avoid mutating the original:This ensures:
ResponseDataand its embeddedDNSDataremain unchangedRawRespis omitted from JSON outputMarshalOptionfunctions operate on the copy, not the original