make fmt

Author: dricross

metric/distribution/regular/regular_distribution.go

@@ -54,8 +54,7 @@ func (regularDist *RegularDistribution) Sum() float64 {
 func (regularDist *RegularDistribution) ValuesAndCounts() (values []float64, counts []float64) {
 	values = []float64{}
 	counts = []float64{}
-	for _, value := range regularDist.buckets {
-		counter := regularDist.buckets[value]
+	for value, counter := range regularDist.buckets {
 		values = append(values, value)
 		counts = append(counts, counter)
 	}

metric/distribution/regular/regular_distribution_test.go

@@ -87,3 +87,18 @@ func TestRegularDistribution(t *testing.T) {
 	assert.ErrorIs(t, anotherDist.AddEntry(distribution.MaxValue*1.001, 1), distribution.ErrUnsupportedValue)
 	assert.ErrorIs(t, anotherDist.AddEntry(distribution.MinValue*1.001, 1), distribution.ErrUnsupportedValue)
 }
+
+func cloneRegularDistribution(dist *RegularDistribution) *RegularDistribution {
+	clonedDist := &RegularDistribution{
+		maximum:     dist.maximum,
+		minimum:     dist.minimum,
+		sampleCount: dist.sampleCount,
+		sum:         dist.sum,
+		buckets:     map[float64]float64{},
+		unit:        dist.unit,
+	}
+	for k, v := range dist.buckets {
+		clonedDist.buckets[k] = v
+	}
+	return clonedDist
+}

plugins/outputs/cloudwatch/aggregator.go

@@ -12,9 +12,10 @@ import (
 	"sync"
 	"time"
 
+	"go.opentelemetry.io/collector/pdata/pmetric"
+
 	"github.com/aws/amazon-cloudwatch-agent/metric/distribution"
 	"github.com/aws/amazon-cloudwatch-agent/sdk/service/cloudwatch"
-	"go.opentelemetry.io/collector/pdata/pmetric"
 )
 
 const (

plugins/outputs/cloudwatch/cloudwatch.go

@@ -18,6 +18,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/models"
 	"github.com/influxdata/telegraf/plugins/outputs"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/aws/cloudwatch/histograms"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/exporter"
@@ -34,7 +35,6 @@ import (
 	"github.com/aws/amazon-cloudwatch-agent/metric/distribution"
 	"github.com/aws/amazon-cloudwatch-agent/sdk/service/cloudwatch"
 	"github.com/aws/amazon-cloudwatch-agent/sdk/service/cloudwatch/cloudwatchiface"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/aws/cloudwatch/histograms"
 )
 
 const (