Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log CloudWatch response error #961

Merged
merged 2 commits into from Feb 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion metrics/cloudwatch/cloudwatch.go
Expand Up @@ -255,7 +255,7 @@ func (cw *CloudWatch) Send() error {
}
var firstErr error
for i := 0; i < cap(errors); i++ {
if err := <-errors; err != nil && firstErr != nil {
if err := <-errors; err != nil && firstErr == nil {
firstErr = err
}
}
Expand Down
21 changes: 19 additions & 2 deletions metrics/cloudwatch/cloudwatch_test.go
Expand Up @@ -15,6 +15,10 @@ import (
"github.com/go-kit/kit/metrics/teststat"
)

const metricNameToGenerateError = "metric_name_used_to_throw_an_error"

var errTest = errors.New("test error")

type mockCloudWatch struct {
cloudwatchiface.CloudWatchAPI
mtx sync.RWMutex
Expand All @@ -33,6 +37,10 @@ func (mcw *mockCloudWatch) PutMetricData(input *cloudwatch.PutMetricDataInput) (
mcw.mtx.Lock()
defer mcw.mtx.Unlock()
for _, datum := range input.MetricData {
if *datum.MetricName == metricNameToGenerateError {
return nil, errTest
}

if len(datum.Values) > 0 {
for _, v := range datum.Values {
mcw.valuesReceived[*datum.MetricName] = append(mcw.valuesReceived[*datum.MetricName], *v)
Expand Down Expand Up @@ -125,8 +133,7 @@ func TestCounterLowSendConcurrency(t *testing.T) {
wants = append(wants, teststat.FillCounter(counters[name]))
}

err := cw.Send()
if err != nil {
if err := cw.Send(); err != nil {
t.Fatal(err)
}

Expand Down Expand Up @@ -280,3 +287,13 @@ func TestHistogram(t *testing.T) {
t.Fatal(err)
}
}

func TestErrorLog(t *testing.T) {
namespace := "abc"
svc := newMockCloudWatch()
cw := New(namespace, svc, WithLogger(log.NewNopLogger()))
cw.NewGauge(metricNameToGenerateError).Set(123)
if err := cw.Send(); err != errTest {
t.Fatal("Expected error, but didn't get one")
}
}