Merge pull request #40 from tianxiaoliang/master

upgrade go chassis version

Author: tianxiaoliang

example/restaurant/start.sh

@@ -36,7 +36,7 @@ log_backup_count: 7
 EOM
 
 if [ ! -z "$VERSION" ]; then
-    /bin/echo "Version ENV: $SERVICE_NAME"
+    /bin/echo "Version ENV: $VERSION"
     cat << EOF > ${root_dir}/conf/microservice.yaml
 service_description:
   name: restaurant

go.mod

@@ -1,13 +1,12 @@
 module github.com/huaweicse/cse-collector
 
 require (
-	github.com/go-chassis/foundation v0.0.0-20190621030543-c3b63f787f4c
-	github.com/go-chassis/go-archaius v0.20.0
-	github.com/go-chassis/go-chassis v1.7.1
-	github.com/go-mesh/openlogging v1.0.1-0.20181205082104-3d418c478b2d
+	github.com/go-chassis/foundation v0.1.0
+	github.com/go-chassis/go-archaius v0.24.0
+	github.com/go-chassis/go-chassis v1.7.6
+	github.com/go-mesh/openlogging v1.0.1
 	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
-	github.com/huaweicse/auth v1.1.1
-	github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f // indirect
-	github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 // indirect
-	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
+	github.com/huaweicse/auth v1.1.2
 )
+
+go 1.13

pkg/monitoring/client.go

@@ -1,6 +1,7 @@
 package monitoring
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
@@ -29,12 +30,12 @@ var (
 type CseMonitorClient struct {
 	Header http.Header
 	URL    string
-	Client *httpclient.URLClient
+	Client *httpclient.Requests
 }
 
 // NewCseMonitorClient creates an new client for monitoring
 func NewCseMonitorClient(header http.Header, url string, tlsConfig *tls.Config) (*CseMonitorClient, error) {
-	c, err := httpclient.GetURLClient(&httpclient.URLClientOption{
+	c, err := httpclient.New(&httpclient.Options{
 		SSLEnabled:            tlsConfig != nil,
 		TLSConfig:             tlsConfig,
 		ResponseHeaderTimeout: DefaultTimeout,
@@ -80,7 +81,7 @@ func (cseMonitorClient *CseMonitorClient) PostMetrics(monitorData MonitorData) (
 		h[k] = v
 	}
 
-	if resp, err = cseMonitorClient.Client.HTTPDo(http.MethodPost, postURL, h, js); err != nil {
+	if resp, err = cseMonitorClient.Client.Do(context.Background(), http.MethodPost, postURL, h, js); err != nil {
 		return
 	}
 	defer resp.Body.Close()

utils.go

@@ -68,7 +68,7 @@ func getAuthHeaders() http.Header {
 func getMonitorEndpoint() (string, error) {
 	monitorEndpoint := config.GlobalDefinition.Cse.Monitor.Client.ServerURI
 	if monitorEndpoint == "" {
-		monitorURL, err := endpoint.GetEndpointFromServiceCenter("default", "CseMonitoring", "latest")
+		monitorURL, err := endpoint.GetEndpoint("default", "CseMonitoring", "latest")
 		if err != nil {
 			openlogging.GetLogger().Warnf("empty monitor server endpoint, please provide the monitor server endpoint, err: %v", err)
 			return "", err