From 7acb203b52eea5519cd08cdf894b9237ee4e89a1 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Tue, 22 Feb 2022 19:24:52 +0900 Subject: [PATCH] remove unused code of Cloud Monitoring distribution metrics type (#45702) --- .../cloudmonitoring/time_series_filter.go | 32 +------------------ 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/pkg/tsdb/cloudmonitoring/time_series_filter.go b/pkg/tsdb/cloudmonitoring/time_series_filter.go index 2f924899e08..9317e29b080 100644 --- a/pkg/tsdb/cloudmonitoring/time_series_filter.go +++ b/pkg/tsdb/cloudmonitoring/time_series_filter.go @@ -166,11 +166,10 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes if len(point.Value.DistributionValue.BucketCounts) == 0 { continue } - maxKey := 0 for i := 0; i < len(point.Value.DistributionValue.BucketCounts); i++ { value, err := strconv.ParseFloat(point.Value.DistributionValue.BucketCounts[i], 64) if err != nil { - continue + return err } if _, ok := buckets[i]; !ok { // set lower bounds @@ -197,38 +196,9 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes ExecutedQueryString: executedQueryString, }, } - - if maxKey < i { - maxKey = i - } } buckets[i].AppendRow(point.Interval.EndTime, value) } - for i := 0; i < maxKey; i++ { - if _, ok := buckets[i]; !ok { - bucketBound := calcBucketBound(point.Value.DistributionValue.BucketOptions, i) - additionalLabels := data.Labels{"bucket": bucketBound} - timeField := data.NewField(data.TimeSeriesTimeFieldName, nil, []time.Time{}) - valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{}) - frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, seriesLabels, - additionalLabels, timeSeriesFilter) - valueField.Name = frameName - valueField.Labels = seriesLabels - setDisplayNameAsFieldName(valueField) - - buckets[i] = &data.Frame{ - Name: frameName, - RefID: timeSeriesFilter.RefID, - Fields: []*data.Field{ - timeField, - valueField, - }, - Meta: &data.FrameMeta{ - ExecutedQueryString: executedQueryString, - }, - } - } - } } for i := 0; i < len(buckets); i++ { buckets[i].Meta.Custom = customFrameMeta