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

[chore] [receiver/elasticsearch] Use NewDefaultClientConfig instead of manual initialization #35509

Merged
merged 5 commits into from
Oct 9, 2024
Merged

[chore] [receiver/elasticsearch] Use NewDefaultClientConfig instead of manual initialization #35509

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f136e9
[receiver/elasticsearch] Use NewDefaultClientConfig instead of manual
rogercoll Oct 1, 2024
53832bd
Merge branch 'main' into elastic_use_default_client
rogercoll Oct 1, 2024
a9396e0
fix: unneeded nil configuration
rogercoll Oct 1, 2024
3b1b4bc
Merge branch 'main' into elastic_use_default_client
rogercoll Oct 1, 2024
506af78
export default transport values
rogercoll Oct 2, 2024
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
12 changes: 10 additions & 2 deletions receiver/elasticsearchreceiver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package elasticsearchreceiver

import (
"net/http"
"path/filepath"
"testing"
"time"
Expand All @@ -14,6 +15,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/receiver/scraperhelper"

Expand Down Expand Up @@ -138,6 +140,7 @@ func TestValidateEndpoint(t *testing.T) {
}

func TestLoadConfig(t *testing.T) {
defaultTransport := http.DefaultTransport.(*http.Transport)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last thing, can you change this to match: open-telemetry/opentelemetry-collector@aa03d76. Like that, we aren't affected if the global DefaultTransport is changed and define our own variables

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice suggestion, changed in 506af78

t.Parallel()

cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
Expand Down Expand Up @@ -167,8 +170,13 @@ func TestLoadConfig(t *testing.T) {
Username: "otel",
Password: "password",
ClientConfig: confighttp.ClientConfig{
Timeout: 10000000000,
Endpoint: "http://example.com:9200",
Timeout: 10000000000,
Endpoint: "http://example.com:9200",
Headers: map[string]configopaque.String{},
MaxIdleConns: &defaultTransport.MaxIdleConns,
MaxIdleConnsPerHost: &defaultTransport.MaxIdleConnsPerHost,
MaxConnsPerHost: &defaultTransport.MaxConnsPerHost,
IdleConnTimeout: &defaultTransport.IdleConnTimeout,
},
},
},
Expand Down
11 changes: 6 additions & 5 deletions receiver/elasticsearchreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ func createDefaultConfig() component.Config {
cfg := scraperhelper.NewDefaultControllerConfig()
cfg.CollectionInterval = defaultCollectionInterval

clientConfig := confighttp.NewDefaultClientConfig()
clientConfig.Endpoint = defaultEndpoint
clientConfig.Timeout = defaultHTTPClientTimeout

rogercoll marked this conversation as resolved.
Show resolved Hide resolved
return &Config{
ControllerConfig: cfg,
ClientConfig: confighttp.ClientConfig{
Endpoint: defaultEndpoint,
Timeout: defaultHTTPClientTimeout,
},
ControllerConfig: cfg,
ClientConfig: clientConfig,
MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(),
Nodes: []string{"_all"},
Indices: []string{"_all"},
Expand Down
Loading