Skip to content
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

Merged
merged 1 commit into from
Sep 20, 2021

Conversation

mxiamxia
Copy link
Member

Description: <Describe what has changed.
Remove the squash for configtls.TLSClientSetting in confighttp and cnofiggrpc per discussion - #4028

TODO: Fix contrib tests for the breaking changes

Link to tracking Issue:
#4028

Copy link
Member

@bogdandrutu bogdandrutu left a 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.

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
Copy link
Contributor

@codeboten codeboten left a 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"`
Copy link
Member

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?

@bogdandrutu bogdandrutu merged commit 1f5dd9f into open-telemetry:main Sep 20, 2021
bbeattie-phxlabs added a commit to bbeattie-phxlabs/opentelemetry-helm-charts that referenced this pull request Sep 22, 2021
tigrannajaryan pushed a commit that referenced this pull request Sep 27, 2021
Change TLSClient config to pointer type in `confighttp` and `configgrpc` config

**Related Issue**
#4028
#4063 (comment)
tgross pushed a commit to hashicorp/nomad-open-telemetry-getting-started that referenced this pull request Jan 11, 2022
This fixes a key error parsing config files introduced by a breaking change in
open-telemetry/opentelemetry-collector#4063
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants