From cb1c65735cec49ce319d8789d171f2697cf948ea Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 20 Feb 2025 14:50:44 +0100 Subject: [PATCH] [chore] Fix tests and code after breaking change in confighttp (#38075) #### Description #### Link to tracking issue Fixes #### Testing #### Documentation --- exporter/datadogexporter/config_test.go | 8 ++--- exporter/elasticsearchexporter/config_test.go | 12 +++---- exporter/mezmoexporter/config_test.go | 8 ++--- exporter/mezmoexporter/factory_test.go | 8 ++--- exporter/opensearchexporter/config_test.go | 4 +-- exporter/signalfxexporter/config_test.go | 32 +++++++++---------- exporter/signalfxexporter/factory.go | 6 ++-- exporter/splunkhecexporter/config_test.go | 6 ++-- exporter/splunkhecexporter/factory.go | 6 ++-- exporter/zipkinexporter/config_test.go | 4 +-- .../httpforwarderextension/config_test.go | 4 +-- internal/datadog/clientutil/http.go | 16 +++++----- internal/datadog/clientutil/http_test.go | 24 +++++++------- pkg/datadog/config/config_test.go | 16 +++++----- 14 files changed, 77 insertions(+), 77 deletions(-) diff --git a/exporter/datadogexporter/config_test.go b/exporter/datadogexporter/config_test.go index d9dd1f42f9e1..d0bf5e2e02af 100644 --- a/exporter/datadogexporter/config_test.go +++ b/exporter/datadogexporter/config_test.go @@ -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 diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index d43aa21ac6e5..b432ed49f68d 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -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", } @@ -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", } @@ -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", } diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index 661619952ca2..332a8b210441 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -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{ diff --git a/exporter/mezmoexporter/factory_test.go b/exporter/mezmoexporter/factory_test.go index 17875ef22194..549d40ec3705 100644 --- a/exporter/mezmoexporter/factory_test.go +++ b/exporter/mezmoexporter/factory_test.go @@ -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(), diff --git a/exporter/opensearchexporter/config_test.go b/exporter/opensearchexporter/config_test.go index 7125a610d249..e9c0cb9b1b50 100644 --- a/exporter/opensearchexporter/config_test.go +++ b/exporter/opensearchexporter/config_test.go @@ -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{ diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index b95f0aaa25d2..b3fa0915210b 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -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, }, @@ -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{ @@ -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, }, @@ -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{ diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index 65a3d891371e..fdd21092f9d0 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -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 diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index c99b70aebe06..e06b65959aa8 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -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 diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 38f8d570d147..c93e39a5bc42 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -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 diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index 2bc38c65db6f..b044d87bf0e6 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -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", diff --git a/extension/httpforwarderextension/config_test.go b/extension/httpforwarderextension/config_test.go index 30fe6b39171e..2e3ff3dbe317 100644 --- a/extension/httpforwarderextension/config_test.go +++ b/extension/httpforwarderextension/config_test.go @@ -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 { diff --git a/internal/datadog/clientutil/http.go b/internal/datadog/clientutil/http.go index 90d8f9c3114c..f08f58a1f876 100644 --- a/internal/datadog/clientutil/http.go +++ b/internal/datadog/clientutil/http.go @@ -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{ diff --git a/internal/datadog/clientutil/http_test.go b/internal/datadog/clientutil/http_test.go index 72ab36fd8192..f0126677dc29 100644 --- a/internal/datadog/clientutil/http_test.go +++ b/internal/datadog/clientutil/http_test.go @@ -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", @@ -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", @@ -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}, diff --git a/pkg/datadog/config/config_test.go b/pkg/datadog/config/config_test.go index 8dd48b0860f7..e081b88f7b96 100644 --- a/pkg/datadog/config/config_test.go +++ b/pkg/datadog/config/config_test.go @@ -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}, }, @@ -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