From 73372872c2262bc3dc0f97f7476e71c1947e8cac Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Thu, 14 Sep 2017 18:27:42 -0400
Subject: [PATCH] Fix panic in statsd p100 calculation (#3230)
---
plugins/inputs/statsd/running_stats.go | 13 ++++++++++---
plugins/inputs/statsd/running_stats_test.go | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/plugins/inputs/statsd/running_stats.go b/plugins/inputs/statsd/running_stats.go
index 3ce03a87..2395ab14 100644
--- a/plugins/inputs/statsd/running_stats.go
+++ b/plugins/inputs/statsd/running_stats.go
@@ -110,8 +110,15 @@ func (rs *RunningStats) Percentile(n int) float64 {
}
i := int(float64(len(rs.perc)) * float64(n) / float64(100))
- if i < 0 {
- i = 0
+ return rs.perc[clamp(i, 0, len(rs.perc)-1)]
+}
+
+func clamp(i int, min int, max int) int {
+ if i < min {
+ return min
+ }
+ if i > max {
+ return max
}
- return rs.perc[i]
+ return i
}
diff --git a/plugins/inputs/statsd/running_stats_test.go b/plugins/inputs/statsd/running_stats_test.go
index 614de9ce..4571f76d 100644
--- a/plugins/inputs/statsd/running_stats_test.go
+++ b/plugins/inputs/statsd/running_stats_test.go
@@ -23,12 +23,18 @@ func TestRunningStats_Single(t *testing.T) {
if rs.Lower() != 10.1 {
t.Errorf("Expected %v, got %v", 10.1, rs.Lower())
}
+ if rs.Percentile(100) != 10.1 {
+ t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(100))
+ }
if rs.Percentile(90) != 10.1 {
t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(90))
}
if rs.Percentile(50) != 10.1 {
t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(50))
}
+ if rs.Percentile(0) != 10.1 {
+ t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(0))
+ }
if rs.Count() != 1 {
t.Errorf("Expected %v, got %v", 1, rs.Count())
}
@@ -58,12 +64,18 @@ func TestRunningStats_Duplicate(t *testing.T) {
if rs.Lower() != 10.1 {
t.Errorf("Expected %v, got %v", 10.1, rs.Lower())
}
+ if rs.Percentile(100) != 10.1 {
+ t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(100))
+ }
if rs.Percentile(90) != 10.1 {
t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(90))
}
if rs.Percentile(50) != 10.1 {
t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(50))
}
+ if rs.Percentile(0) != 10.1 {
+ t.Errorf("Expected %v, got %v", 10.1, rs.Percentile(0))
+ }
if rs.Count() != 4 {
t.Errorf("Expected %v, got %v", 4, rs.Count())
}
@@ -93,12 +105,18 @@ func TestRunningStats(t *testing.T) {
if rs.Lower() != 5 {
t.Errorf("Expected %v, got %v", 5, rs.Lower())
}
+ if rs.Percentile(100) != 45 {
+ t.Errorf("Expected %v, got %v", 45, rs.Percentile(100))
+ }
if rs.Percentile(90) != 32 {
t.Errorf("Expected %v, got %v", 32, rs.Percentile(90))
}
if rs.Percentile(50) != 11 {
t.Errorf("Expected %v, got %v", 11, rs.Percentile(50))
}
+ if rs.Percentile(0) != 5 {
+ t.Errorf("Expected %v, got %v", 5, rs.Percentile(0))
+ }
if rs.Count() != 16 {
t.Errorf("Expected %v, got %v", 4, rs.Count())
}
--
GitLab