Use chassis httpclient

Author: humingcheng

csemonitor.go

@@ -53,7 +53,10 @@ func NewReporter(r metrics.Registry, addr string, header http.Header, interval t
 func (reporter *Reporter) Run() {
 	var count int
 	ticker := time.Tick(reporter.Interval)
-	metricsAPI := NewCseMonitorClient(reporter.Header, reporter.CseMonitorAddr, reporter.TLSConfig, "v2")
+	metricsAPI, err := NewCseMonitorClient(reporter.Header, reporter.CseMonitorAddr, reporter.TLSConfig, "v2")
+	if err != nil {
+		lager.Logger.Errorf(err, "Get cse monitor client failed")
+	}
 	IsMonitoringConnected = true
 	isConnctedForFirstTime := false
 

csemonitor_test.go

@@ -3,16 +3,17 @@ package metricsink
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/go-chassis/go-chassis/core/config"
-	"github.com/go-chassis/go-chassis/core/config/model"
-	"github.com/go-chassis/go-chassis/core/lager"
-	"github.com/rcrowley/go-metrics"
-	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
+
+	"github.com/go-chassis/go-chassis/core/config"
+	"github.com/go-chassis/go-chassis/core/config/model"
+	"github.com/go-chassis/go-chassis/core/lager"
+	"github.com/rcrowley/go-metrics"
+	"github.com/stretchr/testify/assert"
 )
 
 var globalConf = `
@@ -91,11 +92,12 @@ func TestCseMonitorClient_PostMetrics(t *testing.T) {
 	assert := assert.New(t)
 	config.SelfServiceName = "testService"
 	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "")
-	cseMonitClient := NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, "http://127.0.0.1:9098", &tls.Config{}, "v2")
+	cseMonitClient, err := NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, "http://127.0.0.1:9098", &tls.Config{}, "v2")
+	assert.NoError(err)
 	assert.Equal(cseMonitClient.URL, "http://127.0.0.1:9098")
 	assert.Equal(cseMonitClient.Header, http.Header{"Content-Type": []string{"application/json"}})
 	config.GlobalDefinition.Cse.Monitor.Client.Enable = false
-	err := cseMonitClient.PostMetrics(reporter.getData("default", "0.0.1", "Server", "", "", ""))
+	err = cseMonitClient.PostMetrics(reporter.getData("default", "0.0.1", "Server", "", "", ""))
 	assert.NotNil(err)
 
 	config.GlobalDefinition.Cse.Monitor.Client.Enable = true
@@ -109,7 +111,8 @@ func TestCseMonitorClient_PostMetrics(t *testing.T) {
 		fmt.Fprintln(w, "Hello client")
 	}))
 	defer ts.Close()
-	cseMonitClient = NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, ts.URL, &tls.Config{}, "v2")
+	cseMonitClient, err = NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, ts.URL, &tls.Config{}, "v2")
+	assert.NoError(err)
 	err = cseMonitClient.PostMetrics(MonitorData{
 		Name:     "testService",
 		Instance: "BLRY23283",
@@ -120,7 +123,8 @@ func TestCseMonitorClient_PostMetrics(t *testing.T) {
 		fmt.Fprintln(w, "Hello client")
 	}))
 	defer ts1.Close()
-	cseMonitClient = NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, ts1.URL, &tls.Config{}, "v2")
+	cseMonitClient, err = NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, ts1.URL, &tls.Config{}, "v2")
+	assert.Nil(err)
 	err = cseMonitClient.PostMetrics(MonitorData{
 		Name:     "testService",
 		Instance: "BLRY23283",

monitoring.go

@@ -1,17 +1,16 @@
 package metricsink
 
 import (
-	"bytes"
 	"crypto/tls"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"github.com/go-chassis/auth"
 	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
 	"time"
+
+	"github.com/go-chassis/go-chassis/pkg/httpclient"
 )
 
 // constant for the cse-collector
@@ -32,11 +31,11 @@ var (
 type CseMonitorClient struct {
 	Header http.Header
 	URL    string
-	Client *http.Client
+	Client *httpclient.URLClient
 }
 
 // NewCseMonitorClient creates an new client for monitoring
-func NewCseMonitorClient(header http.Header, url string, tlsConfig *tls.Config, version string) *CseMonitorClient {
+func NewCseMonitorClient(header http.Header, url string, tlsConfig *tls.Config, version string) (*CseMonitorClient, error) {
 	var apiVersion string
 
 	switch version {
@@ -53,14 +52,19 @@ func NewCseMonitorClient(header http.Header, url string, tlsConfig *tls.Config,
 	}
 	//Update the API Base Path based on the Version
 	updateAPIPath(apiVersion)
+
+	c, err := httpclient.GetURLClient(&httpclient.URLClientOption{
+		TLSConfig:             tlsConfig,
+		ResponseHeaderTimeout: DefaultTimeout,
+	})
+	if err != nil {
+		return nil, err
+	}
 	return &CseMonitorClient{
 		Header: header,
 		URL:    url,
-		Client: &http.Client{
-			Transport: TransportFor(tlsConfig),
-			Timeout:   DefaultTimeout,
-		},
-	}
+		Client: c,
+	}, nil
 }
 
 // updateAPIPath Update the Base PATH and HEADERS Based on the version of MetricServer used.
@@ -86,33 +90,24 @@ func updateAPIPath(apiVersion string) {
 
 // PostMetrics is a functions which sends the monintoring data to monitoring Server
 func (cseMonitorClient *CseMonitorClient) PostMetrics(monitorData MonitorData) (err error) {
-
 	var (
 		js      []byte
-		req     *http.Request
 		resp    *http.Response
 		postURL string
+		h       http.Header
 	)
 
 	if js, err = json.Marshal(monitorData); err != nil {
 		return
 	}
 
 	postURL = cseMonitorClient.URL + MetricServerPath + "?service=" + monitorData.Name
-
-	if req, err = http.NewRequest("POST", postURL, bytes.NewBuffer(js)); err != nil {
-		return
-	}
-	req.Header = make(http.Header)
+	h = make(http.Header)
 	for k, v := range cseMonitorClient.Header {
-		req.Header[k] = v
-	}
-
-	if err = auth.AddAuthInfo(req); err != nil {
-		return errors.New("Add auth info failed, err: " + err.Error())
+		h[k] = v
 	}
 
-	if resp, err = cseMonitorClient.Client.Do(req); err != nil {
+	if resp, err = cseMonitorClient.Client.HTTPDo(http.MethodPost, postURL, h, js); err != nil {
 		return
 	}
 	defer resp.Body.Close()