Skip to content

fix: remove squash on configtls.TLSClientSetting for AWS components #5454

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.

Sign up for GitHub

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 11 commits into from
Oct 1, 2021
Merged

fix: remove squash on configtls.TLSClientSetting for AWS components #5454

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1290529
fix: remove squash on configtls.TLSClientSetting
Sep 24, 2021
683d24f
fix: update yamls and readmes to reflect de-squashed tls
Sep 25, 2021
3a24b83
Merge branch 'main' of github.com:open-o11y/opentelemetry-collector-c…
Sep 27, 2021
505d7a8
fix: solve merge conflict
Sep 27, 2021
f1b1fab
fix: remove unnecessary file changes
Sep 28, 2021
110f887
Merge branch 'main' of github.com:open-o11y/opentelemetry-collector-c…
Sep 28, 2021
b6859c4
chore: add CHANGELOG
Sep 28, 2021
49812c9
fix: add relevant readme files
Sep 29, 2021
ec60275
Merge branch 'main' of github.com:open-o11y/opentelemetry-collector-c…
Sep 29, 2021
5933413
Merge branch 'main' of github.com:open-o11y/opentelemetry-collector-c…
Oct 1, 2021
6536535
fix: includes aws components only
Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

## 🛑 Breaking changes 🛑

- Remove squash on configtls.TLSClientSetting (#5454)
- Move `k8sprocessor` to `k8sattributesprocessor`.
- Rename `k8s_tagger` configuration `k8sattributes`.
- filelog receiver: use empty value for `SeverityText` field instead of `"Undefined"` (#5423)
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
// Config defines configuration for Elastic APM exporter.
type Config struct {
config.ExporterSettings `mapstructure:",squash"`
configtls.TLSClientSetting `mapstructure:",squash"`
configtls.TLSClientSetting `mapstructure:"tls,omitempty"`

// APMServerURLs holds the APM Server URL.
//
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type HTTPClientSettings struct {
// will be send with each HTTP request.
Headers map[string]string `mapstructure:"headers,omitempty"`

configtls.TLSClientSetting `mapstructure:",squash"`
configtls.TLSClientSetting `mapstructure:"tls,omitempty"`
}

// AuthenticationSettings defines user authentication related settings.
Expand Down
2 changes: 1 addition & 1 deletion exporter/observiqexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type Config struct {
exporterhelper.QueueSettings `mapstructure:"sending_queue"`
exporterhelper.RetrySettings `mapstructure:"retry_on_failure"`
// TLS Settings for http client to use when sending logs to endpoint
TLSSetting configtls.TLSClientSetting `mapstructure:",squash"`
TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"`
// API key for authenticating with ingestion endpoint (required if no SecretKey)
APIKey string `mapstructure:"api_key"`
// Secret key for authenticating with the ingestion endpoint (required if no APIKey)
Expand Down
7 changes: 4 additions & 3 deletions exporter/observiqexporter/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ exporters:
timeout: 10s
agent_id: "08e097a6-8580-43f6-b4f5-9d3b4eb2d962"
agent_name: "otel-collector-1"
ca_file: ""
cert_file: ""
key_file: ""
tls:
ca_file: ""
cert_file: ""
key_file: ""
sending_queue:
enabled: true
num_consumers: 2
Expand Down
2 changes: 1 addition & 1 deletion exporter/splunkhecexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ type Config struct {
MaxContentLengthLogs uint `mapstructure:"max_content_length_logs"`

// TLSSetting struct exposes TLS client configuration.
TLSSetting configtls.TLSClientSetting `mapstructure:",squash"`
TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"`

// App name is used to track telemetry information for Splunk App's using HEC by App name. Defaults to "OpenTelemetry Collector Contrib".
SplunkAppName string `mapstructure:"splunk_app_name"`
Expand Down
9 changes: 5 additions & 4 deletions exporter/splunkhecexporter/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ exporters:
source: "otel"
sourcetype: "otel"
index: "metrics"
insecure_skip_verify: false
ca_file: ""
cert_file: ""
key_file: ""
tls:
insecure_skip_verify: false
ca_file: ""
cert_file: ""
key_file: ""
timeout: 10s
sending_queue:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion extension/awsxrayproxy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Config struct {

// TLSSetting struct exposes TLS client configuration when forwarding
// calls to the AWS X-Ray backend.
TLSSetting configtls.TLSClientSetting `mapstructure:",squash"`
TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"`

// Region is the AWS region the local TCP server forwards requests to.
Region string `mapstructure:"region"`
Expand Down
5 changes: 3 additions & 2 deletions extension/awsxrayproxy/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ extensions:
awsxrayproxy/1:
endpoint: "0.0.0.0:1234"
proxy_address: "https://proxy.proxy.com"
insecure: true
server_name_override: "something"
tls:
insecure: true
server_name_override: "something"
region: "us-west-1"
role_arn: "arn:aws:iam::123456789012:role/awesome_role"
aws_endpoint: "https://another.aws.endpoint.com"
Expand Down
2 changes: 1 addition & 1 deletion internal/aws/proxy/cfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type Config struct {

// TLSSetting struct exposes TLS client configuration when forwarding
// calls to the AWS X-Ray backend.
TLSSetting configtls.TLSClientSetting `mapstructure:",squash"`
TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"`

// Region is the AWS region the local TCP server forwards requests to.
Region string `mapstructure:"region"`
Expand Down
5 changes: 3 additions & 2 deletions receiver/awsxrayreceiver/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ receivers:
proxy_server:
endpoint: "0.0.0.0:1234"
proxy_address: "https://proxy.proxy.com"
insecure: true
server_name_override: "something"
tls:
insecure: true
server_name_override: "something"
region: "us-west-1"
role_arn: "arn:aws:iam::123456789012:role/awesome_role"
aws_endpoint: "https://another.aws.endpoint.com"
Expand Down