-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Remove squash on configtls.TLSClientSetting
in confighttp & cnofiggrpc
#4063
Conversation
9e27b34
to
4607209
Compare
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.
Make it consistent with server where we use 'tls_setting', pick one winner.
1a710a4
to
d8f22ee
Compare
commit 4607209 Author: Min Xia <xiami@amazon.com> Date: Thu Sep 16 13:33:52 2021 -0700 Do not squash `configtls.TLSClientSetting` in `confighttp` and `cnofiggrpc` config
d8f22ee
to
81d67a3
Compare
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.
This is a great improvement 👍
@@ -38,7 +38,7 @@ type HTTPClientSettings struct { | |||
Endpoint string `mapstructure:"endpoint"` | |||
|
|||
// TLSSetting struct exposes TLS client configuration. | |||
TLSSetting configtls.TLSClientSetting `mapstructure:",squash"` | |||
TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` |
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.
Do we need to use a pointer to determine when the config is set at all?
New location for `insecure` as per open-telemetry/opentelemetry-collector#4063
Change TLSClient config to pointer type in `confighttp` and `configgrpc` config **Related Issue** #4028 #4063 (comment)
This fixes a key error parsing config files introduced by a breaking change in open-telemetry/opentelemetry-collector#4063
Description: <Describe what has changed.
Remove the squash for
configtls.TLSClientSetting
inconfighttp
andcnofiggrpc
per discussion - #4028TODO: Fix
contrib
tests for the breaking changesLink to tracking Issue:
#4028