Merge pull request #38 from tianxiaoliang/master

refactor

Author: tianxiaoliang

cse_collector.go

@@ -0,0 +1,76 @@
+package metricsink
+
+// Forked from github.com/afex/hystrix-go
+// Some parts of this file have been modified to make it functional in this package
+
+import (
+	"crypto/tls"
+	"github.com/go-chassis/go-chassis/core/common"
+	"github.com/go-chassis/go-chassis/third_party/forked/afex/hystrix-go/hystrix"
+	"github.com/go-mesh/openlogging"
+	"net/http"
+	"sync"
+	"time"
+)
+
+var initOnce = sync.Once{}
+
+// CseCollectorConfig is a struct to keep monitoring information
+type CseCollectorConfig struct {
+	// CseMonitorAddr is the http address of the csemonitor server
+	CseMonitorAddr string
+	// Headers for csemonitor server
+	Header http.Header
+	// TickInterval specifies the period that this collector will send metrics to the server.
+	TimeInterval time.Duration
+	// Config structure to configure a TLS client for sending Metric data
+	TLSConfig *tls.Config
+
+	Env string
+}
+
+func init() {
+	hystrix.InstallReporter("CSE Monitoring", reportMetricsToCSEDashboard)
+}
+
+var reporter *Reporter
+
+//GetReporter get reporter singleton
+func GetReporter() (*Reporter, error) {
+	var errResult error
+	initOnce.Do(func() {
+		monitorServerURL, err := getMonitorEndpoint()
+		if err != nil {
+			openlogging.GetLogger().Warnf("Get Monitoring URL failed, CSE monitoring function disabled, err: %v", err)
+			errResult = err
+		}
+		openlogging.GetLogger().Infof("init monitoring client : %s", monitorServerURL)
+		tlsConfig, err := getTLSForClient(monitorServerURL)
+		if err != nil {
+			openlogging.GetLogger().Errorf("Get %s.%s TLS config failed,error : %s", monitorServerURL, common.Consumer, err)
+			errResult = err
+		}
+		reporter, err = NewReporter(&CseCollectorConfig{
+			CseMonitorAddr: monitorServerURL,
+			Header:         getAuthHeaders(),
+			TLSConfig:      tlsConfig,
+		})
+		if err != nil {
+			openlogging.Error("new reporter failed", openlogging.WithTags(openlogging.Tags{
+				"err": err.Error(),
+			}))
+			errResult = err
+		}
+	})
+	return reporter, errResult
+}
+
+//reportMetricsToCSEDashboard use send metrics to cse dashboard
+func reportMetricsToCSEDashboard(cb *hystrix.CircuitBreaker) error {
+	r, err := GetReporter()
+	if err != nil {
+		return err
+	}
+	r.Send(cb)
+	return nil
+}

cse_reporter.go

@@ -1,15 +1,12 @@
 package metricsink
 
 import (
-	"crypto/tls"
-	"net/http"
-	"os"
-	"time"
-
 	"github.com/go-chassis/go-archaius"
 	chassisRuntime "github.com/go-chassis/go-chassis/pkg/runtime"
 	"github.com/go-chassis/go-chassis/third_party/forked/afex/hystrix-go/hystrix"
 	"github.com/go-mesh/openlogging"
+	"github.com/huaweicse/cse-collector/pkg/monitoring"
+	"os"
 	"runtime"
 )
 
@@ -18,71 +15,51 @@ var IsMonitoringConnected bool
 
 // Reporter is a struct to store the registry address and different monitoring information
 type Reporter struct {
-	CseMonitorAddr string
-	Header         http.Header
-	Interval       time.Duration
-	Percentiles    []float64
-	TLSConfig      *tls.Config
-	app            string
-	version        string
-	service        string
-	environment    string
-	serviceID      string
-	metricsAPI     *CseMonitorClient
+	environment string
+	c           *monitoring.CseMonitorClient
 }
 
 // NewReporter creates a new monitoring object for CSE type collections
-func NewReporter(addr string, header http.Header, interval time.Duration, tls *tls.Config, app, version, service, env string) *Reporter {
-	reporter := &Reporter{
-		CseMonitorAddr: addr,
-		Header:         header,
-		Interval:       interval,
-		Percentiles:    []float64{0.5, 0.75, 0.95, 0.99, 0.999},
-		TLSConfig:      tls,
-		app:            app,
-		version:        version,
-		service:        service,
-		environment:    env,
-	}
-	metricsAPI, err := NewCseMonitorClient(reporter.Header, reporter.CseMonitorAddr, reporter.TLSConfig, "v2")
+func NewReporter(config *CseCollectorConfig) (*Reporter, error) {
+	c, err := monitoring.NewCseMonitorClient(config.Header, config.CseMonitorAddr, config.TLSConfig)
 	if err != nil {
 		openlogging.GetLogger().Errorf("Get cse monitor client failed:%s", err)
+		return nil, err
 	}
-	reporter.metricsAPI = metricsAPI
 	IsMonitoringConnected = true
-	return reporter
+	return &Reporter{
+		environment: config.Env,
+		c:           c,
+	}, nil
 }
 
-// Run creates a go_routine which runs continuously and capture the monitoring data
-func (reporter *Reporter) Run(cb *hystrix.CircuitBreaker) {
-	ticker := time.Tick(reporter.Interval)
-
-	for range ticker {
-		if archaius.GetBool("cse.monitor.client.enable", true) {
-			reporter.serviceID = chassisRuntime.ServiceID
-			monitorData := reporter.getData(cb, reporter.app, reporter.version,
-				reporter.service, reporter.environment, reporter.serviceID, chassisRuntime.InstanceID)
-			err := reporter.metricsAPI.PostMetrics(monitorData)
-			if err != nil {
-				openlogging.GetLogger().Warnf("Unable to report to monitoring server, err: %v", err)
-			}
+//Send send metrics to monitoring service
+func (reporter *Reporter) Send(cb *hystrix.CircuitBreaker) {
+	if archaius.GetBool("cse.monitor.client.enable", true) {
+		monitorData := reporter.getData(cb)
+		openlogging.Debug("send metrics", openlogging.WithTags(openlogging.Tags{
+			"data": monitorData,
+		}))
+		err := reporter.c.PostMetrics(monitorData)
+		if err != nil {
+			openlogging.GetLogger().Warnf("unable to report to monitoring server, err: %v", err)
 		}
 	}
 }
 
-func (reporter *Reporter) getData(cb *hystrix.CircuitBreaker,
-	app, version, service, env, serviceID, instanceID string) MonitorData {
-	var monitorData = NewMonitorData()
-	monitorData.AppID = app
-	monitorData.Version = version
-	monitorData.Name = service
-	monitorData.ServiceID = serviceID
-	monitorData.InstanceID = instanceID
-	monitorData.Environment = env
+func (reporter *Reporter) getData(cb *hystrix.CircuitBreaker) monitoring.MonitorData {
+	var monitorData = monitoring.NewMonitorData()
+	monitorData.AppID = chassisRuntime.App
+	monitorData.Version = chassisRuntime.Version
+	monitorData.Name = chassisRuntime.ServiceName
+	monitorData.ServiceID = chassisRuntime.ServiceID
+	monitorData.InstanceID = chassisRuntime.InstanceID
+
+	monitorData.Environment = reporter.environment
 	monitorData.Instance, _ = os.Hostname()
 	monitorData.Memory = getProcessInfo()
 	monitorData.Thread = threadCreateProfile.Count()
 	monitorData.CPU = float64(runtime.NumCPU())
-	monitorData.appendInterfaceInfo(cb.Name, cb.Metrics.DefaultCollector())
+	monitorData.AppendInterfaceInfo(cb)
 	return *monitorData
 }

csemonitor.go

@@ -0,0 +1,14 @@
+
+
+
+## build
+```shell
+cd example
+export GOPROXY=https://goproxy.io
+export REPO=swr.cn-east-2.myhuaweicloud.com/tian
+build_image.sh
+```
+
+
+
+

example/README.md

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+
+export ROOT=$PWD
+cd order
+set -e 
+set -x 
+#GO111MODULE=on go mod vendor
+build_image(){
+    cd ${ROOT}/$1
+    CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main
+    sudo docker build --build-arg VERSION=$2 -t ${REPO}/$1:$2 .
+    sudo docker push  ${REPO}/$1:$2
+}
+
+build_image order 1.0.0
+build_image restaurant 1.0.0
+build_image restaurant 1.0.1

example/build_image.sh

@@ -0,0 +1,5 @@
+FROM alpine:latest
+WORKDIR /opt/order
+COPY conf /opt/order/conf
+COPY main /opt/order
+ENTRYPOINT ["/opt/order/main"]

example/order/Dockerfile

@@ -0,0 +1,14 @@
+---
+#APPLICATION_ID: CSE optional
+cse:
+  service:
+    registry:
+      address: http://127.0.0.1:30100
+  protocols:
+    rest:
+      listenAddress: 0.0.0.0:5000
+      advertiseAddress: 127.0.0.1:5000
+  handler:
+    chain:
+      Consumer:
+        default: router,bizkeeper-consumer,loadbalance,transport

example/order/conf/chassis.yaml

@@ -0,0 +1,22 @@
+---
+# LoggerLevel: |DEBUG|INFO|WARN|ERROR|FATAL
+logger_level: DEBUG
+
+# LoggerFile: used to output the name of log.可配置绝对路径，也可以配置用于拼接CHASSIS_HOME的相对路径。
+logger_file: log/chassis.log
+
+# LogFormatText:设定日志的输出格式是 json 还是 plaintext (类似于log4j)，默认为 false，不建议修改，如果开发过程中想本地查看日志的话，
+# 可以设定 LoggerFile 和 LogFormatText 为 true，这样会输出类似于 log4j 格式的本地日志。
+log_format_text: false
+
+#rollingPolicy daily/size;用于配置根据时间，还是根据大小进行日志rotate操作。
+rollingPolicy: size
+
+# MaxDaily of a log file before rotate. By D Days.；日志rotate时间配置，单位"day"。
+log_rotate_date: 1
+
+# MaxSize of a log file before rotate. By M Bytes.；日志rotate文件大小配置，单位"MB"。
+log_rotate_size: 10
+
+# Max counts to keep of a log's backup files.日志最大存储数量，单位“个”。
+log_backup_count: 7

example/order/conf/lager.yaml

@@ -0,0 +1,5 @@
+---
+#微服务的私有属性
+service_description:
+  name: order
+  version: 1.0.0

example/order/conf/microservice.yaml

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"github.com/go-chassis/go-chassis"
+	"github.com/go-mesh/openlogging"
+	_ "github.com/huaweicse/auth/adaptor/gochassis"
+	_ "github.com/huaweicse/cse-collector"
+	"github.com/huaweicse/cse-collector/example/order/resource"
+	"log"
+	"os"
+)
+
+//if you use go run main.go instead of binary run, plz export CHASSIS_HOME=/{path}/{to}/rest/client/
+
+func main() {
+	envs := os.Environ()
+	for _, e := range envs {
+		log.Println(e)
+	}
+	chassis.RegisterSchema("rest", &resource.OrderResource{})
+	//Init framework
+	if err := chassis.Init(); err != nil {
+		openlogging.Error("Init failed." + err.Error())
+		return
+	}
+
+	err := chassis.Run()
+	if err != nil {
+		panic(err)
+	}
+}