Merge pull request #1219 from courageJ/fix-metric-descriptor-refresh-error

PlateauGao · web-flow · commit 8c06a0ecd5b1 · 2026-06-16T10:53:40.000-04:00
Fix error handling in getMetricDescriptors
diff --git a/prometheus-to-sd/translator/stackdriver.go b/prometheus-to-sd/translator/stackdriver.go
@@ -97,7 +97,7 @@ func getMetricDescriptors(ctx context.Context, client *monitoring.MetricClient,
 		}
 		if err != nil {
 			glog.Warningf("Error while fetching metric descriptors for %v: %v", config.SourceConfig.Component, err)
-			return metrics, nil
+			return nil, err
 		}
 		if _, metricName, err := parseMetricType(config, metricDescriptor.Type); err == nil {
 			metrics[metricName] = metricDescriptor

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func getMetricDescriptors(ctx context.Context, client *monitoring.MetricClient,`
`97`	`97`	`}`
`98`	`98`	`if err != nil {`
`99`	`99`	`glog.Warningf("Error while fetching metric descriptors for %v: %v", config.SourceConfig.Component, err)`
`100`		`- return metrics, nil`
	`100`	`+ return nil, err`
`101`	`101`	`}`
`102`	`102`	`if _, metricName, err := parseMetricType(config, metricDescriptor.Type); err == nil {`
`103`	`103`	`metrics[metricName] = metricDescriptor`