Skip to content

Commit

Permalink
[chore] Fix tests and code after breaking change in confighttp (#38075)
Browse files Browse the repository at this point in the history 
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->
  • Loading branch information
@mx-psi
mx-psi authored Feb 20, 2025
1 parent 3442284 commit cb1c657
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 77 deletions.
8 changes: 4 additions & 4 deletions exporter/datadogexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ func TestUnmarshal(t *testing.T) {
cfgWithHTTPConfigs.ReadBufferSize = 100
cfgWithHTTPConfigs.WriteBufferSize = 200
cfgWithHTTPConfigs.Timeout = 10 * time.Second
cfgWithHTTPConfigs.MaxIdleConns = &maxIdleConn
cfgWithHTTPConfigs.MaxIdleConnsPerHost = &maxIdleConnPerHost
cfgWithHTTPConfigs.MaxConnsPerHost = &maxConnPerHost
cfgWithHTTPConfigs.IdleConnTimeout = &idleConnTimeout
cfgWithHTTPConfigs.MaxIdleConns = maxIdleConn
cfgWithHTTPConfigs.MaxIdleConnsPerHost = maxIdleConnPerHost
cfgWithHTTPConfigs.MaxConnsPerHost = maxConnPerHost
cfgWithHTTPConfigs.IdleConnTimeout = idleConnTimeout
cfgWithHTTPConfigs.DisableKeepAlives = true
cfgWithHTTPConfigs.TLSSetting.InsecureSkipVerify = true

Expand Down
12 changes: 6 additions & 6 deletions exporter/elasticsearchexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ func TestConfig(t *testing.T) {
Pipeline: "mypipeline",
ClientConfig: withDefaultHTTPClientConfig(func(cfg *confighttp.ClientConfig) {
cfg.Timeout = 2 * time.Minute
cfg.MaxIdleConns = &defaultMaxIdleConns
cfg.IdleConnTimeout = &defaultIdleConnTimeout
cfg.MaxIdleConns = defaultMaxIdleConns
cfg.IdleConnTimeout = defaultIdleConnTimeout
cfg.Headers = map[string]configopaque.String{
"myheader": "test",
}
Expand Down Expand Up @@ -155,8 +155,8 @@ func TestConfig(t *testing.T) {
Pipeline: "mypipeline",
ClientConfig: withDefaultHTTPClientConfig(func(cfg *confighttp.ClientConfig) {
cfg.Timeout = 2 * time.Minute
cfg.MaxIdleConns = &defaultMaxIdleConns
cfg.IdleConnTimeout = &defaultIdleConnTimeout
cfg.MaxIdleConns = defaultMaxIdleConns
cfg.IdleConnTimeout = defaultIdleConnTimeout
cfg.Headers = map[string]configopaque.String{
"myheader": "test",
}
Expand Down Expand Up @@ -229,8 +229,8 @@ func TestConfig(t *testing.T) {
Pipeline: "mypipeline",
ClientConfig: withDefaultHTTPClientConfig(func(cfg *confighttp.ClientConfig) {
cfg.Timeout = 2 * time.Minute
cfg.MaxIdleConns = &defaultMaxIdleConns
cfg.IdleConnTimeout = &defaultIdleConnTimeout
cfg.MaxIdleConns = defaultMaxIdleConns
cfg.IdleConnTimeout = defaultIdleConnTimeout
cfg.Headers = map[string]configopaque.String{
"myheader": "test",
}
Expand Down
8 changes: 4 additions & 4 deletions exporter/mezmoexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ func TestLoadConfig(t *testing.T) {
expected: &Config{
ClientConfig: confighttp.ClientConfig{
Timeout: 5 * time.Second,
MaxIdleConns: &defaultMaxIdleConns,
MaxIdleConnsPerHost: &defaultMaxIdleConnsPerHost,
MaxConnsPerHost: &defaultMaxConnsPerHost,
IdleConnTimeout: &defaultIdleConnTimeout,
MaxIdleConns: defaultMaxIdleConns,
MaxIdleConnsPerHost: defaultMaxIdleConnsPerHost,
MaxConnsPerHost: defaultMaxConnsPerHost,
IdleConnTimeout: defaultIdleConnTimeout,
Headers: map[string]configopaque.String{},
},
BackOffConfig: configretry.BackOffConfig{
Expand Down
8 changes: 4 additions & 4 deletions exporter/mezmoexporter/factory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ func TestCreateDefaultConfig(t *testing.T) {

ClientConfig: confighttp.ClientConfig{
Timeout: 5 * time.Second,
MaxIdleConns: &defaultMaxIdleConns,
MaxIdleConnsPerHost: &defaultMaxIdleConnsPerHost,
MaxConnsPerHost: &defaultMaxConnsPerHost,
IdleConnTimeout: &defaultIdleConnTimeout,
MaxIdleConns: defaultMaxIdleConns,
MaxIdleConnsPerHost: defaultMaxIdleConnsPerHost,
MaxConnsPerHost: defaultMaxConnsPerHost,
IdleConnTimeout: defaultIdleConnTimeout,
Headers: map[string]configopaque.String{},
},
BackOffConfig: configretry.NewDefaultBackOffConfig(),
Expand Down
4 changes: 2 additions & 2 deletions exporter/opensearchexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ func TestLoadConfig(t *testing.T) {
config.Headers = map[string]configopaque.String{
"myheader": "test",
}
config.MaxIdleConns = &maxIdleConns
config.IdleConnTimeout = &idleConnTimeout
config.MaxIdleConns = maxIdleConns
config.IdleConnTimeout = idleConnTimeout
config.Auth = &configauth.Authentication{AuthenticatorID: component.MustNewID("sample_basic_auth")}
}),
BackOffConfig: configretry.BackOffConfig{
Expand Down
32 changes: 16 additions & 16 deletions exporter/signalfxexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ func TestLoadConfig(t *testing.T) {
ClientConfig: confighttp.ClientConfig{
Timeout: 10 * time.Second,
Headers: map[string]configopaque.String{},
MaxIdleConns: &hundred,
MaxIdleConnsPerHost: &hundred,
MaxConnsPerHost: &defaultMaxConnsPerHost,
IdleConnTimeout: &idleConnTimeout,
MaxIdleConns: hundred,
MaxIdleConnsPerHost: hundred,
MaxConnsPerHost: defaultMaxConnsPerHost,
IdleConnTimeout: idleConnTimeout,
HTTP2ReadIdleTimeout: 10 * time.Second,
HTTP2PingTimeout: 10 * time.Second,
},
Expand Down Expand Up @@ -96,10 +96,10 @@ func TestLoadConfig(t *testing.T) {
Endpoint: "",
Timeout: 5 * time.Second,
Headers: map[string]configopaque.String{},
MaxIdleConns: &defaultMaxIdleConns,
MaxIdleConnsPerHost: &defaultMaxIdleConnsPerHost,
MaxConnsPerHost: &defaultMaxConnsPerHost,
IdleConnTimeout: &defaultIdleConnTimeout,
MaxIdleConns: defaultMaxIdleConns,
MaxIdleConnsPerHost: defaultMaxIdleConnsPerHost,
MaxConnsPerHost: defaultMaxConnsPerHost,
IdleConnTimeout: defaultIdleConnTimeout,
},
StaleServiceTimeout: 5 * time.Minute,
SyncAttributes: map[string]string{
Expand Down Expand Up @@ -130,10 +130,10 @@ func TestLoadConfig(t *testing.T) {
"added-entry": "added value",
"dot.test": "test",
},
MaxIdleConns: &seventy,
MaxIdleConnsPerHost: &seventy,
MaxConnsPerHost: &defaultMaxConnsPerHost,
IdleConnTimeout: &idleConnTimeout,
MaxIdleConns: seventy,
MaxIdleConnsPerHost: seventy,
MaxConnsPerHost: defaultMaxConnsPerHost,
IdleConnTimeout: idleConnTimeout,
HTTP2ReadIdleTimeout: 10 * time.Second,
HTTP2PingTimeout: 10 * time.Second,
},
Expand Down Expand Up @@ -262,10 +262,10 @@ func TestLoadConfig(t *testing.T) {
Endpoint: "",
Timeout: 5 * time.Second,
Headers: map[string]configopaque.String{},
MaxIdleConns: &defaultMaxIdleConns,
MaxIdleConnsPerHost: &defaultMaxIdleConnsPerHost,
MaxConnsPerHost: &defaultMaxConnsPerHost,
IdleConnTimeout: &defaultIdleConnTimeout,
MaxIdleConns: defaultMaxIdleConns,
MaxIdleConnsPerHost: defaultMaxIdleConnsPerHost,
MaxConnsPerHost: defaultMaxConnsPerHost,
IdleConnTimeout: defaultIdleConnTimeout,
},
StaleServiceTimeout: 5 * time.Minute,
SyncAttributes: map[string]string{
Expand Down
6 changes: 3 additions & 3 deletions exporter/signalfxexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ func createDefaultConfig() component.Config {
timeout := 10 * time.Second
clientConfig := confighttp.NewDefaultClientConfig()
clientConfig.Timeout = defaultHTTPTimeout
clientConfig.MaxIdleConns = &maxConnCount
clientConfig.MaxIdleConnsPerHost = &maxConnCount
clientConfig.IdleConnTimeout = &idleConnTimeout
clientConfig.MaxIdleConns = maxConnCount
clientConfig.MaxIdleConnsPerHost = maxConnCount
clientConfig.IdleConnTimeout = idleConnTimeout
clientConfig.HTTP2ReadIdleTimeout = defaultHTTP2ReadIdleTimeout
clientConfig.HTTP2PingTimeout = defaultHTTP2PingTimeout

Expand Down
6 changes: 3 additions & 3 deletions exporter/splunkhecexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ func TestLoadConfig(t *testing.T) {
}
clientConfig.HTTP2PingTimeout = 10 * time.Second
clientConfig.HTTP2ReadIdleTimeout = 10 * time.Second
clientConfig.MaxIdleConns = &hundred
clientConfig.MaxIdleConnsPerHost = &hundred
clientConfig.IdleConnTimeout = &idleConnTimeout
clientConfig.MaxIdleConns = hundred
clientConfig.MaxIdleConnsPerHost = hundred
clientConfig.IdleConnTimeout = idleConnTimeout

tests := []struct {
id component.ID
Expand Down
6 changes: 3 additions & 3 deletions exporter/splunkhecexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func createDefaultConfig() component.Config {

clientConfig := confighttp.NewDefaultClientConfig()
clientConfig.Timeout = defaultHTTPTimeout
clientConfig.IdleConnTimeout = &defaultIdleConnTimeout
clientConfig.MaxIdleConnsPerHost = &defaultMaxConns
clientConfig.MaxIdleConns = &defaultMaxConns
clientConfig.IdleConnTimeout = defaultIdleConnTimeout
clientConfig.MaxIdleConnsPerHost = defaultMaxConns
clientConfig.MaxIdleConns = defaultMaxConns
clientConfig.HTTP2ReadIdleTimeout = defaultHTTP2ReadIdleTimeout
clientConfig.HTTP2PingTimeout = defaultHTTP2PingTimeout

Expand Down
4 changes: 2 additions & 2 deletions exporter/zipkinexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ func TestLoadConfig(t *testing.T) {
config.TLSSetting = configtls.ClientConfig{
InsecureSkipVerify: true,
}
config.MaxIdleConns = &maxIdleConns
config.IdleConnTimeout = &idleConnTimeout
config.MaxIdleConns = maxIdleConns
config.IdleConnTimeout = idleConnTimeout
}),
Format: "proto",
DefaultServiceName: "test_name",
Expand Down
4 changes: 2 additions & 2 deletions extension/httpforwarderextension/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ func TestLoadConfig(t *testing.T) {
egressCfg.Headers = map[string]configopaque.String{
"otel_http_forwarder": "dev",
}
egressCfg.MaxIdleConns = &maxIdleConns
egressCfg.IdleConnTimeout = &idleConnTimeout
egressCfg.MaxIdleConns = maxIdleConns
egressCfg.IdleConnTimeout = idleConnTimeout
egressCfg.Timeout = 5 * time.Second

tests := []struct {
Expand Down
16 changes: 8 additions & 8 deletions internal/datadog/clientutil/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ func NewHTTPClient(hcs confighttp.ClientConfig) *http.Client {
if hcs.WriteBufferSize > 0 {
transport.WriteBufferSize = hcs.WriteBufferSize
}
if hcs.MaxIdleConns != nil {
transport.MaxIdleConns = *hcs.MaxIdleConns
if hcs.MaxIdleConns > 0 {
transport.MaxIdleConns = hcs.MaxIdleConns
}
if hcs.MaxIdleConnsPerHost != nil {
transport.MaxIdleConnsPerHost = *hcs.MaxIdleConnsPerHost
if hcs.MaxIdleConnsPerHost > 0 {
transport.MaxIdleConnsPerHost = hcs.MaxIdleConnsPerHost
}
if hcs.MaxConnsPerHost != nil {
transport.MaxConnsPerHost = *hcs.MaxConnsPerHost
if hcs.MaxConnsPerHost > 0 {
transport.MaxConnsPerHost = hcs.MaxConnsPerHost
}
if hcs.IdleConnTimeout != nil {
transport.IdleConnTimeout = *hcs.IdleConnTimeout
if hcs.IdleConnTimeout > 0 {
transport.IdleConnTimeout = hcs.IdleConnTimeout
}
transport.DisableKeepAlives = hcs.DisableKeepAlives
return &http.Client{
Expand Down
24 changes: 12 additions & 12 deletions internal/datadog/clientutil/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ func TestNewHTTPClient(t *testing.T) {
ReadBufferSize: 100,
WriteBufferSize: 200,
Timeout: 10 * time.Second,
IdleConnTimeout: &idleConnTimeout,
MaxIdleConns: &maxIdleConn,
MaxIdleConnsPerHost: &maxIdleConnPerHost,
MaxConnsPerHost: &maxConnPerHost,
IdleConnTimeout: idleConnTimeout,
MaxIdleConns: maxIdleConn,
MaxIdleConnsPerHost: maxIdleConnPerHost,
MaxConnsPerHost: maxConnPerHost,
DisableKeepAlives: true,
TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true},
ProxyURL: "proxy",
Expand Down Expand Up @@ -96,10 +96,10 @@ func TestNewHTTPClient(t *testing.T) {
ReadBufferSize: 100,
WriteBufferSize: 200,
Timeout: 10 * time.Second,
IdleConnTimeout: &idleConnTimeout,
MaxIdleConns: &maxIdleConn,
MaxIdleConnsPerHost: &maxIdleConnPerHost,
MaxConnsPerHost: &maxConnPerHost,
IdleConnTimeout: idleConnTimeout,
MaxIdleConns: maxIdleConn,
MaxIdleConnsPerHost: maxIdleConnPerHost,
MaxConnsPerHost: maxConnPerHost,
DisableKeepAlives: true,
TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true},
ProxyURL: "http://datadog-proxy.myorganization.com:3128",
Expand Down Expand Up @@ -135,10 +135,10 @@ func TestNewHTTPClient(t *testing.T) {
ReadBufferSize: 100,
WriteBufferSize: 200,
Timeout: 10 * time.Second,
IdleConnTimeout: &idleConnTimeout,
MaxIdleConns: &maxIdleConn,
MaxIdleConnsPerHost: &maxIdleConnPerHost,
MaxConnsPerHost: &maxConnPerHost,
IdleConnTimeout: idleConnTimeout,
MaxIdleConns: maxIdleConn,
MaxIdleConnsPerHost: maxIdleConnPerHost,
MaxConnsPerHost: maxConnPerHost,
DisableKeepAlives: true,
TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true},

Expand Down
16 changes: 8 additions & 8 deletions pkg/datadog/config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ func TestValidate(t *testing.T) {
ReadBufferSize: 100,
WriteBufferSize: 200,
Timeout: 10 * time.Second,
IdleConnTimeout: &idleConnTimeout,
MaxIdleConns: &maxIdleConn,
MaxIdleConnsPerHost: &maxIdleConnPerHost,
MaxConnsPerHost: &maxConnPerHost,
IdleConnTimeout: idleConnTimeout,
MaxIdleConns: maxIdleConn,
MaxIdleConnsPerHost: maxIdleConnPerHost,
MaxConnsPerHost: maxConnPerHost,
DisableKeepAlives: true,
TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true},
},
Expand Down Expand Up @@ -224,10 +224,10 @@ func TestUnmarshal(t *testing.T) {
cfgWithHTTPConfigs.ReadBufferSize = 100
cfgWithHTTPConfigs.WriteBufferSize = 200
cfgWithHTTPConfigs.Timeout = 10 * time.Second
cfgWithHTTPConfigs.MaxIdleConns = &maxIdleConn
cfgWithHTTPConfigs.MaxIdleConnsPerHost = &maxIdleConnPerHost
cfgWithHTTPConfigs.MaxConnsPerHost = &maxConnPerHost
cfgWithHTTPConfigs.IdleConnTimeout = &idleConnTimeout
cfgWithHTTPConfigs.MaxIdleConns = maxIdleConn
cfgWithHTTPConfigs.MaxIdleConnsPerHost = maxIdleConnPerHost
cfgWithHTTPConfigs.MaxConnsPerHost = maxConnPerHost
cfgWithHTTPConfigs.IdleConnTimeout = idleConnTimeout
cfgWithHTTPConfigs.DisableKeepAlives = true
cfgWithHTTPConfigs.TLSSetting.InsecureSkipVerify = true
cfgWithHTTPConfigs.warnings = nil
Expand Down

0 comments on commit cb1c657

Please sign in to comment.