Merge pull request #20 from savitaashture/cb

Added changes to report circuitbreaker status and refactored data flushing

Author: tianxiaoliang

csemonitor.go

@@ -52,20 +52,7 @@ func NewReporter(r metrics.Registry, addr string, header http.Header, interval t
 
 // Run creates a go_routine which runs continuously and capture the monitoring data
 func (reporter *Reporter) Run() {
-
-	go reporter.postData()
-	go reporter.cleanData()
-
-}
-
-func (reporter *Reporter) cleanData() {
-	ticker := time.Tick(20 * time.Second)
-	for range ticker {
-		hystrix.Flush()
-	}
-}
-
-func (reporter *Reporter) postData() {
+	var count int
 	ticker := time.Tick(reporter.Interval)
 	metricsAPI := NewCseMonitorClient(reporter.Header, reporter.CseMonitorAddr, reporter.TLSConfig, "v2")
 	IsMonitoringConnected = true
@@ -109,6 +96,14 @@ func (reporter *Reporter) postData() {
 					}
 					IsMonitoringConnected = true
 				}
+
+				if len(monitorData.Interfaces) != 0 {
+					count++
+					if count == 10 {
+						hystrix.Flush()
+						count = 0
+					}
+				}
 			}
 		}
 	}

monitorData.go

@@ -47,7 +47,7 @@ type InterfaceInfo struct {
 	Total                int64   `json:"total"`
 	Failure              int64   `json:"failure"`
 	ShortCircuited       int64   `json:"shortCircuited"`
-	IsCircuitBreakerOpen bool    `json:"isCircuitBreakerOpen"`
+	IsCircuitBreakerOpen bool    `json:"circuitBreakerOpen"`
 	SemaphoreRejected    int64   `json:"semaphoreRejected"`
 	ThreadPoolRejected   int64   `json:"threadPoolRejected"`
 	CountTimeout         int64   `json:"countTimeout"`
@@ -90,6 +90,10 @@ func (monitorData *MonitorData) appendInterfaceInfo(name string, i interface{})
 			interfaceInfo.successCount = metric.Count()
 		}
 
+		if interfaceInfo.ShortCircuited != 0 {
+			interfaceInfo.IsCircuitBreakerOpen = true
+		}
+
 		qps := (float64(interfaceInfo.Total) * (1 - math.Exp(-5.0/60.0/1)))
 		movingAverageFor3Precision, err := strconv.ParseFloat(fmt.Sprintf("%.3f", qps), 64)
 		if err == nil {