Merge pull request #77855 from andyzhangx/automated-cherry-pick-of-#77722-upstream-release-1.14

Automated cherry pick of #77722: fix incorrect prometheus metrics

Merge pull request #77855 from andyzhangx/automated-cherry-pick-of-#77722-upstream-release-1.14
88996f82 · Kubernetes Prow Robot · GitHub · 39fc3c49 · 59a89867 · 88996f82
Unverified Commit 88996f82 authored May 21, 2019 by Kubernetes Prow Robot Committed by GitHub May 21, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 37 additions and 67 deletions

azure_client.go pkg/cloudprovider/providers/azure/azure_client.go +34 -66

azure_metrics.go pkg/cloudprovider/providers/azure/azure_metrics.go +3 -1

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_client.go
+++ b/pkg/cloudprovider/providers/azure/azure_client.go
--- a/pkg/cloudprovider/providers/azure/azure_metrics.go
+++ b/pkg/cloudprovider/providers/azure/azure_metrics.go
@@ -50,12 +50,14 @@ func newMetricContext(prefix, request, resourceGroup, subscriptionID string) *me
 	}
 }

-func (mc *metricContext) Observe(err error) {
+func (mc *metricContext) Observe(err error) error {
 	apiMetrics.latency.WithLabelValues(mc.attributes...).Observe(
 		time.Since(mc.start).Seconds())
 	if err != nil {
 		apiMetrics.errors.WithLabelValues(mc.attributes...).Inc()
 	}
+
+	return err
 }

 func registerAPIMetrics(attributes ...string) *apiCallMetrics {