Skip to content

Commit

Permalink
Fix handling of uint64 in datadog output (#4091)
Browse files Browse the repository at this point in the history
(cherry picked from commit cff7ee8)
  • Loading branch information
danielnelson committed May 2, 2018
1 parent 91352a2 commit b7e63ac
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
10 changes: 3 additions & 7 deletions plugins/outputs/datadog/datadog.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,9 @@ func verifyValue(v interface{}) bool {

func (p *Point) setValue(v interface{}) error {
switch d := v.(type) {
case int:
p[1] = float64(int(d))
case int32:
p[1] = float64(int32(d))
case int64:
p[1] = float64(int64(d))
case float32:
p[1] = float64(d)
case uint64:
p[1] = float64(d)
case float64:
p[1] = float64(d)
Expand All @@ -195,7 +191,7 @@ func (p *Point) setValue(v interface{}) error {
p[1] = float64(1)
}
default:
return fmt.Errorf("undeterminable type")
return fmt.Errorf("undeterminable field type: %T", v)
}
return nil
}
Expand Down
24 changes: 24 additions & 0 deletions plugins/outputs/datadog/datadog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,30 @@ func TestBuildPoint(t *testing.T) {
},
nil,
},
{
testutil.TestMetric(int64(0), "test int64"),
Point{
float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
0.0,
},
nil,
},
{
testutil.TestMetric(uint64(0), "test uint64"),
Point{
float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
0.0,
},
nil,
},
{
testutil.TestMetric(true, "test bool"),
Point{
float64(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()),
1.0,
},
nil,
},
}
for _, tt := range tagtests {
pt, err := buildMetrics(tt.ptIn)
Expand Down

0 comments on commit b7e63ac

Please sign in to comment.