Skip to content

HOTFIX: Reuse http client #60

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
prasadlohakpure merged 4 commits into from
Apr 24, 2026
Merged

HOTFIX: Reuse http client #60

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a04c6f
HOTFIX: Reuse http client
prasadlohakpure Apr 22, 2026
588fb99
Moving respone close to defer
prasadlohakpure Apr 22, 2026
282d76a
Merge remote-tracking branch 'origin/main' into hf_reuse_http_client
prasadlohakpure Apr 22, 2026
67b5dab
Changes as per co-pilot suggestions
prasadlohakpure Apr 22, 2026
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
31 changes: 23 additions & 8 deletions internal/pkg/pipeline/task/http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"io"
"net/http"
"strings"
"sync"
"time"

"github.com/patterninc/caterpillar/internal/pkg/config"
Expand All @@ -17,6 +18,8 @@ import (
"github.com/patterninc/caterpillar/internal/pkg/pipeline/task/http/status"
)

const defaultMaxConnsPerHost = 100

const (
defaultOAuthVersion = `1.0`
defaultSignatureMethod = `HMAC-SHA256`
Expand Down Expand Up @@ -60,6 +63,8 @@ type httpCore struct {
Timeout duration.Duration `yaml:"timeout,omitempty" json:"timeout,omitempty"`
MaxRetries int `yaml:"max_retries,omitempty" json:"max_retries,omitempty"`
RetryDelay duration.Duration `yaml:"retry_delay,omitempty" json:"retry_delay,omitempty"`
client *http.Client
clientOnce sync.Once
}

type result struct {
Expand All @@ -84,6 +89,19 @@ func New() (task.Task, error) {

}

func (h *httpCore) getClient() *http.Client {
h.clientOnce.Do(func() {
transport := http.DefaultTransport.(*http.Transport).Clone()
transport.MaxConnsPerHost = defaultMaxConnsPerHost
transport.MaxIdleConnsPerHost = defaultMaxConnsPerHost
h.client = &http.Client{
Timeout: time.Duration(h.Timeout),
Transport: transport,
}
})
return h.client
}

func (h *httpCore) newFromInput(data []byte) (*httpCore, error) {

newHttp := &httpCore{
Expand Down Expand Up @@ -292,12 +310,7 @@ func (h *httpCore) call(endpoint string) (*result, error) {
}
}

// Create HTTP client with proxy configuration if specified
client := &http.Client{
Timeout: time.Duration(h.Timeout),
}

// Do we use proxy for this one?
client := h.getClient()
if h.Proxy != nil {
transport, err := h.Proxy.getTransport()
if err != nil {
Expand All @@ -307,7 +320,10 @@ func (h *httpCore) call(endpoint string) (*result, error) {
}
break
}
client.Transport = transport
client = &http.Client{
Timeout: time.Duration(h.Timeout),
Transport: transport,
}
}

response, err := client.Do(request)
Expand All @@ -319,7 +335,6 @@ func (h *httpCore) call(endpoint string) (*result, error) {
}
break
}

defer response.Body.Close()

body, err := io.ReadAll(response.Body)
Expand Down
Loading