mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-29 07:29:42 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1948 from prometheus/httpclient

Browse source 
retrieval: export NewHTTPClient
This commit is contained in:
Fabian Reinartz 2016-09-05 17:07:45 +02:00 committed by GitHub
parent 75bae065fd 0322c59dc3
commit 2b45d516fd
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
retrieval/scrape.go
View file

@ -115,7 +115,7 @@ type scrapePool struct {
} }
func newScrapePool(cfg *config.ScrapeConfig, app storage.SampleAppender) *scrapePool { func newScrapePool(cfg *config.ScrapeConfig, app storage.SampleAppender) *scrapePool {
client, err := newHTTPClient(cfg) client, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
// Any errors that could occur here should be caught during config validation. // Any errors that could occur here should be caught during config validation.
log.Errorf("Error creating HTTP client for job %q: %s", cfg.JobName, err) log.Errorf("Error creating HTTP client for job %q: %s", cfg.JobName, err)
@ -167,7 +167,7 @@ func (sp *scrapePool) reload(cfg *config.ScrapeConfig) {
sp.mtx.Lock() sp.mtx.Lock()
defer sp.mtx.Unlock() defer sp.mtx.Unlock()
client, err := newHTTPClient(cfg) client, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
// Any errors that could occur here should be caught during config validation. // Any errors that could occur here should be caught during config validation.
log.Errorf("Error creating HTTP client for job %q: %s", cfg.JobName, err) log.Errorf("Error creating HTTP client for job %q: %s", cfg.JobName, err)

3
retrieval/target.go
View file

@ -66,7 +66,8 @@ func NewTarget(labels, metaLabels model.LabelSet, params url.Values) *Target {
} }
} }
func newHTTPClient(cfg *config.ScrapeConfig) (*http.Client, error) { // NewHTTPClient returns a new HTTP client configured for the given scrape configuration.
func NewHTTPClient(cfg *config.ScrapeConfig) (*http.Client, error) {
tlsOpts := httputil.TLSOptions{ tlsOpts := httputil.TLSOptions{
InsecureSkipVerify: cfg.TLSConfig.InsecureSkipVerify, InsecureSkipVerify: cfg.TLSConfig.InsecureSkipVerify,
CAFile: cfg.TLSConfig.CAFile, CAFile: cfg.TLSConfig.CAFile,

16
retrieval/target_test.go
View file

@ -155,7 +155,7 @@ func TestNewHTTPBearerToken(t *testing.T) {
ScrapeTimeout: model.Duration(1 * time.Second), ScrapeTimeout: model.Duration(1 * time.Second),
BearerToken: "1234", BearerToken: "1234",
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -183,7 +183,7 @@ func TestNewHTTPBearerTokenFile(t *testing.T) {
ScrapeTimeout: model.Duration(1 * time.Second), ScrapeTimeout: model.Duration(1 * time.Second),
BearerTokenFile: "testdata/bearertoken.txt", BearerTokenFile: "testdata/bearertoken.txt",
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -213,7 +213,7 @@ func TestNewHTTPBasicAuth(t *testing.T) {
Password: "password123", Password: "password123",
}, },
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -242,7 +242,7 @@ func TestNewHTTPCACert(t *testing.T) {
CAFile: caCertPath, CAFile: caCertPath,
}, },
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -277,7 +277,7 @@ func TestNewHTTPClientCert(t *testing.T) {
KeyFile: "testdata/client.key", KeyFile: "testdata/client.key",
}, },
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -307,7 +307,7 @@ func TestNewHTTPWithServerName(t *testing.T) {
ServerName: "prometheus.rocks", ServerName: "prometheus.rocks",
}, },
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -337,7 +337,7 @@ func TestNewHTTPWithBadServerName(t *testing.T) {
ServerName: "badname", ServerName: "badname",
}, },
} }
c, err := newHTTPClient(cfg) c, err := NewHTTPClient(cfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -377,7 +377,7 @@ func TestNewClientWithBadTLSConfig(t *testing.T) {
KeyFile: "testdata/nonexistent_client.key", KeyFile: "testdata/nonexistent_client.key",
}, },
} }
_, err := newHTTPClient(cfg) _, err := NewHTTPClient(cfg)
if err == nil { if err == nil {
t.Fatalf("Expected error, got nil.") t.Fatalf("Expected error, got nil.")
} }