Fix jaeger agent embedded reporter builder bug #570
Merged
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
- When overriding the collector service name using the agent app builder's embedded `WithCollectorServiceName`, the service name is stored in the embedded struct and not in the outer struct. - When constructing an agent using `createAgent`, `GetHttpServer` reads the outer struct leading to different behavior when reading configuration from a file, as opposed to using the builder. - This change uses go-yaml's `inline` keyword to deserialize embedded structs. Signed-off-by: Prithvi Raj <p.r@uber.com>
vprithvi
requested review from
black-adder,
pavolloffay and
yurishkuro
as code owners
ghost
assigned
vprithvi
commented
Nov 29, 2017
| @@ -71,12 +68,7 @@ type Builder struct { | |||
| HTTPServer HTTPServerConfiguration `yaml:"httpServer"` | |||
| Metrics jmetrics.Builder `yaml:"metrics"` | |||
|
|
|||
| // These 3 fields are copied from tchreporter.Builder because yaml does not parse embedded structs | |||
yurishkuro
reviewed
Nov 29, 2017
| CollectorServiceName string `yaml:"collectorServiceName"` | ||
|
|
||
| tchreporter.Builder | ||
| tchreporter.Builder `yaml:",inline"` |
There was a problem hiding this comment.
this is awesome. Could you search the rest of the code for this though? I think there may be other examples of this copy-pasta.
btw, why comma before inline?
There was a problem hiding this comment.
btw, why comma before inline?
It declares an empty yaml tag for tchreporter.Builder. Simply using inline doesn't work.
Could you search the rest of the code for this though? I think there may be other examples of this copy-pasta.
I wasn't able to come up with a good way of searching for anonymous structs; Nothing else seems to have similar comments.
yurishkuro
approved these changes
Nov 29, 2017
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.
When overriding the collector service name using the agent app builder's embedded
WithCollectorServiceName, the service name is stored in the embedded struct andnot in the outer struct.
When constructing an agent using
createAgent,GetHttpServerreads the outerstruct leading to different behavior when reading configuration from a file, as
opposed to using the builder.
This change uses go-yaml's
inlinekeyword to deserialize embedded structs.Signed-off-by: Prithvi Raj p.r@uber.com