Merge pull request #37 from tianxiaoliang/master

adapt to latest go chassis,remove go-metrics

Author: tianxiaoliang

README.md

@@ -1,8 +1,7 @@
 ### Metric Collector for Go-Chassis
 [![Build Status](https://travis-ci.org/ServiceComb/cse-collector.svg?branch=master)](https://travis-ci.org/ServiceComb/cse-collector)   
-This a metric collector for Go-Chassis which collects metrics of the microservices. 
-It can collect metrics for each api's exposed by the micro-services. The same data can be 
-exposed to Huawei CSE Governance Dashboard.
+This is a reporter plugin for go-chassis 
+which report circuit breaker metrics to Huaweicloud.
 
 # How to use 
 
@@ -12,7 +11,7 @@ import _ "github.com/huaweicse/cse-collector"
 ```
 
 # Introdction
-The metrics collected by this collector is listed below:
+The metrics reported by this collector is listed below:
 ```
 attempts
 errors
@@ -50,8 +49,9 @@ CountTimeout         int64   `json:"countTimeout"`
 ```
 
 #### Configurations
-You need to configure your microservice to send the data at regular interval to 
-Huawei CSE Dashboard.
+in chassis.yaml file. 
+You need to configure your micro service to send the data to 
+Huaweicloud ServiceStage.
 
 ```
 cse:
@@ -157,5 +157,3 @@ Every 10sec data will be flushed
     ]
 ]
 ```
-
-If perticular micro service has more than one instance and if request has been sent to perticular instance then only for that instance all the value should change.

cse_collector.go

@@ -7,8 +7,6 @@ import (
 	"crypto/tls"
 	"net/http"
 	"time"
-
-	"github.com/rcrowley/go-metrics"
 )
 
 // CseCollectorConfig is a struct to keep monitoring information
@@ -24,6 +22,6 @@ type CseCollectorConfig struct {
 }
 
 // InitializeCseCollector starts the CSE collector in a new Thread
-func InitializeCseCollector(config *CseCollectorConfig, r metrics.Registry, app, version, service, env string) {
-	go NewReporter(r, config.CseMonitorAddr, config.Header, config.TimeInterval, config.TLSConfig, app, version, service, env).Run()
+func InitializeCseCollector(config *CseCollectorConfig, app, version, service, env string) {
+	NewReporter(config.CseMonitorAddr, config.Header, config.TimeInterval, config.TLSConfig, app, version, service, env).Run()
 }

csemonitor.go

@@ -4,22 +4,20 @@ import (
 	"crypto/tls"
 	"net/http"
 	"os"
-	"runtime"
 	"time"
 
 	"github.com/go-chassis/go-archaius"
-	"github.com/go-chassis/go-chassis/core/lager"
-	"github.com/go-chassis/go-chassis/core/registry"
-	runtime2 "github.com/go-chassis/go-chassis/pkg/runtime"
-	"github.com/rcrowley/go-metrics"
+	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"
+	"runtime"
 )
 
 // IsMonitoringConnected is a boolean to keep an check if there exsist any succeful connection to monitoring Server
 var IsMonitoringConnected bool
 
 // Reporter is a struct to store the registry address and different monitoring information
 type Reporter struct {
-	Registry       metrics.Registry
 	CseMonitorAddr string
 	Header         http.Header
 	Interval       time.Duration
@@ -30,12 +28,12 @@ type Reporter struct {
 	service        string
 	environment    string
 	serviceID      string
+	metricsAPI     *CseMonitorClient
 }
 
 // NewReporter creates a new monitoring object for CSE type collections
-func NewReporter(r metrics.Registry, addr string, header http.Header, interval time.Duration, tls *tls.Config, app, version, service, env string) *Reporter {
+func NewReporter(addr string, header http.Header, interval time.Duration, tls *tls.Config, app, version, service, env string) *Reporter {
 	reporter := &Reporter{
-		Registry:       r,
 		CseMonitorAddr: addr,
 		Header:         header,
 		Interval:       interval,
@@ -46,78 +44,34 @@ func NewReporter(r metrics.Registry, addr string, header http.Header, interval t
 		service:        service,
 		environment:    env,
 	}
+	metricsAPI, err := NewCseMonitorClient(reporter.Header, reporter.CseMonitorAddr, reporter.TLSConfig, "v2")
+	if err != nil {
+		openlogging.GetLogger().Errorf("Get cse monitor client failed:%s", err)
+	}
+	reporter.metricsAPI = metricsAPI
+	IsMonitoringConnected = true
 	return reporter
 }
 
 // Run creates a go_routine which runs continuously and capture the monitoring data
-func (reporter *Reporter) Run() {
-	var count int
+func (reporter *Reporter) Run(cb *hystrix.CircuitBreaker) {
 	ticker := time.Tick(reporter.Interval)
-	metricsAPI, err := NewCseMonitorClient(reporter.Header, reporter.CseMonitorAddr, reporter.TLSConfig, "v2")
-	if err != nil {
-		lager.Logger.Errorf("Get cse monitor client failed:%s", err)
-	}
-	IsMonitoringConnected = true
-	isConnctedForFirstTime := false
 
 	for range ticker {
-
-		//If monitoring is enabled then only try to connect to Monitoring Server
 		if archaius.GetBool("cse.monitor.client.enable", true) {
-			reporter.serviceID = runtime2.ServiceID
-
-			instances, ok := registry.SelfInstancesCache.Get(reporter.serviceID)
-
-			if !ok {
-				lager.Logger.Warnf("waiting for instance registration: [%s]", reporter.serviceID)
-				continue
-			}
-
-			instanceIDs, ok := instances.([]string)
-			if !ok {
-				lager.Logger.Warnf("type assert of instance failed, sid: %s", reporter.serviceID)
-				continue
-			}
-
-			for _, instance := range instanceIDs {
-				monitorData := reporter.getData(reporter.app, reporter.version, reporter.service, reporter.environment, reporter.serviceID, instance)
-				err := metricsAPI.PostMetrics(monitorData)
-				if err != nil {
-					//If the connection fails for the first time then print Warn Logs
-					if IsMonitoringConnected {
-						lager.Logger.Warnf("Unable to connect to monitoring server, err: %v", err)
-					}
-					IsMonitoringConnected = false
-				} else {
-					//If Connection is established for first time then Print the Info logs
-					if !isConnctedForFirstTime {
-						lager.Logger.Infof("Connection to monitoring server established successfully")
-						isConnctedForFirstTime = true
-					}
-					//If connection is recovered first time then print Info Logs
-					if !IsMonitoringConnected {
-						lager.Logger.Infof("Connection recovered successfully to monitoring server")
-					}
-					IsMonitoringConnected = true
-				}
-
-				if len(monitorData.Interfaces) != 0 {
-					count++
-					if count == 10 {
-						reporter.Registry.Each(func(s string, i interface{}) {
-							if c, ok := i.(metrics.Counter); ok {
-								c.Clear()
-							}
-						})
-						count = 0
-					}
-				}
+			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)
 			}
 		}
 	}
 }
 
-func (reporter *Reporter) getData(app, version, service, env, serviceID, instanceID string) MonitorData {
+func (reporter *Reporter) getData(cb *hystrix.CircuitBreaker,
+	app, version, service, env, serviceID, instanceID string) MonitorData {
 	var monitorData = NewMonitorData()
 	monitorData.AppID = app
 	monitorData.Version = version
@@ -129,8 +83,6 @@ func (reporter *Reporter) getData(app, version, service, env, serviceID, instanc
 	monitorData.Memory = getProcessInfo()
 	monitorData.Thread = threadCreateProfile.Count()
 	monitorData.CPU = float64(runtime.NumCPU())
-	reporter.Registry.Each(func(name string, i interface{}) {
-		monitorData.appendInterfaceInfo(name, i)
-	})
+	monitorData.appendInterfaceInfo(cb.Name, cb.Metrics.DefaultCollector())
 	return *monitorData
 }

csemonitor_test.go

@@ -0,0 +1,8 @@
+module github.com/huaweicse/cse-collector
+
+require (
+	github.com/go-chassis/foundation v0.0.0-20190621030543-c3b63f787f4c
+	github.com/go-chassis/go-archaius v0.19.0
+	github.com/go-chassis/go-chassis v1.5.2-0.20190713094014-10193b3a09b8
+	github.com/go-mesh/openlogging v1.0.0
+)