migrate collector to go chassis

go-chassis/go-chassis#419

Author: tianxiaoliang

cse_collector.go

@@ -8,25 +8,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/go-chassis/go-chassis/third_party/forked/afex/hystrix-go/hystrix/metric_collector"
 	"github.com/rcrowley/go-metrics"
 )
 
-// CseCollector is a struct to keeps metric information of Http requests
-type CseCollector struct {
-	attempts          string
-	errors            string
-	successes         string
-	failures          string
-	rejects           string
-	shortCircuits     string
-	timeouts          string
-	fallbackSuccesses string
-	fallbackFailures  string
-	totalDuration     string
-	runDuration       string
-}
-
 // CseCollectorConfig is a struct to keep monitoring information
 type CseCollectorConfig struct {
 	// CseMonitorAddr is the http address of the csemonitor server
@@ -43,127 +27,3 @@ type CseCollectorConfig struct {
 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()
 }
-
-// NewCseCollector creates a new Collector Object
-func NewCseCollector(name string) metricCollector.MetricCollector {
-	return &CseCollector{
-		attempts:          name + ".attempts",
-		errors:            name + ".errors",
-		successes:         name + ".successes",
-		failures:          name + ".failures",
-		rejects:           name + ".rejects",
-		shortCircuits:     name + ".shortCircuits",
-		timeouts:          name + ".timeouts",
-		fallbackSuccesses: name + ".fallbackSuccesses",
-		fallbackFailures:  name + ".fallbackFailures",
-		totalDuration:     name + ".totalDuration",
-		runDuration:       name + ".runDuration",
-	}
-}
-
-func (c *CseCollector) incrementCounterMetric(prefix string) {
-	count, ok := metrics.GetOrRegister(prefix, metrics.NewCounter).(metrics.Counter)
-	if !ok {
-		return
-	}
-	count.Inc(1)
-}
-
-func (c *CseCollector) updateTimerMetric(prefix string, dur time.Duration) {
-	count, ok := metrics.GetOrRegister(prefix, metrics.NewTimer).(metrics.Timer)
-	if !ok {
-		return
-	}
-	count.Update(dur)
-}
-
-func (c *CseCollector) cleanMetric(prefix string) {
-	count, ok := metrics.GetOrRegister(prefix, metrics.NewCounter).(metrics.Counter)
-	if !ok {
-		return
-	}
-	count.Clear()
-}
-
-// IncrementAttempts function increments the number of calls to this circuit.
-// This registers as a counter
-func (c *CseCollector) IncrementAttempts() {
-	c.incrementCounterMetric(c.attempts)
-}
-
-// IncrementErrors function increments the number of unsuccessful attempts.
-// Attempts minus Errors will equal successes.
-// Errors are result from an attempt that is not a success.
-// This registers as a counter
-func (c *CseCollector) IncrementErrors() {
-	c.incrementCounterMetric(c.errors)
-
-}
-
-// IncrementSuccesses function increments the number of requests that succeed.
-// This registers as a counter
-func (c *CseCollector) IncrementSuccesses() {
-	c.incrementCounterMetric(c.successes)
-
-}
-
-// IncrementFailures function increments the number of requests that fail.
-// This registers as a counter
-func (c *CseCollector) IncrementFailures() {
-	c.incrementCounterMetric(c.failures)
-}
-
-// IncrementRejects function increments the number of requests that are rejected.
-// This registers as a counter
-func (c *CseCollector) IncrementRejects() {
-	c.incrementCounterMetric(c.rejects)
-}
-
-// IncrementShortCircuits function increments the number of requests that short circuited due to the circuit being open.
-// This registers as a counter
-func (c *CseCollector) IncrementShortCircuits() {
-	c.incrementCounterMetric(c.shortCircuits)
-}
-
-// IncrementTimeouts function increments the number of timeouts that occurred in the circuit breaker.
-// This registers as a counter
-func (c *CseCollector) IncrementTimeouts() {
-	c.incrementCounterMetric(c.timeouts)
-}
-
-// IncrementFallbackSuccesses function increments the number of successes that occurred during the execution of the fallback function.
-// This registers as a counter
-func (c *CseCollector) IncrementFallbackSuccesses() {
-	c.incrementCounterMetric(c.fallbackSuccesses)
-}
-
-// IncrementFallbackFailures function increments the number of failures that occurred during the execution of the fallback function.
-// This registers as a counter
-func (c *CseCollector) IncrementFallbackFailures() {
-	c.incrementCounterMetric(c.fallbackFailures)
-}
-
-// UpdateTotalDuration function updates the internal counter of how long we've run for.
-// This registers as a timer
-func (c *CseCollector) UpdateTotalDuration(timeSinceStart time.Duration) {
-	c.updateTimerMetric(c.totalDuration, timeSinceStart)
-}
-
-// UpdateRunDuration function updates the internal counter of how long the last run took.
-// This registers as a timer
-func (c *CseCollector) UpdateRunDuration(runDuration time.Duration) {
-	c.updateTimerMetric(c.runDuration, runDuration)
-}
-
-// Reset function is a noop operation in this collector.
-func (c *CseCollector) Reset() {
-	c.cleanMetric(c.attempts)
-	c.cleanMetric(c.failures)
-	c.cleanMetric(c.successes)
-	c.cleanMetric(c.shortCircuits)
-	c.cleanMetric(c.errors)
-	c.cleanMetric(c.rejects)
-	c.cleanMetric(c.timeouts)
-	c.cleanMetric(c.fallbackSuccesses)
-	c.cleanMetric(c.fallbackFailures)
-}

cse_collector_test.go

@@ -14,6 +14,8 @@ import (
 	"github.com/go-chassis/go-chassis/core/lager"
 	"github.com/rcrowley/go-metrics"
 	"github.com/stretchr/testify/assert"
+
+	chassisMetrics "github.com/go-chassis/go-chassis/metrics"
 )
 
 var globalConf = `
@@ -69,7 +71,7 @@ func TestCseMonitor2(t *testing.T) {
 	initEnv()
 	assert := assert.New(t)
 	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", "")
-	metricCollector := NewCseCollector("source.Provider.Microservice.SchemaID.OperationId")
+	metricCollector := chassisMetrics.NewCseCollector("source.Provider.Microservice.SchemaID.OperationId")
 	config.SelfServiceName = "testService"
 
 	metricCollector.IncrementAttempts()

csemonitor_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/go-chassis/go-chassis/core/config"
 	"github.com/go-chassis/go-chassis/core/lager"
 	chassisMetrics "github.com/go-chassis/go-chassis/metrics"
-	"github.com/go-chassis/go-chassis/third_party/forked/afex/hystrix-go/hystrix/metric_collector"
 	"github.com/rcrowley/go-metrics"
 )
 
@@ -17,7 +16,6 @@ func init() {
 
 //reportMetricsToCSEDashboard use go-metrics to send metrics to cse dashboard
 func reportMetricsToCSEDashboard(r metrics.Registry) error {
-	metricCollector.Registry.Register(NewCseCollector)
 
 	monitorServerURL, err := getMonitorEndpoint()
 	if err != nil {