Skip to content

Use timeout value from config for http client #993

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
aphralG merged 3 commits into from
Mar 3, 2025
Merged

Use timeout value from config for http client #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec070b7
use client timeout
aphralG Feb 20, 2025
d53a6d7
Merge branch 'v3' into use-client-timeout-from-config
aphralG Mar 3, 2025
f5ed3b2
Merge branch 'v3' into use-client-timeout-from-config
aphralG Mar 3, 2025
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
2 changes: 2 additions & 0 deletions internal/collector/nginxossreceiver/internal/scraper/stubstatus/stub_status_scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ func (s *NginxStubStatusScraper) ID() component.ID {

func (s *NginxStubStatusScraper) Start(_ context.Context, _ component.Host) error {
httpClient := http.DefaultClient
httpClient.Timeout = s.cfg.ClientConfig.Timeout

if strings.HasPrefix(s.cfg.APIDetails.Listen, "unix:") {
httpClient.Transport = &http.Transport{
DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
Expand Down
2 changes: 2 additions & 0 deletions internal/collector/nginxplusreceiver/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ func newNginxPlusScraper(
endpoint := strings.TrimPrefix(cfg.APIDetails.URL, "unix:")
logger := settings.Logger
logger.Info("Creating NGINX Plus scraper")

httpClient := http.DefaultClient
httpClient.Timeout = cfg.ClientConfig.Timeout

mb := metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings)
rb := mb.NewResourceBuilder()
Expand Down
8 changes: 4 additions & 4 deletions internal/watcher/instance/nginx_config_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,14 +508,14 @@ func (ncp *NginxConfigParser) apiCallback(ctx context.Context, parent,
func (ncp *NginxConfigParser) pingAPIEndpoint(ctx context.Context, statusAPIDetail *model.APIDetails,
apiType string,
) bool {
httpClient := http.Client{}
httpClient := http.DefaultClient
listen := statusAPIDetail.Listen
statusAPI := statusAPIDetail.URL

if strings.HasPrefix(listen, "unix:") {
httpClient = ncp.SocketClient(strings.TrimPrefix(listen, "unix:"))
} else {
httpClient = http.Client{Timeout: ncp.agentConfig.Client.Grpc.KeepAlive.Timeout}
httpClient.Timeout = ncp.agentConfig.Client.HTTP.Timeout
}
req, err := http.NewRequestWithContext(ctx, http.MethodGet, statusAPI, nil)
if err != nil {
Expand Down Expand Up @@ -705,8 +705,8 @@ func (ncp *NginxConfigParser) isPort(value string) bool {
return err == nil && port >= 1 && port <= 65535
}

func (ncp *NginxConfigParser) SocketClient(socketPath string) http.Client {
return http.Client{
func (ncp *NginxConfigParser) SocketClient(socketPath string) *http.Client {
return &http.Client{
Timeout: ncp.agentConfig.Client.Grpc.KeepAlive.Timeout,
Transport: &http.Transport{
DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
Expand Down