Merge pull request #1829 from x13n/release-1.4

x13n · web-flow · commit 2c22636a58c0 · 2017-10-02T17:26:54.000+02:00
Bugfix: properly handle marshalJSON errors
diff --git a/metrics/sinks/stackdriver/stackdriver.go b/metrics/sinks/stackdriver/stackdriver.go
@@ -306,9 +306,9 @@ func (sink *StackdriverSink) requestSender(reqQueue chan *sd_api.CreateTimeSerie
 func marshalRequestAndLog(printer func([]byte), req *sd_api.CreateTimeSeriesRequest) {
 	reqJson, errJson := json.Marshal(req)
 	if errJson != nil {
-		printer(reqJson)
-	} else {
 		glog.Errorf("Couldn't marshal Stackdriver request %v", errJson)
+	} else {
+		printer(reqJson)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,9 @@ func (sink StackdriverSink) requestSender(reqQueue chan sd_api.CreateTimeSerie`
`306`	`306`	`func marshalRequestAndLog(printer func([]byte), req *sd_api.CreateTimeSeriesRequest) {`
`307`	`307`	`reqJson, errJson := json.Marshal(req)`
`308`	`308`	`if errJson != nil {`
`309`		`- printer(reqJson)`
`310`		`- } else {`
`311`	`309`	`glog.Errorf("Couldn't marshal Stackdriver request %v", errJson)`
	`310`	`+ } else {`
	`311`	`+ printer(reqJson)`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`