Add unmarshal for ExporterType
#3565
Open
+128
−2
Conversation
This file contains 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
trace/exporter_type.go
Outdated
Comment on lines
39
to
41
| if err != nil && !errors.Is(err, errUnknownExporterType) { | ||
| return err | ||
| } |
There was a problem hiding this comment.
(optional) I think we could remove the special case error check and just return an error on unknown
aaronbuchwald
approved these changes
Nov 22, 2024
trace/exporter_type.go
Outdated
| @@ -33,6 +33,16 @@ func (t ExporterType) MarshalJSON() ([]byte, error) { | |||
| return []byte(`"` + t.String() + `"`), nil | |||
| } | |||
|
|
|||
| func (t *ExporterType) UnmarshalJSON(b []byte) error { | |||
| exporterTypeStr := strings.Trim(string(b), `"`) | |||
There was a problem hiding this comment.
Should we be erroring if the quotes are formatted unexpectedly? For instance:
grpc"grpc""grpc""grpc"""
would all be unmarshalled without issue, but non of them are formatted as expected.
| @@ -33,6 +33,16 @@ func (t ExporterType) MarshalJSON() ([]byte, error) { | |||
| return []byte(`"` + t.String() + `"`), nil | |||
| } | |||
|
|
|||
| func (t *ExporterType) UnmarshalJSON(b []byte) error { | |||
There was a problem hiding this comment.
By convention, "null" == string(b) should be a noop.
| @@ -33,6 +33,16 @@ func (t ExporterType) MarshalJSON() ([]byte, error) { | |||
| return []byte(`"` + t.String() + `"`), nil | |||
| } | |||
|
|
|||
| func (t *ExporterType) UnmarshalJSON(b []byte) error { | |||
There was a problem hiding this comment.
Should we add some test vectors for marshal and unmarshal?
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.
Why this should be merged
Currently, if you try calling
json.Marshal()andjson.Unmarshal()on a field of typeExporterType, this will fail as, when unmarshaling, it will try to convert a string (e.g."grpc","http","unknown") into a byte.How this works
This PR fixes the above by adding an
UnmarshalJSON(), which handles conversions from the strings mentioned above to their respectiveExporterTypevalue.How this was tested
Need to be documented in RELEASES.md?